From 1552baebc2182c9e016d488e2b5642324a9031d1 Mon Sep 17 00:00:00 2001 From: openshift-merge-bot <148852131+openshift-merge-bot@users.noreply.github.com> Date: Sun, 8 Sep 2024 00:07:52 +0000 Subject: [PATCH] Update cargo dependencies Signed-off-by: github-actions[bot] <41898282+github-actions[bot]@users.noreply.github.com> --- .cargo-vendor/anyhow/.cargo-checksum.json | 2 +- .cargo-vendor/anyhow/Cargo.toml | 64 ++- .cargo-vendor/anyhow/build.rs | 8 +- .cargo-vendor/anyhow/build/probe.rs | 4 +- .cargo-vendor/anyhow/src/backtrace.rs | 11 +- .cargo-vendor/anyhow/src/chain.rs | 16 +- .cargo-vendor/anyhow/src/context.rs | 6 +- .cargo-vendor/anyhow/src/error.rs | 55 +- .cargo-vendor/anyhow/src/kind.rs | 12 +- .cargo-vendor/anyhow/src/lib.rs | 15 +- .cargo-vendor/anyhow/src/wrapper.rs | 12 +- .cargo-vendor/anyhow/tests/compiletest.rs | 4 +- .cargo-vendor/anyhow/tests/test_backtrace.rs | 2 +- .cargo-vendor/anyhow/tests/test_ensure.rs | 22 +- .cargo-vendor/anyhow/tests/test_fmt.rs | 1 - .cargo-vendor/capnp-rpc/.cargo-checksum.json | 2 +- .cargo-vendor/capnp-rpc/CHANGELOG.md | 8 + .cargo-vendor/capnp-rpc/Cargo.toml | 12 +- .cargo-vendor/capnp-rpc/src/rpc.rs | 468 ++++++++---------- .cargo-vendor/capnp-rpc/src/twoparty.rs | 3 +- .cargo-vendor/dashmap/.cargo-checksum.json | 2 +- .cargo-vendor/dashmap/Cargo.toml | 8 +- .cargo-vendor/dashmap/src/lib.rs | 39 ++ .cargo-vendor/dashmap/src/set.rs | 17 + .cargo-vendor/hashbrown/.cargo-checksum.json | 2 +- .cargo-vendor/hashbrown/CHANGELOG.md | 18 +- .cargo-vendor/hashbrown/Cargo.toml | 4 +- .cargo-vendor/hashbrown/src/lib.rs | 1 + .cargo-vendor/hashbrown/src/map.rs | 8 +- .cargo-vendor/hashbrown/src/raw/mod.rs | 39 +- .cargo-vendor/hashbrown/src/set.rs | 41 +- .cargo-vendor/hashbrown/src/table.rs | 6 + .cargo-vendor/nix/.cargo-checksum.json | 2 +- .cargo-vendor/nix/Cargo.toml | 4 - .cargo-vendor/serde/.cargo-checksum.json | 2 +- .cargo-vendor/serde/Cargo.toml | 4 +- .cargo-vendor/serde/build.rs | 14 + .cargo-vendor/serde/src/de/impls.rs | 46 +- .cargo-vendor/serde/src/de/mod.rs | 9 +- .cargo-vendor/serde/src/{de => }/format.rs | 0 .cargo-vendor/serde/src/lib.rs | 13 +- .cargo-vendor/serde/src/ser/impls.rs | 42 +- .cargo-vendor/serde/src/ser/mod.rs | 4 +- .../serde_derive/.cargo-checksum.json | 2 +- .cargo-vendor/serde_derive/Cargo.toml | 2 +- .cargo-vendor/serde_derive/src/lib.rs | 2 +- .cargo-vendor/serde_json/.cargo-checksum.json | 2 +- .cargo-vendor/serde_json/Cargo.toml | 2 +- .cargo-vendor/serde_json/src/lib.rs | 2 +- .cargo-vendor/serde_json/src/value/ser.rs | 8 + .cargo-vendor/syn/.cargo-checksum.json | 2 +- .cargo-vendor/syn/Cargo.toml | 2 +- .cargo-vendor/syn/src/expr.rs | 38 +- .cargo-vendor/syn/src/gen/clone.rs | 3 +- .cargo-vendor/syn/src/gen/debug.rs | 5 +- .cargo-vendor/syn/src/gen/eq.rs | 5 +- .cargo-vendor/syn/src/gen/fold.rs | 10 +- .cargo-vendor/syn/src/gen/hash.rs | 3 +- .cargo-vendor/syn/src/gen/visit.rs | 10 +- .cargo-vendor/syn/src/gen/visit_mut.rs | 10 +- .cargo-vendor/syn/src/lib.rs | 2 +- .cargo-vendor/time-core/.cargo-checksum.json | 2 +- .cargo-vendor/time-core/Cargo.toml | 5 - .../time-macros/.cargo-checksum.json | 2 +- .cargo-vendor/time-macros/Cargo.toml | 5 - .cargo-vendor/time/.cargo-checksum.json | 2 +- .cargo-vendor/time/Cargo.toml | 12 - Cargo.lock | 68 +-- conmon-rs/client/Cargo.toml | 4 +- conmon-rs/server/Cargo.toml | 10 +- 70 files changed, 635 insertions(+), 637 deletions(-) rename .cargo-vendor/serde/src/{de => }/format.rs (100%) diff --git a/.cargo-vendor/anyhow/.cargo-checksum.json b/.cargo-vendor/anyhow/.cargo-checksum.json index a6190cf734..8d1b06acee 100644 --- a/.cargo-vendor/anyhow/.cargo-checksum.json +++ b/.cargo-vendor/anyhow/.cargo-checksum.json @@ -1 +1 @@ -{"files":{"Cargo.toml":"aa2d7538e2b3a969c60be518b72b524952d63b039811e8ab3791f1fbeb2645f5","LICENSE-APACHE":"62c7a1e35f56406896d7aa7ca52d0cc0d272ac022b5d2796e7d6905db8a3636a","LICENSE-MIT":"23f18e03dc49df91622fe2a76176497404e46ced8a715d9d2b67a7446571cca3","README.md":"6e608b9068b4ebab4b85944f047ea386f0288a99c615ac4a32ac45a7da4e5e33","build.rs":"22179bef46f3656c2436c97c2ac9751b26bbd04b67686ea6d75652aa92551fa7","build/probe.rs":"b8b792036f13c9c1fbc6b1244198ea2305e61ddfcda3856563b581dcb1e1fe6e","rust-toolchain.toml":"6bbb61302978c736b2da03e4fb40e3beab908f85d533ab46fd541e637b5f3e0f","src/backtrace.rs":"ea40abc828b93d01272c2d9f4254502ed34934e8c86fc2eac883dd972a09d8b2","src/chain.rs":"e83ee788dc5bb6bebba64356b35abbd5b624f2449d47e3716d02b2473fb8e5c5","src/context.rs":"04e4b80b9f6d8163edc53455b98ab0c40cb9ad104bcf0c74f8075f22024471ab","src/ensure.rs":"9763f418b5397764549866c111ec6db3a7bdc4c30ad95c3bbfc56c5434ea8c09","src/error.rs":"a274234af662770340b237c9016beea2f94e7906f3fe69d0d78057929889f25b","src/fmt.rs":"adf4be906b29900153bfb4b767a6049d58697dc3bcce7dfbb85ca773f5de5b33","src/kind.rs":"febaac378b8bfca7b95a76c9bf9fbd8ccdfd0cc1a6277cdc109a2cda5763f16e","src/lib.rs":"1c774243700f38ccaced1609c9e37a25c01f5e8aa900b876aef206207d6e4846","src/macros.rs":"17fb103e68a5befa768857314c3ca4d81d1dacfea0738bbb9c7597a485243499","src/ptr.rs":"4cb31d2f815b178daf951bfb94a1930383e056c0ca68d494603f45d8eea35d50","src/wrapper.rs":"4ffdf284d45fee90f11a48e59c493ed1114e1243903ceb265fa89cd4c8c0d338","tests/common/mod.rs":"f9088c2d7afafa64ff730b629272045b776bfafc2f5957508242da630635f2e1","tests/compiletest.rs":"022a8e400ef813d7ea1875b944549cee5125f6a995dc33e93b48cba3e1b57bd1","tests/drop/mod.rs":"08c3e553c1cc0d2dbd936fc45f4b5b1105057186affd6865e8d261e05f0f0646","tests/test_autotrait.rs":"ecccf9202a33611f64b76598806aa82abec2560ae058e32f63fb2fb3ef225be9","tests/test_backtrace.rs":"ed144f90bf62cc441de067f6cee09ece94bca9da8f9b492d11d3dc652ba83e26","tests/test_boxed.rs":"6b26db0e2eb72afe9af7352ea820837aab90f8d486294616dd5dc34c1b94038c","tests/test_chain.rs":"3a8a8d7569913bd98c0e27c69d0bda35101e7fde7c056ed57cdd8ed018e4cbcb","tests/test_context.rs":"8409c53b328562c11e822bd6c3cd17e0d4d50b9bbb8fc3617333fd77303a6a33","tests/test_convert.rs":"7e7a8b4772a427a911014ac4d1083f9519000e786177f898808980dd9bdfde61","tests/test_downcast.rs":"797e69a72d125758c4c4897e5dc776d549d52cc9a6a633e0a33193f588a62b88","tests/test_ensure.rs":"a9a21c72ebcafd76e159b0297fb51fe75b7323f65b46a1f8a9e015c9515abdb0","tests/test_ffi.rs":"d0cb4c1d6d9154090982dee72ae3ebe05a5981f976058c3250f1c9da5a45edef","tests/test_fmt.rs":"81b14dd207ba5fbf02aaed031646810906c9c9c2fc5cabffc8e88f82462be499","tests/test_macros.rs":"68673942662a43bceee62aaed69c25d7ddbc55e25d62d528e13033c3e2e756cd","tests/test_repr.rs":"034dee888abd08741e11ac2e95ef4fcb2ab3943d0a76e8e976db404658e1a252","tests/test_source.rs":"b80723cf635a4f8c4df21891b34bfab9ed2b2aa407e7a2f826d24e334cd5f88e","tests/ui/chained-comparison.rs":"6504b03d95b5acc232a7f4defc9f343b2be6733bf475fa0992e8e6545b912bd4","tests/ui/chained-comparison.stderr":"7f1d0a8c251b0ede2d30b3087ec157fc660945c97a642c4a5acf5a14ec58de34","tests/ui/empty-ensure.rs":"ab5bf37c846a0d689f26ce9257a27228411ed64154f9c950f1602d88a355d94b","tests/ui/empty-ensure.stderr":"315782f5f4246290fe190e3767b22c3dcaffaabc19c5ace0373537d53e765278","tests/ui/ensure-nonbool.rs":"7e57cb93fbcd82959b36586ed6bd2ad978b051fe5facd5274651fde6b1600905","tests/ui/ensure-nonbool.stderr":"0b4d1611e3bb65081bf38c1e49b1f12e5096738f276608661016e68f1fe13f7c","tests/ui/must-use.rs":"fb59860b43f673bf4a430a6036ba463e95028844d8dd4243cfe5ebc7f2be582f","tests/ui/must-use.stderr":"c2848c5f254b4c061eea6714d9baf709924aba06619eaf2a8b3aee1266b75f9e","tests/ui/no-impl.rs":"fab6cbf2f6ea510b86f567dfb3b7c31250a9fd71ae5d110dbb9188be569ec593","tests/ui/no-impl.stderr":"0d8ed712d25de898eae18cfdffc575a47f4d5596346058cf6cd50d016c4f8ce8","tests/ui/temporary-value.rs":"4dcc96271b2403e6372cf4cfc813445e5ce4365fc6e156b6bc38274098499a70","tests/ui/temporary-value.stderr":"171f6c1c962503855480696e5d39e68946ec2a027b61a6f36ca1ad1b40265c5d","tests/ui/wrong-interpolation.rs":"9c44d4674c2dccd27b9dedd03341346ec02d993b41793ee89b5755202e7e367e","tests/ui/wrong-interpolation.stderr":"301e60e2eb9401782c7dc0b3580613a4cb2aafd4cc8065734a630a62e1161aa5"},"package":"b3d1d046238990b9cf5bcde22a3fb3584ee5cf65fb2765f454ed428c7a0063da"} \ No newline at end of file +{"files":{"Cargo.toml":"50daeb84465695fb01975f29be1529b1c09010d9e6440d0f92034285f00e8203","LICENSE-APACHE":"62c7a1e35f56406896d7aa7ca52d0cc0d272ac022b5d2796e7d6905db8a3636a","LICENSE-MIT":"23f18e03dc49df91622fe2a76176497404e46ced8a715d9d2b67a7446571cca3","README.md":"6e608b9068b4ebab4b85944f047ea386f0288a99c615ac4a32ac45a7da4e5e33","build.rs":"914eb6158687216432aed82e357af5dff2d957d8c7746d075f7a778ba39df146","build/probe.rs":"ee0a4518493c0b3cca121ed2e937b1779eb7e8313a5c4d5fc5aea28ff015366b","rust-toolchain.toml":"6bbb61302978c736b2da03e4fb40e3beab908f85d533ab46fd541e637b5f3e0f","src/backtrace.rs":"578b395a66b21d0e90c503546011138b057f6f27147c51667490da66d22edd54","src/chain.rs":"85af447405f075633fab186b7f1c94d7f33a36474f239c50a961b2d6197d5426","src/context.rs":"1be432c32752778041e8acf0e7d98d4f6291ce53fd7df5bbb0167824bbea57f7","src/ensure.rs":"9763f418b5397764549866c111ec6db3a7bdc4c30ad95c3bbfc56c5434ea8c09","src/error.rs":"cb47593520baa6dc9372bea3d0e8e318f7ec09734f88e7d9d6b9b0c1e17c1507","src/fmt.rs":"adf4be906b29900153bfb4b767a6049d58697dc3bcce7dfbb85ca773f5de5b33","src/kind.rs":"d8cc91e73653049ca0b5593f36aee8632fcc85847b36005b90ecd9a6f0de13cb","src/lib.rs":"8647691e7cf073cb8df0a5c69d55b6adfebf9f2ab93b7c0817621021c0762384","src/macros.rs":"17fb103e68a5befa768857314c3ca4d81d1dacfea0738bbb9c7597a485243499","src/ptr.rs":"4cb31d2f815b178daf951bfb94a1930383e056c0ca68d494603f45d8eea35d50","src/wrapper.rs":"d4e45caee3c2d861d4609a8141310d5c901af59a57d5f0a0de30251347dbd23c","tests/common/mod.rs":"f9088c2d7afafa64ff730b629272045b776bfafc2f5957508242da630635f2e1","tests/compiletest.rs":"4e381aa8ca3eabb7ac14d1e0c3700b3223e47640547a6988cfa13ad68255f60f","tests/drop/mod.rs":"08c3e553c1cc0d2dbd936fc45f4b5b1105057186affd6865e8d261e05f0f0646","tests/test_autotrait.rs":"ecccf9202a33611f64b76598806aa82abec2560ae058e32f63fb2fb3ef225be9","tests/test_backtrace.rs":"60afdd7ee5850dc22625ff486fe41c47fd322db874a93c4871ddfed2bf603930","tests/test_boxed.rs":"6b26db0e2eb72afe9af7352ea820837aab90f8d486294616dd5dc34c1b94038c","tests/test_chain.rs":"3a8a8d7569913bd98c0e27c69d0bda35101e7fde7c056ed57cdd8ed018e4cbcb","tests/test_context.rs":"8409c53b328562c11e822bd6c3cd17e0d4d50b9bbb8fc3617333fd77303a6a33","tests/test_convert.rs":"7e7a8b4772a427a911014ac4d1083f9519000e786177f898808980dd9bdfde61","tests/test_downcast.rs":"797e69a72d125758c4c4897e5dc776d549d52cc9a6a633e0a33193f588a62b88","tests/test_ensure.rs":"4014ead6596793f5eecd55cbaafa49286b75cee7b7092a8b9b8286fcd813a6da","tests/test_ffi.rs":"d0cb4c1d6d9154090982dee72ae3ebe05a5981f976058c3250f1c9da5a45edef","tests/test_fmt.rs":"0e49b48f08e4faaf03e2f202e1efc5250018876c4e1b01b8379d7a38ae8df870","tests/test_macros.rs":"68673942662a43bceee62aaed69c25d7ddbc55e25d62d528e13033c3e2e756cd","tests/test_repr.rs":"034dee888abd08741e11ac2e95ef4fcb2ab3943d0a76e8e976db404658e1a252","tests/test_source.rs":"b80723cf635a4f8c4df21891b34bfab9ed2b2aa407e7a2f826d24e334cd5f88e","tests/ui/chained-comparison.rs":"6504b03d95b5acc232a7f4defc9f343b2be6733bf475fa0992e8e6545b912bd4","tests/ui/chained-comparison.stderr":"7f1d0a8c251b0ede2d30b3087ec157fc660945c97a642c4a5acf5a14ec58de34","tests/ui/empty-ensure.rs":"ab5bf37c846a0d689f26ce9257a27228411ed64154f9c950f1602d88a355d94b","tests/ui/empty-ensure.stderr":"315782f5f4246290fe190e3767b22c3dcaffaabc19c5ace0373537d53e765278","tests/ui/ensure-nonbool.rs":"7e57cb93fbcd82959b36586ed6bd2ad978b051fe5facd5274651fde6b1600905","tests/ui/ensure-nonbool.stderr":"0b4d1611e3bb65081bf38c1e49b1f12e5096738f276608661016e68f1fe13f7c","tests/ui/must-use.rs":"fb59860b43f673bf4a430a6036ba463e95028844d8dd4243cfe5ebc7f2be582f","tests/ui/must-use.stderr":"c2848c5f254b4c061eea6714d9baf709924aba06619eaf2a8b3aee1266b75f9e","tests/ui/no-impl.rs":"fab6cbf2f6ea510b86f567dfb3b7c31250a9fd71ae5d110dbb9188be569ec593","tests/ui/no-impl.stderr":"0d8ed712d25de898eae18cfdffc575a47f4d5596346058cf6cd50d016c4f8ce8","tests/ui/temporary-value.rs":"4dcc96271b2403e6372cf4cfc813445e5ce4365fc6e156b6bc38274098499a70","tests/ui/temporary-value.stderr":"171f6c1c962503855480696e5d39e68946ec2a027b61a6f36ca1ad1b40265c5d","tests/ui/wrong-interpolation.rs":"9c44d4674c2dccd27b9dedd03341346ec02d993b41793ee89b5755202e7e367e","tests/ui/wrong-interpolation.stderr":"301e60e2eb9401782c7dc0b3580613a4cb2aafd4cc8065734a630a62e1161aa5"},"package":"10f00e1f6e58a40e807377c75c6a7f97bf9044fab57816f2414e6f5f4499d7b8"} \ No newline at end of file diff --git a/.cargo-vendor/anyhow/Cargo.toml b/.cargo-vendor/anyhow/Cargo.toml index c06b4c7341..d1f3e3efcb 100644 --- a/.cargo-vendor/anyhow/Cargo.toml +++ b/.cargo-vendor/anyhow/Cargo.toml @@ -13,7 +13,7 @@ edition = "2018" rust-version = "1.39" name = "anyhow" -version = "1.0.86" +version = "1.0.87" authors = ["David Tolnay "] build = "build.rs" autobins = false @@ -35,11 +35,7 @@ license = "MIT OR Apache-2.0" repository = "https://github.com/dtolnay/anyhow" [package.metadata.docs.rs] -rustdoc-args = [ - "--cfg", - "doc_cfg", - "--generate-link-to-definition", -] +rustdoc-args = ["--generate-link-to-definition"] targets = ["x86_64-unknown-linux-gnu"] [lib] @@ -48,60 +44,60 @@ path = "src/lib.rs" doc-scrape-examples = false [[test]] -name = "test_ensure" -path = "tests/test_ensure.rs" +name = "compiletest" +path = "tests/compiletest.rs" [[test]] -name = "test_chain" -path = "tests/test_chain.rs" +name = "test_autotrait" +path = "tests/test_autotrait.rs" [[test]] -name = "test_fmt" -path = "tests/test_fmt.rs" +name = "test_backtrace" +path = "tests/test_backtrace.rs" [[test]] -name = "test_source" -path = "tests/test_source.rs" +name = "test_boxed" +path = "tests/test_boxed.rs" [[test]] -name = "test_repr" -path = "tests/test_repr.rs" +name = "test_chain" +path = "tests/test_chain.rs" [[test]] -name = "test_autotrait" -path = "tests/test_autotrait.rs" +name = "test_context" +path = "tests/test_context.rs" [[test]] -name = "test_boxed" -path = "tests/test_boxed.rs" +name = "test_convert" +path = "tests/test_convert.rs" [[test]] -name = "test_backtrace" -path = "tests/test_backtrace.rs" +name = "test_downcast" +path = "tests/test_downcast.rs" [[test]] -name = "test_convert" -path = "tests/test_convert.rs" +name = "test_ensure" +path = "tests/test_ensure.rs" [[test]] -name = "test_macros" -path = "tests/test_macros.rs" +name = "test_ffi" +path = "tests/test_ffi.rs" [[test]] -name = "compiletest" -path = "tests/compiletest.rs" +name = "test_fmt" +path = "tests/test_fmt.rs" [[test]] -name = "test_context" -path = "tests/test_context.rs" +name = "test_macros" +path = "tests/test_macros.rs" [[test]] -name = "test_ffi" -path = "tests/test_ffi.rs" +name = "test_repr" +path = "tests/test_repr.rs" [[test]] -name = "test_downcast" -path = "tests/test_downcast.rs" +name = "test_source" +path = "tests/test_source.rs" [dependencies.backtrace] version = "0.3.51" diff --git a/.cargo-vendor/anyhow/build.rs b/.cargo-vendor/anyhow/build.rs index 0d757e1412..a065e04c53 100644 --- a/.cargo-vendor/anyhow/build.rs +++ b/.cargo-vendor/anyhow/build.rs @@ -67,10 +67,10 @@ fn main() { if rustc >= 80 { println!("cargo:rustc-check-cfg=cfg(anyhow_nightly_testing)"); + println!("cargo:rustc-check-cfg=cfg(anyhow_no_core_error)"); println!("cargo:rustc-check-cfg=cfg(anyhow_no_fmt_arguments_as_str)"); println!("cargo:rustc-check-cfg=cfg(anyhow_no_ptr_addr_of)"); println!("cargo:rustc-check-cfg=cfg(anyhow_no_unsafe_op_in_unsafe_fn_lint)"); - println!("cargo:rustc-check-cfg=cfg(doc_cfg)"); println!("cargo:rustc-check-cfg=cfg(error_generic_member_access)"); println!("cargo:rustc-check-cfg=cfg(std_backtrace)"); } @@ -96,6 +96,12 @@ fn main() { // https://blog.rust-lang.org/2022/11/03/Rust-1.65.0.html#stabilized-apis println!("cargo:rustc-cfg=std_backtrace"); } + + if rustc < 81 { + // core::error::Error + // https://blog.rust-lang.org/2024/09/05/Rust-1.81.0.html#coreerrorerror + println!("cargo:rustc-cfg=anyhow_no_core_error"); + } } fn compile_probe(rustc_bootstrap: bool) -> bool { diff --git a/.cargo-vendor/anyhow/build/probe.rs b/.cargo-vendor/anyhow/build/probe.rs index 21e776dafb..742d15ccef 100644 --- a/.cargo-vendor/anyhow/build/probe.rs +++ b/.cargo-vendor/anyhow/build/probe.rs @@ -4,9 +4,9 @@ #![feature(error_generic_member_access)] +use core::error::{self, Error, Request}; +use core::fmt::{self, Debug, Display}; use std::backtrace::Backtrace; -use std::error::{self, Error, Request}; -use std::fmt::{self, Debug, Display}; struct MyError(Thing); struct Thing; diff --git a/.cargo-vendor/anyhow/src/backtrace.rs b/.cargo-vendor/anyhow/src/backtrace.rs index 44fb66c23f..c9ca1a8f56 100644 --- a/.cargo-vendor/anyhow/src/backtrace.rs +++ b/.cargo-vendor/anyhow/src/backtrace.rs @@ -38,7 +38,8 @@ macro_rules! backtrace { #[cfg(error_generic_member_access)] macro_rules! backtrace_if_absent { ($err:expr) => { - match std::error::request_ref::($err as &dyn std::error::Error) { + match core::error::request_ref::($err as &dyn core::error::Error) + { Some(_) => None, None => backtrace!(), } @@ -46,7 +47,7 @@ macro_rules! backtrace_if_absent { } #[cfg(all( - feature = "std", + any(feature = "std", not(anyhow_no_core_error)), not(error_generic_member_access), any(std_backtrace, feature = "backtrace") ))] @@ -56,7 +57,11 @@ macro_rules! backtrace_if_absent { }; } -#[cfg(all(feature = "std", not(std_backtrace), not(feature = "backtrace")))] +#[cfg(all( + any(feature = "std", not(anyhow_no_core_error)), + not(std_backtrace), + not(feature = "backtrace"), +))] macro_rules! backtrace_if_absent { ($err:expr) => { None diff --git a/.cargo-vendor/anyhow/src/chain.rs b/.cargo-vendor/anyhow/src/chain.rs index b75885df42..e56bc66962 100644 --- a/.cargo-vendor/anyhow/src/chain.rs +++ b/.cargo-vendor/anyhow/src/chain.rs @@ -1,13 +1,13 @@ use self::ChainState::*; use crate::StdError; -#[cfg(feature = "std")] +#[cfg(any(feature = "std", not(anyhow_no_core_error)))] use alloc::vec::{self, Vec}; -#[cfg(feature = "std")] +#[cfg(any(feature = "std", not(anyhow_no_core_error)))] pub(crate) use crate::Chain; -#[cfg(not(feature = "std"))] +#[cfg(all(not(feature = "std"), anyhow_no_core_error))] pub(crate) struct Chain<'a> { state: ChainState<'a>, } @@ -17,7 +17,7 @@ pub(crate) enum ChainState<'a> { Linked { next: Option<&'a (dyn StdError + 'static)>, }, - #[cfg(feature = "std")] + #[cfg(any(feature = "std", not(anyhow_no_core_error)))] Buffered { rest: vec::IntoIter<&'a (dyn StdError + 'static)>, }, @@ -42,7 +42,7 @@ impl<'a> Iterator for Chain<'a> { *next = error.source(); Some(error) } - #[cfg(feature = "std")] + #[cfg(any(feature = "std", not(anyhow_no_core_error)))] Buffered { rest } => rest.next(), } } @@ -53,7 +53,7 @@ impl<'a> Iterator for Chain<'a> { } } -#[cfg(feature = "std")] +#[cfg(any(feature = "std", not(anyhow_no_core_error)))] impl DoubleEndedIterator for Chain<'_> { fn next_back(&mut self) -> Option { match &mut self.state { @@ -84,13 +84,13 @@ impl ExactSizeIterator for Chain<'_> { } len } - #[cfg(feature = "std")] + #[cfg(any(feature = "std", not(anyhow_no_core_error)))] Buffered { rest } => rest.len(), } } } -#[cfg(feature = "std")] +#[cfg(any(feature = "std", not(anyhow_no_core_error)))] impl Default for Chain<'_> { fn default() -> Self { Chain { diff --git a/.cargo-vendor/anyhow/src/context.rs b/.cargo-vendor/anyhow/src/context.rs index 11b31ba9c7..b52f682bc2 100644 --- a/.cargo-vendor/anyhow/src/context.rs +++ b/.cargo-vendor/anyhow/src/context.rs @@ -4,7 +4,7 @@ use core::convert::Infallible; use core::fmt::{self, Debug, Display, Write}; #[cfg(error_generic_member_access)] -use std::error::Request; +use core::error::Request; mod ext { use super::*; @@ -15,10 +15,10 @@ mod ext { C: Display + Send + Sync + 'static; } - #[cfg(feature = "std")] + #[cfg(any(feature = "std", not(anyhow_no_core_error)))] impl StdError for E where - E: std::error::Error + Send + Sync + 'static, + E: crate::StdError + Send + Sync + 'static, { fn ext_context(self, context: C) -> Error where diff --git a/.cargo-vendor/anyhow/src/error.rs b/.cargo-vendor/anyhow/src/error.rs index f24c4a65da..6d8b54dbe1 100644 --- a/.cargo-vendor/anyhow/src/error.rs +++ b/.cargo-vendor/anyhow/src/error.rs @@ -1,21 +1,20 @@ use crate::backtrace::Backtrace; use crate::chain::Chain; -#[cfg(any(feature = "std", anyhow_no_ptr_addr_of))] +#[cfg(any(feature = "std", not(anyhow_no_core_error), anyhow_no_ptr_addr_of))] use crate::ptr::Mut; use crate::ptr::{Own, Ref}; use crate::{Error, StdError}; use alloc::boxed::Box; use core::any::TypeId; +#[cfg(error_generic_member_access)] +use core::error::{self, Request}; use core::fmt::{self, Debug, Display}; use core::mem::ManuallyDrop; +#[cfg(any(feature = "std", not(anyhow_no_core_error)))] +use core::ops::{Deref, DerefMut}; #[cfg(not(anyhow_no_ptr_addr_of))] use core::ptr; use core::ptr::NonNull; -#[cfg(error_generic_member_access)] -use std::error::{self, Request}; - -#[cfg(feature = "std")] -use core::ops::{Deref, DerefMut}; impl Error { /// Create a new error object from any error type. @@ -25,8 +24,7 @@ impl Error { /// /// If the error type does not provide a backtrace, a backtrace will be /// created here to ensure that a backtrace exists. - #[cfg(feature = "std")] - #[cfg_attr(doc_cfg, doc(cfg(feature = "std")))] + #[cfg(any(feature = "std", not(anyhow_no_core_error)))] #[cold] #[must_use] pub fn new(error: E) -> Self @@ -83,7 +81,7 @@ impl Error { Error::from_adhoc(message, backtrace!()) } - #[cfg(feature = "std")] + #[cfg(any(feature = "std", not(anyhow_no_core_error)))] #[cold] pub(crate) fn from_std(error: E, backtrace: Option) -> Self where @@ -120,7 +118,7 @@ impl Error { let vtable = &ErrorVTable { object_drop: object_drop::>, object_ref: object_ref::>, - #[cfg(all(feature = "std", anyhow_no_ptr_addr_of))] + #[cfg(all(any(feature = "std", not(anyhow_no_core_error)), anyhow_no_ptr_addr_of))] object_mut: object_mut::>, object_boxed: object_boxed::>, object_downcast: object_downcast::, @@ -149,7 +147,7 @@ impl Error { let vtable = &ErrorVTable { object_drop: object_drop::>, object_ref: object_ref::>, - #[cfg(all(feature = "std", anyhow_no_ptr_addr_of))] + #[cfg(all(any(feature = "std", not(anyhow_no_core_error)), anyhow_no_ptr_addr_of))] object_mut: object_mut::>, object_boxed: object_boxed::>, object_downcast: object_downcast::, @@ -168,7 +166,7 @@ impl Error { unsafe { Error::construct(error, vtable, backtrace) } } - #[cfg(feature = "std")] + #[cfg(any(feature = "std", not(anyhow_no_core_error)))] #[cold] pub(crate) fn from_context(context: C, error: E, backtrace: Option) -> Self where @@ -198,7 +196,7 @@ impl Error { unsafe { Error::construct(error, vtable, backtrace) } } - #[cfg(feature = "std")] + #[cfg(any(feature = "std", not(anyhow_no_core_error)))] #[cold] pub(crate) fn from_boxed( error: Box, @@ -325,7 +323,7 @@ impl Error { let vtable = &ErrorVTable { object_drop: object_drop::>, object_ref: object_ref::>, - #[cfg(all(feature = "std", anyhow_no_ptr_addr_of))] + #[cfg(all(any(feature = "std", not(anyhow_no_core_error)), anyhow_no_ptr_addr_of))] object_mut: object_mut::>, object_boxed: object_boxed::>, object_downcast: context_chain_downcast::, @@ -399,8 +397,7 @@ impl Error { /// None /// } /// ``` - #[cfg(feature = "std")] - #[cfg_attr(doc_cfg, doc(cfg(feature = "std")))] + #[cfg(any(feature = "std", not(anyhow_no_core_error)))] #[cold] pub fn chain(&self) -> Chain { unsafe { ErrorImpl::chain(self.inner.by_ref()) } @@ -411,8 +408,7 @@ impl Error { /// /// The root cause is the last error in the iterator produced by /// [`chain()`][Error::chain]. - #[cfg(feature = "std")] - #[cfg_attr(doc_cfg, doc(cfg(feature = "std")))] + #[cfg(any(feature = "std", not(anyhow_no_core_error)))] pub fn root_cause(&self) -> &(dyn StdError + 'static) { self.chain().last().unwrap() } @@ -554,8 +550,7 @@ impl Error { } } -#[cfg(feature = "std")] -#[cfg_attr(doc_cfg, doc(cfg(feature = "std")))] +#[cfg(any(feature = "std", not(anyhow_no_core_error)))] impl From for Error where E: StdError + Send + Sync + 'static, @@ -567,8 +562,7 @@ where } } -#[cfg(feature = "std")] -#[cfg_attr(doc_cfg, doc(cfg(feature = "std")))] +#[cfg(any(feature = "std", not(anyhow_no_core_error)))] impl Deref for Error { type Target = dyn StdError + Send + Sync + 'static; @@ -577,8 +571,7 @@ impl Deref for Error { } } -#[cfg(feature = "std")] -#[cfg_attr(doc_cfg, doc(cfg(feature = "std")))] +#[cfg(any(feature = "std", not(anyhow_no_core_error)))] impl DerefMut for Error { fn deref_mut(&mut self) -> &mut Self::Target { unsafe { ErrorImpl::error_mut(self.inner.by_mut()) } @@ -609,7 +602,7 @@ impl Drop for Error { struct ErrorVTable { object_drop: unsafe fn(Own), object_ref: unsafe fn(Ref) -> Ref, - #[cfg(all(feature = "std", anyhow_no_ptr_addr_of))] + #[cfg(all(any(feature = "std", not(anyhow_no_core_error)), anyhow_no_ptr_addr_of))] object_mut: unsafe fn(Mut) -> &mut (dyn StdError + Send + Sync + 'static), object_boxed: unsafe fn(Own) -> Box, object_downcast: unsafe fn(Ref, TypeId) -> Option>, @@ -661,7 +654,7 @@ where // Safety: requires layout of *e to match ErrorImpl, and for `e` to be derived // from a `&mut` -#[cfg(all(feature = "std", anyhow_no_ptr_addr_of))] +#[cfg(all(any(feature = "std", not(anyhow_no_core_error)), anyhow_no_ptr_addr_of))] unsafe fn object_mut(e: Mut) -> &mut (dyn StdError + Send + Sync + 'static) where E: StdError + Send + Sync + 'static, @@ -734,7 +727,7 @@ fn no_backtrace(e: Ref) -> Option<&Backtrace> { } // Safety: requires layout of *e to match ErrorImpl>. -#[cfg(feature = "std")] +#[cfg(any(feature = "std", not(anyhow_no_core_error)))] unsafe fn context_downcast(e: Ref, target: TypeId) -> Option> where C: 'static, @@ -774,7 +767,7 @@ where } // Safety: requires layout of *e to match ErrorImpl>. -#[cfg(feature = "std")] +#[cfg(any(feature = "std", not(anyhow_no_core_error)))] unsafe fn context_drop_rest(e: Own, target: TypeId) where C: 'static, @@ -906,7 +899,7 @@ impl ErrorImpl { unsafe { (vtable(this.ptr).object_ref)(this).deref() } } - #[cfg(feature = "std")] + #[cfg(any(feature = "std", not(anyhow_no_core_error)))] pub(crate) unsafe fn error_mut(this: Mut) -> &mut (dyn StdError + Send + Sync + 'static) { // Use vtable to attach E's native StdError vtable for the right // original type E. @@ -1009,14 +1002,14 @@ impl From for Box { } } -#[cfg(feature = "std")] +#[cfg(any(feature = "std", not(anyhow_no_core_error)))] impl AsRef for Error { fn as_ref(&self) -> &(dyn StdError + Send + Sync + 'static) { &**self } } -#[cfg(feature = "std")] +#[cfg(any(feature = "std", not(anyhow_no_core_error)))] impl AsRef for Error { fn as_ref(&self) -> &(dyn StdError + 'static) { &**self diff --git a/.cargo-vendor/anyhow/src/kind.rs b/.cargo-vendor/anyhow/src/kind.rs index 15d9f9b875..042af32deb 100644 --- a/.cargo-vendor/anyhow/src/kind.rs +++ b/.cargo-vendor/anyhow/src/kind.rs @@ -47,9 +47,9 @@ use crate::Error; use core::fmt::{Debug, Display}; -#[cfg(feature = "std")] +#[cfg(any(feature = "std", not(anyhow_no_core_error)))] use crate::StdError; -#[cfg(feature = "std")] +#[cfg(any(feature = "std", not(anyhow_no_core_error)))] use alloc::boxed::Box; pub struct Adhoc; @@ -96,10 +96,10 @@ impl Trait { } } -#[cfg(feature = "std")] +#[cfg(any(feature = "std", not(anyhow_no_core_error)))] pub struct Boxed; -#[cfg(feature = "std")] +#[cfg(any(feature = "std", not(anyhow_no_core_error)))] #[doc(hidden)] pub trait BoxedKind: Sized { #[inline] @@ -108,10 +108,10 @@ pub trait BoxedKind: Sized { } } -#[cfg(feature = "std")] +#[cfg(any(feature = "std", not(anyhow_no_core_error)))] impl BoxedKind for Box {} -#[cfg(feature = "std")] +#[cfg(any(feature = "std", not(anyhow_no_core_error)))] impl Boxed { #[cold] pub fn new(self, error: Box) -> Error { diff --git a/.cargo-vendor/anyhow/src/lib.rs b/.cargo-vendor/anyhow/src/lib.rs index 3991234809..c0e20f3505 100644 --- a/.cargo-vendor/anyhow/src/lib.rs +++ b/.cargo-vendor/anyhow/src/lib.rs @@ -206,9 +206,8 @@ //! will require an explicit `.map_err(Error::msg)` when working with a //! non-Anyhow error type inside a function that returns Anyhow's error type. -#![doc(html_root_url = "https://docs.rs/anyhow/1.0.85")] +#![doc(html_root_url = "https://docs.rs/anyhow/1.0.87")] #![cfg_attr(error_generic_member_access, feature(error_generic_member_access))] -#![cfg_attr(doc_cfg, feature(doc_cfg))] #![no_std] #![deny(dead_code, unused_imports, unused_mut)] #![cfg_attr( @@ -266,13 +265,16 @@ use crate::error::ErrorImpl; use crate::ptr::Own; use core::fmt::Display; -#[cfg(not(feature = "std"))] +#[cfg(all(not(feature = "std"), anyhow_no_core_error))] use core::fmt::Debug; #[cfg(feature = "std")] use std::error::Error as StdError; -#[cfg(not(feature = "std"))] +#[cfg(not(any(feature = "std", anyhow_no_core_error)))] +use core::error::Error as StdError; + +#[cfg(all(not(feature = "std"), anyhow_no_core_error))] trait StdError: Debug + Display { fn source(&self) -> Option<&(dyn StdError + 'static)> { None @@ -407,8 +409,7 @@ pub struct Error { /// None /// } /// ``` -#[cfg(feature = "std")] -#[cfg_attr(doc_cfg, doc(cfg(feature = "std")))] +#[cfg(any(feature = "std", not(anyhow_no_core_error)))] #[derive(Clone)] pub struct Chain<'a> { state: crate::chain::ChainState<'a>, @@ -670,7 +671,7 @@ pub mod __private { #[doc(hidden)] pub use crate::kind::{AdhocKind, TraitKind}; - #[cfg(feature = "std")] + #[cfg(any(feature = "std", not(anyhow_no_core_error)))] #[doc(hidden)] pub use crate::kind::BoxedKind; } diff --git a/.cargo-vendor/anyhow/src/wrapper.rs b/.cargo-vendor/anyhow/src/wrapper.rs index 9726ae596b..6f4677961e 100644 --- a/.cargo-vendor/anyhow/src/wrapper.rs +++ b/.cargo-vendor/anyhow/src/wrapper.rs @@ -1,11 +1,11 @@ use crate::StdError; use core::fmt::{self, Debug, Display}; -#[cfg(feature = "std")] +#[cfg(any(feature = "std", not(anyhow_no_core_error)))] use alloc::boxed::Box; #[cfg(error_generic_member_access)] -use std::error::Request; +use core::error::Request; #[repr(transparent)] pub struct MessageError(pub M); @@ -53,25 +53,25 @@ where impl StdError for DisplayError where M: Display + 'static {} -#[cfg(feature = "std")] +#[cfg(any(feature = "std", not(anyhow_no_core_error)))] #[repr(transparent)] pub struct BoxedError(pub Box); -#[cfg(feature = "std")] +#[cfg(any(feature = "std", not(anyhow_no_core_error)))] impl Debug for BoxedError { fn fmt(&self, f: &mut fmt::Formatter) -> fmt::Result { Debug::fmt(&self.0, f) } } -#[cfg(feature = "std")] +#[cfg(any(feature = "std", not(anyhow_no_core_error)))] impl Display for BoxedError { fn fmt(&self, f: &mut fmt::Formatter) -> fmt::Result { Display::fmt(&self.0, f) } } -#[cfg(feature = "std")] +#[cfg(any(feature = "std", not(anyhow_no_core_error)))] impl StdError for BoxedError { fn source(&self) -> Option<&(dyn StdError + 'static)> { self.0.source() diff --git a/.cargo-vendor/anyhow/tests/compiletest.rs b/.cargo-vendor/anyhow/tests/compiletest.rs index 7974a6249e..23a6a065ec 100644 --- a/.cargo-vendor/anyhow/tests/compiletest.rs +++ b/.cargo-vendor/anyhow/tests/compiletest.rs @@ -1,5 +1,5 @@ -#[rustversion::attr(not(nightly), ignore)] -#[cfg_attr(miri, ignore)] +#[rustversion::attr(not(nightly), ignore = "requires nightly")] +#[cfg_attr(miri, ignore = "incompatible with miri")] #[test] fn ui() { let t = trybuild::TestCases::new(); diff --git a/.cargo-vendor/anyhow/tests/test_backtrace.rs b/.cargo-vendor/anyhow/tests/test_backtrace.rs index c89559e671..938c1c24ee 100644 --- a/.cargo-vendor/anyhow/tests/test_backtrace.rs +++ b/.cargo-vendor/anyhow/tests/test_backtrace.rs @@ -1,7 +1,7 @@ #![allow(clippy::let_underscore_untyped)] #[rustversion::not(nightly)] -#[ignore] +#[ignore = "requires nightly"] #[test] fn test_backtrace() {} diff --git a/.cargo-vendor/anyhow/tests/test_ensure.rs b/.cargo-vendor/anyhow/tests/test_ensure.rs index 96c236db0a..f41ad37d89 100644 --- a/.cargo-vendor/anyhow/tests/test_ensure.rs +++ b/.cargo-vendor/anyhow/tests/test_ensure.rs @@ -153,18 +153,18 @@ fn test_closure() { // identifier, nor as `(S + move || 1) == (1)` by misinterpreting the // closure precedence. let test = || Ok(ensure!(S + move || 1 == 1)); - assert_err(test, "Condition failed: `S + (move || 1 == 1)`"); + assert_err(test, "Condition failed: `S + move || 1 == 1`"); let test = || Ok(ensure!(S + || 1 == 1)); - assert_err(test, "Condition failed: `S + (|| 1 == 1)`"); + assert_err(test, "Condition failed: `S + || 1 == 1`"); // Must not partition as `S + ((move | ()) | 1) == 1` by treating those // pipes as bitwise-or. let test = || Ok(ensure!(S + move |()| 1 == 1)); - assert_err(test, "Condition failed: `S + (move |()| 1 == 1)`"); + assert_err(test, "Condition failed: `S + move |()| 1 == 1`"); let test = || Ok(ensure!(S + |()| 1 == 1)); - assert_err(test, "Condition failed: `S + (|()| 1 == 1)`"); + assert_err(test, "Condition failed: `S + |()| 1 == 1`"); } #[test] @@ -224,7 +224,7 @@ fn test_if() { let test = || Ok(ensure!(if let | 1 | 2 = 2 {}.t(1) == 2)); assert_err( test, - "Condition failed: `if let 1 | 2 = 2 {}.t(1) == 2` (1 vs 2)", + "Condition failed: `if let | 1 | 2 = 2 {}.t(1) == 2` (1 vs 2)", ); } @@ -269,7 +269,7 @@ fn test_loop() { let test = || Ok(ensure!(for | _x in iter::once(0) {}.t(1) == 2)); assert_err( test, - "Condition failed: `for _x in iter::once(0) {}.t(1) == 2` (1 vs 2)", + "Condition failed: `for | _x in iter::once(0) {}.t(1) == 2` (1 vs 2)", ); #[rustfmt::skip] @@ -286,7 +286,7 @@ fn test_match() { let test = || Ok(ensure!(match 1 == 1 { true => 1, false => 0 } == 2)); assert_err( test, - "Condition failed: `match 1 == 1 { true => 1, false => 0, } == 2` (1 vs 2)", + "Condition failed: `match 1 == 1 { true => 1, false => 0 } == 2` (1 vs 2)", ); } @@ -343,7 +343,7 @@ fn test_path() { let test = || Ok(ensure!(Error::msg::<&str,>.t(1) == 2)); assert_err( test, - "Condition failed: `Error::msg::<&str>.t(1) == 2` (1 vs 2)", + "Condition failed: `Error::msg::<&str,>.t(1) == 2` (1 vs 2)", ); let test = || Ok(ensure!(Error::msg::<::Owned>.t(1) == 2)); @@ -362,7 +362,7 @@ fn test_path() { let test = || Ok(ensure!(Chain::<'static,>::new.t(1) == 2)); assert_err( test, - "Condition failed: `Chain::<'static>::new.t(1) == 2` (1 vs 2)", + "Condition failed: `Chain::<'static,>::new.t(1) == 2` (1 vs 2)", ); fn f() {} @@ -394,7 +394,7 @@ fn test_path() { #[rustfmt::skip] let test = || Ok(ensure!(E::U::>E::U)); - assert_err(test, "Condition failed: `E::U:: > E::U` (U vs U)"); + assert_err(test, "Condition failed: `E::U:: > E::U` (U vs U)"); let test = || Ok(ensure!(Generic:: != Generic)); assert_err( @@ -416,7 +416,7 @@ fn test_path() { }; assert_err( test, - "Condition failed: `Generic:: != Generic` (Generic vs Generic)", + "Condition failed: `Generic:: != Generic` (Generic vs Generic)", ); } diff --git a/.cargo-vendor/anyhow/tests/test_fmt.rs b/.cargo-vendor/anyhow/tests/test_fmt.rs index 9766d366ee..8206f22c41 100644 --- a/.cargo-vendor/anyhow/tests/test_fmt.rs +++ b/.cargo-vendor/anyhow/tests/test_fmt.rs @@ -79,7 +79,6 @@ fn test_altdisplay() { } #[test] -#[cfg_attr(not(std_backtrace), ignore)] fn test_debug() { assert_eq!(EXPECTED_DEBUG_F, format!("{:?}", f().unwrap_err())); assert_eq!(EXPECTED_DEBUG_G, format!("{:?}", g().unwrap_err())); diff --git a/.cargo-vendor/capnp-rpc/.cargo-checksum.json b/.cargo-vendor/capnp-rpc/.cargo-checksum.json index a21b4d0328..eefa3a61aa 100644 --- a/.cargo-vendor/capnp-rpc/.cargo-checksum.json +++ b/.cargo-vendor/capnp-rpc/.cargo-checksum.json @@ -1 +1 @@ -{"files":{"CHANGELOG.md":"fa1d6035760450a616d9b271eaa43bad660d8d277ab2e0cc99fb13a814c3abb1","Cargo.toml":"2292ffa5c8f35496672d71292bace32b301e60a402b6ea90127def345af61dcc","LICENSE":"4c2dafff9370c57598f847969a8240b901226315bac3aff066955ce922361bbf","README.md":"c07aab049c8e08b8df0233871b4c9ffa9d03ff88f35a3b019183cef67ab1b8da","schema/rpc-twoparty.capnp":"a28328408261d476403acb1f3861a7d88075ffaefca1996c21c746b580527223","schema/rpc.capnp":"026845b4658ac5c3ef40d0c892060241ba1caed09b8219c158ee609ccfcfadf5","src/attach.rs":"d5aa5be3a4e6f351ae92726d13c3c235fe2e8e05dec4604ffc21cf7b2bcefe4a","src/broken.rs":"bbb1594cb9c8131c052bd06c137d739c2d6eca920417b6ed10f08f68b465150a","src/lib.rs":"7ecb23b3e62cb952f32dd5aa48c40a9fa13993984d3dafd284852198ecdfaca1","src/local.rs":"89ba8ce91125952bba77e0e07a8afac6167415e3b00b7bcdda771c15136f228f","src/queued.rs":"b53eebb10d63d1512aa4de65e7b68dcd002921f17105a048174c7e503e382bee","src/reconnect.rs":"297db6e8232890fd880c60f7681499b61dc2fe0d0dc4a3543a7ab98ca1722353","src/rpc.rs":"984fd7acec2a48eeeabc5fb89aa605791a929371d858032c7688d22c0cd89bc7","src/rpc_capnp.rs":"c5faeee47cd090f19aeeddd5d606c8c8679c150499883eb5c896cfa5b434d8ae","src/rpc_twoparty_capnp.rs":"8c63372455cd209fd69f45903b748e8fef8197beb6fe0a59b4eb096a8c2830de","src/sender_queue.rs":"a49dda2fe5d228c9e56092f7e046a04af0eb1cd00accbf2842d0253d2c8a18b4","src/split.rs":"97a408c97a86654560484af3ac368ee7a615439ba55a9f905c84b7618dad327c","src/task_set.rs":"f06f9ce3bd0f23bf551aa82a7894d06aaafe79fbec819939a66a3e81d4527433","src/twoparty.rs":"437e3f41d5e541bb9a70fb9f9997108701fefe2479fdcc7de6e9cd254c82700c"},"package":"13b692f9454566fa16c5897a5d329e77496b6c8012777025f18cc82f7a65617e"} \ No newline at end of file +{"files":{"CHANGELOG.md":"6c050bab9297fb7b1e7a035555649561bf3774c5a0e368b7e684eef0d3d031a4","Cargo.toml":"51ddfa517b37c08ef9337425510e59624b8e4e9672e4840f88e00a46731d329d","LICENSE":"4c2dafff9370c57598f847969a8240b901226315bac3aff066955ce922361bbf","README.md":"c07aab049c8e08b8df0233871b4c9ffa9d03ff88f35a3b019183cef67ab1b8da","schema/rpc-twoparty.capnp":"a28328408261d476403acb1f3861a7d88075ffaefca1996c21c746b580527223","schema/rpc.capnp":"026845b4658ac5c3ef40d0c892060241ba1caed09b8219c158ee609ccfcfadf5","src/attach.rs":"d5aa5be3a4e6f351ae92726d13c3c235fe2e8e05dec4604ffc21cf7b2bcefe4a","src/broken.rs":"bbb1594cb9c8131c052bd06c137d739c2d6eca920417b6ed10f08f68b465150a","src/lib.rs":"7ecb23b3e62cb952f32dd5aa48c40a9fa13993984d3dafd284852198ecdfaca1","src/local.rs":"89ba8ce91125952bba77e0e07a8afac6167415e3b00b7bcdda771c15136f228f","src/queued.rs":"b53eebb10d63d1512aa4de65e7b68dcd002921f17105a048174c7e503e382bee","src/reconnect.rs":"297db6e8232890fd880c60f7681499b61dc2fe0d0dc4a3543a7ab98ca1722353","src/rpc.rs":"370456a5f7b770dd2af27b6a5ec0a8a7cc564f173abe6bee8d852303cf82930a","src/rpc_capnp.rs":"c5faeee47cd090f19aeeddd5d606c8c8679c150499883eb5c896cfa5b434d8ae","src/rpc_twoparty_capnp.rs":"8c63372455cd209fd69f45903b748e8fef8197beb6fe0a59b4eb096a8c2830de","src/sender_queue.rs":"a49dda2fe5d228c9e56092f7e046a04af0eb1cd00accbf2842d0253d2c8a18b4","src/split.rs":"97a408c97a86654560484af3ac368ee7a615439ba55a9f905c84b7618dad327c","src/task_set.rs":"f06f9ce3bd0f23bf551aa82a7894d06aaafe79fbec819939a66a3e81d4527433","src/twoparty.rs":"8c58931b8182d92825083721bacc826383953f9a3fb9b348f766a359f0e27bdd"},"package":"04f09758ec79a2825c9bc87cbe1c8ded306c99a83b52cf89577667ebff2d3ff7"} \ No newline at end of file diff --git a/.cargo-vendor/capnp-rpc/CHANGELOG.md b/.cargo-vendor/capnp-rpc/CHANGELOG.md index abf364d7dd..9b0b919b84 100644 --- a/.cargo-vendor/capnp-rpc/CHANGELOG.md +++ b/.cargo-vendor/capnp-rpc/CHANGELOG.md @@ -1,3 +1,11 @@ +## v0.19.4 +- Use the `noFinishNeeded` field to elide Finish messages when possible. + +## v0.19.3 +- Remove some unneeded fields in Answer and Import. +- Use `let else` to improve readability. +- Use a tighter size_hint estimate for Resolve messages. + ## v0.19.2 - Use size hint in new_outgoing_message(). Should improve performance somewhat. diff --git a/.cargo-vendor/capnp-rpc/Cargo.toml b/.cargo-vendor/capnp-rpc/Cargo.toml index 9e0d84e9ff..04d0b02ed3 100644 --- a/.cargo-vendor/capnp-rpc/Cargo.toml +++ b/.cargo-vendor/capnp-rpc/Cargo.toml @@ -12,9 +12,13 @@ [package] edition = "2021" name = "capnp-rpc" -version = "0.19.2" -authors = ["David Renshaw "] +version = "0.19.4" +authors = ["David Renshaw "] +build = false +autobins = false autoexamples = false +autotests = false +autobenches = false description = "implementation of the Cap'n Proto remote procedure call protocol" documentation = "https://docs.rs/capnp-rpc/" readme = "README.md" @@ -22,6 +26,10 @@ categories = ["network-programming"] license = "MIT" repository = "https://github.com/capnproto/capnproto-rust" +[lib] +name = "capnp_rpc" +path = "src/lib.rs" + [dependencies.capnp] version = "0.19.0" diff --git a/.cargo-vendor/capnp-rpc/src/rpc.rs b/.cargo-vendor/capnp-rpc/src/rpc.rs index 2068fc775d..86d39af679 100644 --- a/.cargo-vendor/capnp-rpc/src/rpc.rs +++ b/.cargo-vendor/capnp-rpc/src/rpc.rs @@ -35,7 +35,7 @@ use futures::{future, Future, FutureExt, TryFutureExt}; use std::cell::{Cell, RefCell}; use std::cmp::Reverse; use std::collections::binary_heap::BinaryHeap; -use std::collections::hash_map::HashMap; +use std::collections::hash_map::{self, HashMap}; use std::mem; use std::rc::{Rc, Weak}; @@ -154,6 +154,9 @@ where /// The local QuestionRef, set to None when it is destroyed. self_ref: Option>>>, + + /// If true, don't send a Finish message. + skip_finish: bool, } impl Question { @@ -163,6 +166,7 @@ impl Question { param_exports: Vec::new(), is_tail_call: false, self_ref: None, + skip_finish: false, } } } @@ -206,37 +210,35 @@ impl QuestionRef { impl Drop for QuestionRef { fn drop(&mut self) { let mut questions = self.connection_state.questions.borrow_mut(); - match &mut questions.slots[self.id as usize] { - Some(q) => { - if let Ok(ref mut c) = *self.connection_state.connection.borrow_mut() { - let mut message = c.new_outgoing_message(5); - { - let root: message::Builder = message.get_body().unwrap().init_as(); - let mut builder = root.init_finish(); - builder.set_question_id(self.id); - - // If we're still awaiting a return, then this request is being - // canceled, and we're going to ignore any capabilities in the return - // message, so set releaseResultCaps true. If we already received the - // return, then we've already built local proxies for the caps and will - // send Release messages when those are destroyed. - builder.set_release_result_caps(q.is_awaiting_return); - } - let _ = message.send(); - } - - if q.is_awaiting_return { - // Still waiting for return, so just remove the QuestionRef pointer from the table. - q.self_ref = None; - } else { - // Call has already returned, so we can now remove it from the table. - questions.erase(self.id) + let Some(q) = &mut questions.slots[self.id as usize] else { + unreachable!() + }; + if let Ok(ref mut c) = *self.connection_state.connection.borrow_mut() { + if !q.skip_finish { + let mut message = c.new_outgoing_message(5); + { + let root: message::Builder = message.get_body().unwrap().init_as(); + let mut builder = root.init_finish(); + builder.set_question_id(self.id); + + // If we're still awaiting a return, then this request is being + // canceled, and we're going to ignore any capabilities in the return + // message, so set releaseResultCaps true. If we already received the + // return, then we've already built local proxies for the caps and will + // send Release messages when those are destroyed. + builder.set_release_result_caps(q.is_awaiting_return); } - } - None => { - unreachable!() + let _ = message.send(); } } + + if q.is_awaiting_return { + // Still waiting for return, so just remove the QuestionRef pointer from the table. + q.self_ref = None; + } else { + // Call has already returned, so we can now remove it from the table. + questions.erase(self.id) + } } } @@ -244,10 +246,6 @@ struct Answer where VatId: 'static, { - // True from the point when the Call message is received to the point when both the `Finish` - // message has been received and the `Return` has been sent. - active: bool, - return_has_been_sent: bool, // Send pipelined calls here. Becomes null as soon as a `Finish` is received. @@ -268,7 +266,6 @@ where impl Answer { fn new() -> Self { Self { - active: false, return_has_been_sent: false, pipeline: None, redirected_results: None, @@ -302,8 +299,7 @@ pub struct Import where VatId: 'static, { - // Becomes null when the import is destroyed. - import_client: Option<(Weak>>, usize)>, + import_client: Weak>>, // Either a copy of importClient, or, in the case of promises, the wrapping PromiseClient. // Becomes null when it is discarded *or* when the import is destroyed (e.g. the promise is @@ -315,9 +311,9 @@ where } impl Import { - fn new() -> Self { + fn new(import_client: &Rc>>) -> Self { Self { - import_client: None, + import_client: Rc::downgrade(import_client), app_client: None, promise_client_to_resolve: None, } @@ -420,6 +416,7 @@ where answers: RefCell>>, imports: RefCell>>, + /// Exports keyed by ClientHook::get_ptr(). exports_by_cap: RefCell>, embargoes: RefCell>, @@ -555,27 +552,25 @@ impl ConnectionState { let connection = mem::replace(&mut *self.connection.borrow_mut(), Err(error.clone())); - match connection { - Ok(mut c) => { - let promise = c.shutdown(Err(error)).then(|r| match r { - Ok(()) => Promise::ok(()), - Err(e) => { - if e.kind != ::capnp::ErrorKind::Disconnected { - // Don't report disconnects as an error. - Promise::err(e) - } else { - Promise::ok(()) - } - } - }); - match self.disconnect_fulfiller.borrow_mut().take() { - None => unreachable!(), - Some(fulfiller) => { - let _ = fulfiller.send(Promise::from_future(promise.attach(c))); - } + let Ok(mut c) = connection else { + unreachable!() + }; + let promise = c.shutdown(Err(error)).then(|r| match r { + Ok(()) => Promise::ok(()), + Err(e) => { + if e.kind != ::capnp::ErrorKind::Disconnected { + // Don't report disconnects as an error. + Promise::err(e) + } else { + Promise::ok(()) } } - Err(_) => unreachable!(), + }); + match self.disconnect_fulfiller.borrow_mut().take() { + None => unreachable!(), + Some(fulfiller) => { + let _ = fulfiller.send(Promise::from_future(promise.attach(c))); + } } } @@ -762,17 +757,17 @@ impl ConnectionState { }; let slots = &mut connection_state.answers.borrow_mut().slots; - let answer = slots.entry(answer_id).or_insert_with(Answer::new); - if answer.active { + let hash_map::Entry::Vacant(slot) = slots.entry(answer_id) else { connection_state.release_exports(&result_exports)?; return Err(Error::failed("questionId is already in use".to_string())); - } - answer.active = true; + }; + let mut answer = Answer::new(); answer.return_has_been_sent = true; answer.result_exports = result_exports; answer.pipeline = Some(Box::new(SingleCapPipeline::new( connection_state.bootstrap_cap.clone(), ))); + slot.insert(answer); let _ = response.send(); Ok(()) @@ -782,20 +777,16 @@ impl ConnectionState { let mut exports_to_release = Vec::new(); let answer_id = finish.get_question_id(); - let mut erase = false; let answers_slots = &mut connection_state.answers.borrow_mut().slots; - match answers_slots.get_mut(&answer_id) { - None => { - return Err(Error::failed(format!( - "Invalid question ID {answer_id} in Finish message." - ))); - } - Some(answer) => { - if !answer.active { - return Err(Error::failed(format!( - "'Finish' for invalid question ID {answer_id}." - ))); - } + match answers_slots.entry(answer_id) { + hash_map::Entry::Vacant(_) => { + // The `Finish` message targets a question ID that isn't present in our answer table. + // Probably, we sent a `Return` with `noFinishNeeded = true`, but the other side didn't + // recognize this hint and sent a `Finish` anyway, or the `Finish` was already in-flight at + // the time we sent the `Return`. We can silently ignore this. + } + hash_map::Entry::Occupied(mut entry) => { + let answer = entry.get_mut(); answer.received_finish.set(true); if finish.get_release_result_caps() { @@ -807,15 +798,11 @@ impl ConnectionState { answer.call_completion_promise.take(); if answer.return_has_been_sent { - erase = true; + entry.remove(); } } } - if erase { - answers_slots.remove(&answer_id); - } - connection_state.release_exports(&exports_to_release)?; Ok(()) } @@ -970,11 +957,10 @@ impl ConnectionState { { let slots = &mut connection_state.answers.borrow_mut().slots; - let answer = slots.entry(question_id).or_insert(answer); - if answer.active { + let hash_map::Entry::Vacant(slot) = slots.entry(question_id) else { return Err(Error::failed("questionId is already in use".to_string())); - } - answer.active = true; + }; + slot.insert(answer); } let call_promise = @@ -1029,6 +1015,9 @@ impl ConnectionState { match questions.slots[question_id as usize] { Some(ref mut question) => { question.is_awaiting_return = false; + if ret.get_no_finish_needed() { + question.skip_finish = true; + } match question.self_ref { Some(ref question_ref) => match ret.which()? { return_::Results(results) => { @@ -1165,21 +1154,16 @@ impl ConnectionState { } fn answer_has_sent_return(&self, id: AnswerId, result_exports: Vec) { - let mut erase = false; let answers_slots = &mut self.answers.borrow_mut().slots; - if let Some(a) = answers_slots.get_mut(&id) { - a.return_has_been_sent = true; - if a.received_finish.get() { - erase = true; - } else { - a.result_exports = result_exports; - } - } else { + let hash_map::Entry::Occupied(mut entry) = answers_slots.entry(id) else { unreachable!() - } - - if erase { - answers_slots.remove(&id); + }; + let a = entry.get_mut(); + a.return_has_been_sent = true; + if a.received_finish.get() { + entry.remove(); + } else { + a.result_exports = result_exports; } } @@ -1241,23 +1225,23 @@ impl ConnectionState { let promised_answer = promised_answer?; let question_id = promised_answer.get_question_id(); - match self.answers.borrow().slots.get(&question_id) { - None => Err(Error::failed( - "PromisedAnswer.questionId is not a current question.".to_string(), - )), + let pipeline = match self.answers.borrow().slots.get(&question_id) { + None => Box::new(broken::Pipeline::new(Error::failed( + "Pipeline call on a request that returned no capabilities or was already closed.".to_string(), + ))) as Box, Some(base) => { - let pipeline = match base.pipeline { + match base.pipeline { Some(ref pipeline) => pipeline.add_ref(), None => Box::new(broken::Pipeline::new(Error::failed( "Pipeline call on a request that returned not capabilities or was \ already closed." .to_string(), ))) as Box, - }; - let ops = to_pipeline_ops(promised_answer.get_transform()?)?; - Ok(pipeline.get_pipelined_cap(&ops)) + } } - } + }; + let ops = to_pipeline_ops(promised_answer.get_transform()?)?; + Ok(pipeline.get_pipelined_cap(&ops)) } } } @@ -1348,7 +1332,7 @@ impl ConnectionState { } // OK, we have to send a `Resolve` message. - let mut message = connection_state.new_outgoing_message(100)?; // XXX size hint? + let mut message = connection_state.new_outgoing_message(15)?; { let root: message::Builder = message.get_body()?.get_as()?; let mut resolve = root.init_resolve(); @@ -1364,7 +1348,7 @@ impl ConnectionState { } Err(e) => { // send error resolution - let mut message = connection_state.new_outgoing_message(100)?; // XXX size hint? + let mut message = connection_state.new_outgoing_message(15)?; { let root: message::Builder = message.get_body()?.get_as()?; let mut resolve = root.init_resolve(); @@ -1399,14 +1383,10 @@ impl ConnectionState { if contains_key { // We've already seen and exported this capability before. Just up the refcount. let export_id = state.exports_by_cap.borrow()[&ptr]; - match state.exports.borrow_mut().find(export_id) { - None => unreachable!(), - Some(exp) => { - descriptor.set_sender_hosted(export_id); - exp.refcount += 1; - Ok(Some(export_id)) - } - } + descriptor.set_sender_hosted(export_id); + // Should never fail because exports_by_cap should match exports. + state.exports.borrow_mut().find(export_id).unwrap().refcount += 1; + Ok(Some(export_id)) } else { // This is the first time we've seen this capability. @@ -1463,72 +1443,61 @@ impl ConnectionState { let connection_state = state.clone(); let import_client = { - let slots = &mut state.imports.borrow_mut().slots; - let v = slots.entry(import_id).or_insert_with(Import::new); - if v.import_client.is_some() { - v.import_client - .as_ref() - .unwrap() - .0 + match state.imports.borrow_mut().slots.entry(import_id) { + hash_map::Entry::Occupied(occ) => occ + .get() + .import_client .upgrade() - .expect("dangling ref to import client?") - } else { - let import_client = ImportClient::new(&connection_state, import_id); - v.import_client = Some(( - Rc::downgrade(&import_client), - (&*import_client.borrow()) as *const _ as usize, - )); - import_client + .expect("dangling ref to import client?"), + hash_map::Entry::Vacant(v) => { + let import_client = ImportClient::new(&connection_state, import_id); + v.insert(Import::new(&import_client)); + import_client + } } }; // We just received a copy of this import ID, so the remote refcount has gone up. import_client.borrow_mut().add_remote_ref(); + let mut tmp = state.imports.borrow_mut(); + let Some(import) = tmp.slots.get_mut(&import_id) else { + unreachable!() + }; + if is_promise { // We need to construct a PromiseClient around this import, if we haven't already. - match state.imports.borrow_mut().slots.get_mut(&import_id) { - Some(import) => { - match &import.app_client { - Some(c) => { - // Use the existing one. - Box::new(c.upgrade().expect("dangling client ref?")) - } - None => { - // Create a promise for this import's resolution. - - let client: Box> = Box::new(import_client.into()); - let client: Box = client; - - // XXX do I need something like this? - // Make sure the import is not destroyed while this promise exists. - // let promise = promise.attach(client.add_ref()); - - let client = - PromiseClient::new(&connection_state, client, Some(import_id)); - - import.promise_client_to_resolve = Some(Rc::downgrade(&client)); - let client: Box> = Box::new(client.into()); - import.app_client = Some(client.downgrade()); - client - } - } + match &import.app_client { + Some(c) => { + // Use the existing one. + Box::new(c.upgrade().expect("dangling client ref?")) } None => { - unreachable!() + // Create a promise for this import's resolution. + + let client: Box> = Box::new(import_client.into()); + let client: Box = client; + + // Here the C++ implementation does something like: + // ``` + // // Make sure the import is not destroyed while this promise exists. + // let promise = promise.attach(client.add_ref()); + // ``` + // However, as far as I can tell that is unnecessary, because the + // PromiseClient holds `client` until it resolves, after which point + // there is no reason to keep the import alive. + + let client = PromiseClient::new(&connection_state, client, Some(import_id)); + + import.promise_client_to_resolve = Some(Rc::downgrade(&client)); + let client: Box> = Box::new(client.into()); + import.app_client = Some(client.downgrade()); + client } } } else { let client: Box> = Box::new(import_client.into()); - match state.imports.borrow_mut().slots.get_mut(&import_id) { - Some(v) => { - v.app_client = Some(client.downgrade()); - } - None => { - unreachable!() - } - }; - + import.app_client = Some(client.downgrade()); client } } @@ -1550,7 +1519,7 @@ impl ConnectionState { Ok(Some(exp.client_hook.add_ref())) } else { Ok(Some(broken::new_cap(Error::failed( - "invalid 'receivedHosted' export ID".to_string(), + "invalid 'receiverHosted' export ID".to_string(), )))) } } @@ -1558,11 +1527,9 @@ impl ConnectionState { let promised_answer = receiver_answer?; let question_id = promised_answer.get_question_id(); if let Some(answer) = state.answers.borrow().slots.get(&question_id) { - if answer.active { - if let Some(ref pipeline) = answer.pipeline { - let ops = to_pipeline_ops(promised_answer.get_transform()?)?; - return Ok(Some(pipeline.get_pipelined_cap(&ops))); - } + if let Some(ref pipeline) = answer.pipeline { + let ops = to_pipeline_ops(promised_answer.get_transform()?)?; + return Ok(Some(pipeline.get_pipelined_cap(&ops))); } } Ok(Some(broken::new_cap(Error::failed( @@ -2144,17 +2111,13 @@ impl Params { impl ParamsHook for Params { fn get(&self) -> ::capnp::Result { let root: message::Reader = self.request.get_body()?.get_as()?; - match root.which()? { - message::Call(call) => { - use ::capnp::traits::Imbue; - let mut content = call?.get_params()?.get_content(); - content.imbue(&self.cap_table); - Ok(content) - } - _ => { - unreachable!() - } - } + let message::Call(call) = root.which()? else { + unreachable!() + }; + use ::capnp::traits::Imbue; + let mut content = call?.get_params()?.get_content(); + content.imbue(&self.cap_table); + Ok(content) } } @@ -2261,36 +2224,29 @@ impl Drop for Results { impl ResultsHook for Results { fn get(&mut self) -> ::capnp::Result { use ::capnp::traits::ImbueMut; - if let Some(ref mut inner) = self.inner { - inner.ensure_initialized(); - match inner.variant { - None => unreachable!(), - Some(ResultsVariant::Rpc(ref mut message, ref mut cap_table)) => { - let root: message::Builder = message.get_body()?.get_as()?; - match root.which()? { - message::Return(ret) => match ret?.which()? { - return_::Results(payload) => { - let mut content = payload?.get_content(); - content.imbue_mut(cap_table); - Ok(content) - } - _ => { - unreachable!() - } - }, - _ => { - unreachable!() - } - } - } - Some(ResultsVariant::LocallyRedirected(ref mut message, ref mut cap_table)) => { - let mut result: any_pointer::Builder = message.get_root()?; - result.imbue_mut(cap_table); - Ok(result) - } + let Some(ref mut inner) = self.inner else { + unreachable!(); + }; + inner.ensure_initialized(); + match inner.variant { + None => unreachable!(), + Some(ResultsVariant::Rpc(ref mut message, ref mut cap_table)) => { + let root: message::Builder = message.get_body()?.get_as()?; + let message::Return(ret) = root.which()? else { + unreachable!(); + }; + let return_::Results(payload) = ret?.which()? else { + unreachable!() + }; + let mut content = payload?.get_content(); + content.imbue_mut(cap_table); + Ok(content) + } + Some(ResultsVariant::LocallyRedirected(ref mut message, ref mut cap_table)) => { + let mut result: any_pointer::Builder = message.get_root()?; + result.imbue_mut(cap_table); + Ok(result) } - } else { - unreachable!() } } @@ -2410,23 +2366,23 @@ impl ResultsDone { (false, Ok(())) => { let exports = { let root: message::Builder = message.get_body()?.get_as()?; - match root.which()? { - message::Return(ret) => match ret?.which()? { - crate::rpc_capnp::return_::Results(Ok(payload)) => { - ConnectionState::write_descriptors( - &connection_state, - &cap_table, - payload, - ) - } - _ => { - unreachable!() - } - }, - _ => { - unreachable!() - } + let message::Return(Ok(mut ret)) = root.which()? else { + unreachable!() + }; + if cap_table.is_empty() { + ret.set_no_finish_needed(true); + finish_received.set(true); } + let crate::rpc_capnp::return_::Results(Ok(payload)) = + ret.which()? + else { + unreachable!() + }; + ConnectionState::write_descriptors( + &connection_state, + &cap_table, + payload, + ) }; let (_promise, m) = message.send(); @@ -2505,21 +2461,15 @@ impl ResultsDoneHook for ResultsDone { match *self.inner { ResultsDoneVariant::Rpc(ref message, ref cap_table) => { let root: message::Reader = message.get_root_as_reader()?; - match root.which()? { - message::Return(ret) => match ret?.which()? { - crate::rpc_capnp::return_::Results(payload) => { - let mut content = payload?.get_content(); - content.imbue(cap_table); - Ok(content) - } - _ => { - unreachable!() - } - }, - _ => { - unreachable!() - } - } + let message::Return(ret) = root.which()? else { + unreachable!(); + }; + let crate::rpc_capnp::return_::Results(payload) = ret?.which()? else { + unreachable!(); + }; + let mut content = payload?.get_content(); + content.imbue(cap_table); + Ok(content) } ResultsDoneVariant::LocallyRedirected(ref message, ref cap_table) => { let mut result: any_pointer::Reader = message.get_root_as_reader()?; @@ -2606,23 +2556,15 @@ impl Drop for ImportClient { .remove(&((self) as *const _ as usize)) .is_some()); - // Remove self from the import table, if the table is still pointing at us. - let mut remove = false; - if let Some(import) = connection_state.imports.borrow().slots.get(&self.import_id) { - if let Some((_, ptr)) = import.import_client { - if ptr == ((&*self) as *const _ as usize) { - remove = true; - } - } - } - - if remove { - connection_state - .imports - .borrow_mut() - .slots - .remove(&self.import_id); - } + // Remove the corresponding entry of the imports table. + // Note: the C++ implementation checks here pointer equality between self and + // the entry in the imports table, but as far as I can tell the check should + // always pass because of how we construct ImportClient in import(). + connection_state + .imports + .borrow_mut() + .slots + .remove(&self.import_id); // Send a message releasing our remote references. let mut tmp = connection_state.connection.borrow_mut(); @@ -2828,17 +2770,13 @@ impl Drop for PromiseClient { // object may actually outlive the import. let slots = &mut self.connection_state.imports.borrow_mut().slots; if let Some(import) = slots.get_mut(&id) { - let mut drop_it = false; if let Some(c) = &import.app_client { if let Some(cs) = c.upgrade() { if cs.get_ptr() == self_ptr { - drop_it = true; + import.app_client = None; } } } - if drop_it { - import.app_client = None; - } } } diff --git a/.cargo-vendor/capnp-rpc/src/twoparty.rs b/.cargo-vendor/capnp-rpc/src/twoparty.rs index 86dfc34986..362363f178 100644 --- a/.cargo-vendor/capnp-rpc/src/twoparty.rs +++ b/.cargo-vendor/capnp-rpc/src/twoparty.rs @@ -215,7 +215,8 @@ where T: AsyncRead + Unpin, { /// Creates a new two-party vat network that will receive data on `input_stream` and send data on - /// `output_stream`. + /// `output_stream`. (Typically, performance is best if these streams are buffered, possibly via + /// `futures::io::BufReader` and `futures::io::BufWriter`.) /// /// `side` indicates whether this is the client or the server side of the connection. This has no /// effect on the data sent over the connection; it merely exists so that `RpcNetwork::bootstrap` knows diff --git a/.cargo-vendor/dashmap/.cargo-checksum.json b/.cargo-vendor/dashmap/.cargo-checksum.json index 12fecc8627..36ec400397 100644 --- a/.cargo-vendor/dashmap/.cargo-checksum.json +++ b/.cargo-vendor/dashmap/.cargo-checksum.json @@ -1 +1 @@ -{"files":{"Cargo.toml":"1897012ae6a45bb9ba24caff7dac70ca33b381819c6c807e9ffcdc4840e89bcf","LICENSE":"16692e8cee4aa06e3913787497eba2d47c42002014136f5da67be6ee640e28a3","README.md":"7f7b4edce5b4baabf639df517a66bfa2cd8ff759f09060c17fe6da54531b5819","rust-toolchain.toml":"8e14ad3424881d09f3b219e947b4b95f12726295abde287f91d10af8c5a7dd13","src/arbitrary.rs":"236abf377cbae8393961e0e4327ce2515d5aeeddfb1fabb1f2035c69dfea290c","src/iter.rs":"968160615c859b3fc838dc41a1d83d2220555f4fe72330c6d8a27ac6dd5af1d0","src/iter_set.rs":"3285ed3022bc7710407ba7f8c07fad246da66aa5a47960380521790ba01576e1","src/lib.rs":"f162bb4a12a5ce85b0eca7857c8de3a05fdd348cfa894de56cf661038add01f4","src/lock.rs":"22b1013ee3cbd1598c26403552faf8e5b44fe98a8ff4c8812da15d57bdeee4b3","src/mapref/entry.rs":"7888da7c95589f1100bd95fbe10e47d5f9fb3732892a8b656b90e34399bc422e","src/mapref/mod.rs":"15bd45cfc642a9e3e77bbfbf2d9fad9c5fac0ff6904214a3c501e262242ec8b0","src/mapref/multiple.rs":"c501e37e9a73f577bc9bf395dae5ab243e217bad16da435e18112b3d1bc48eb5","src/mapref/one.rs":"befc44050f8775c508f16582f558db1435f8e1495f40f99482dba5f3dec27a32","src/rayon/map.rs":"3c923143d20ed2fcbb727f598ca3b69ad8a15c80cc0dcf95bbc673034a14d0b5","src/rayon/read_only.rs":"861fe5682e0e7f0ca90f4720c9c6add230e37b0251da05159011b56ffb67c032","src/rayon/set.rs":"c3ed101ede17b562ea02dc5119ecc209b1f0d7c2cd83b9a2f6c310d793a88704","src/read_only.rs":"28004bd945e7047804d7da1e02e7db6d8e5cd45f2c3a162fe80ae9482b5d65d6","src/serde.rs":"9f83f02206b7d27c09d6e19735572463e184314fbf81204e116201e58ca7e428","src/set.rs":"6ae6040592e1e2c4e4ad4509e6b60e0f5d4e458a1ed55f942cc6d79051f585ec","src/setref/mod.rs":"cc39e406a333dc6c04398f4b1336fb400e3a8360c387466d8a91f5d7f4ed40a7","src/setref/multiple.rs":"65ad2cf01b176bf8476f515f6c83f6d62abe4ac83f54a7b136a4719c40eeb94f","src/setref/one.rs":"f0bdb1aee3ceed1154dfc6d5b4cf59aec563bc9a5029b01328ca9d45f784e4bf","src/t.rs":"edca6671a8dee6de610e722c1d25ad2d278249157d7379f3d18aa09f004be687","src/try_result.rs":"81d1dd396f70b0aa2a6e1969851b706cbfdfb09c802ac9d33dcace882aa28dd1","src/util.rs":"3c23ab576bb0dd5ea9a1d988fdb811c9bceceeb710a00096df628825a3f5fc69"},"package":"804c8821570c3f8b70230c2ba75ffa5c0f9a4189b9a432b6656c536712acae28"} \ No newline at end of file +{"files":{"Cargo.toml":"4a8e7cbef98ce94d83d79e4cf5ab8115a53a3bbf1b4bbf855a7656d6a9be4791","LICENSE":"16692e8cee4aa06e3913787497eba2d47c42002014136f5da67be6ee640e28a3","README.md":"7f7b4edce5b4baabf639df517a66bfa2cd8ff759f09060c17fe6da54531b5819","rust-toolchain.toml":"8e14ad3424881d09f3b219e947b4b95f12726295abde287f91d10af8c5a7dd13","src/arbitrary.rs":"236abf377cbae8393961e0e4327ce2515d5aeeddfb1fabb1f2035c69dfea290c","src/iter.rs":"968160615c859b3fc838dc41a1d83d2220555f4fe72330c6d8a27ac6dd5af1d0","src/iter_set.rs":"3285ed3022bc7710407ba7f8c07fad246da66aa5a47960380521790ba01576e1","src/lib.rs":"f5b17327504b03128a7aef5b8240ac5cce969cfffb62511298bafed9df88c79b","src/lock.rs":"22b1013ee3cbd1598c26403552faf8e5b44fe98a8ff4c8812da15d57bdeee4b3","src/mapref/entry.rs":"7888da7c95589f1100bd95fbe10e47d5f9fb3732892a8b656b90e34399bc422e","src/mapref/mod.rs":"15bd45cfc642a9e3e77bbfbf2d9fad9c5fac0ff6904214a3c501e262242ec8b0","src/mapref/multiple.rs":"c501e37e9a73f577bc9bf395dae5ab243e217bad16da435e18112b3d1bc48eb5","src/mapref/one.rs":"befc44050f8775c508f16582f558db1435f8e1495f40f99482dba5f3dec27a32","src/rayon/map.rs":"3c923143d20ed2fcbb727f598ca3b69ad8a15c80cc0dcf95bbc673034a14d0b5","src/rayon/read_only.rs":"861fe5682e0e7f0ca90f4720c9c6add230e37b0251da05159011b56ffb67c032","src/rayon/set.rs":"c3ed101ede17b562ea02dc5119ecc209b1f0d7c2cd83b9a2f6c310d793a88704","src/read_only.rs":"28004bd945e7047804d7da1e02e7db6d8e5cd45f2c3a162fe80ae9482b5d65d6","src/serde.rs":"9f83f02206b7d27c09d6e19735572463e184314fbf81204e116201e58ca7e428","src/set.rs":"1c580282f17a4c68b564a6670425d4b6cdb34646f61e253ac79b553b524ecbde","src/setref/mod.rs":"cc39e406a333dc6c04398f4b1336fb400e3a8360c387466d8a91f5d7f4ed40a7","src/setref/multiple.rs":"65ad2cf01b176bf8476f515f6c83f6d62abe4ac83f54a7b136a4719c40eeb94f","src/setref/one.rs":"f0bdb1aee3ceed1154dfc6d5b4cf59aec563bc9a5029b01328ca9d45f784e4bf","src/t.rs":"edca6671a8dee6de610e722c1d25ad2d278249157d7379f3d18aa09f004be687","src/try_result.rs":"81d1dd396f70b0aa2a6e1969851b706cbfdfb09c802ac9d33dcace882aa28dd1","src/util.rs":"3c23ab576bb0dd5ea9a1d988fdb811c9bceceeb710a00096df628825a3f5fc69"},"package":"5041cc499144891f3790297212f32a74fb938e5136a14943f338ef9e0ae276cf"} \ No newline at end of file diff --git a/.cargo-vendor/dashmap/Cargo.toml b/.cargo-vendor/dashmap/Cargo.toml index bc70ef1858..fbe60fb199 100644 --- a/.cargo-vendor/dashmap/Cargo.toml +++ b/.cargo-vendor/dashmap/Cargo.toml @@ -13,7 +13,7 @@ edition = "2018" rust-version = "1.65" name = "dashmap" -version = "6.0.1" +version = "6.1.0" authors = ["Acrimon "] description = "Blazing fast concurrent HashMap for Rust." homepage = "https://github.com/xacrimon/dashmap" @@ -72,6 +72,12 @@ version = "1.0.188" features = ["derive"] optional = true +[dependencies.typesize] +version = "0.1.8" +optional = true +default-features = false + [features] inline = ["hashbrown/inline-more"] raw-api = [] +typesize = ["dep:typesize"] diff --git a/.cargo-vendor/dashmap/src/lib.rs b/.cargo-vendor/dashmap/src/lib.rs index ad2b321afe..c0abb5e689 100644 --- a/.cargo-vendor/dashmap/src/lib.rs +++ b/.cargo-vendor/dashmap/src/lib.rs @@ -1346,6 +1346,45 @@ impl FromIterator<(K, V)> for } } +#[cfg(feature = "typesize")] +impl typesize::TypeSize for DashMap +where + K: typesize::TypeSize + Eq + Hash, + V: typesize::TypeSize, + S: typesize::TypeSize + Clone + BuildHasher, +{ + fn extra_size(&self) -> usize { + let shards_extra_size: usize = self + .shards + .iter() + .map(|shard_lock| { + let shard = shard_lock.read(); + let hashtable_size = shard.allocation_info().1.size(); + + // Safety: The iterator is dropped before the HashTable + let iter = unsafe { shard.iter() }; + let entry_size_iter = iter.map(|bucket| { + // Safety: The iterator returns buckets with valid pointers to entries + let (key, value) = unsafe { bucket.as_ref() }; + key.extra_size() + value.get().extra_size() + }); + + core::mem::size_of::>>>() + + hashtable_size + + entry_size_iter.sum::() + }) + .sum(); + + self.hasher.extra_size() + shards_extra_size + } + + typesize::if_typesize_details! { + fn get_collection_item_count(&self) -> Option { + Some(self.len()) + } + } +} + #[cfg(test)] mod tests { use crate::DashMap; diff --git a/.cargo-vendor/dashmap/src/set.rs b/.cargo-vendor/dashmap/src/set.rs index 14110084d6..84c9dd1696 100644 --- a/.cargo-vendor/dashmap/src/set.rs +++ b/.cargo-vendor/dashmap/src/set.rs @@ -415,6 +415,23 @@ impl FromIterator for DashSet } } +#[cfg(feature = "typesize")] +impl typesize::TypeSize for DashSet +where + K: typesize::TypeSize + Eq + Hash, + S: typesize::TypeSize + Clone + BuildHasher, +{ + fn extra_size(&self) -> usize { + self.inner.extra_size() + } + + typesize::if_typesize_details! { + fn get_collection_item_count(&self) -> Option { + Some(self.len()) + } + } +} + #[cfg(test)] mod tests { use crate::DashSet; diff --git a/.cargo-vendor/hashbrown/.cargo-checksum.json b/.cargo-vendor/hashbrown/.cargo-checksum.json index 4b77da6ba6..0c5744048e 100644 --- a/.cargo-vendor/hashbrown/.cargo-checksum.json +++ b/.cargo-vendor/hashbrown/.cargo-checksum.json @@ -1 +1 @@ -{"files":{"CHANGELOG.md":"f93d5061aa77fe578b130b84ffddb1d9f53dac45a8db5dd8edfc2fad7a3b8bca","Cargo.toml":"e8848d9e1cc46174ce8e51c40fdfb9f414a2cbb92f99a342b013b9165f897150","LICENSE-APACHE":"a60eea817514531668d7e00765731449fe14d059d3249e0bc93b36de45f759f2","LICENSE-MIT":"ff8f68cb076caf8cefe7a6430d4ac086ce6af2ca8ce2c4e5a2004d4552ef52a2","README.md":"84c222ce49510535419d338b7532a72a2bf22b7466e44de78d92d25b6c7d636b","benches/bench.rs":"ef7bc025922f077d307c565640c005d056e3d6c1713448a95aae92d3c22c1005","benches/insert_unique_unchecked.rs":"cb84275f22d5f95a5ac995ac6b2df74ffcf342765b401d27c95f2955c7b7cb9f","clippy.toml":"7535949f908c6d9aea4f9a9f3a7625552c93fc29e963d059d40f4def9d77ea7b","src/external_trait_impls/mod.rs":"0625e6a5e3b8ecc8901a12aeeea54393fd84617fb3a14d98a34d2d2bddb8d257","src/external_trait_impls/rayon/helpers.rs":"ba105bf0853ebc45157f22116ad0f55d3bdab75e721d8e7a677c7b912d0c0c6d","src/external_trait_impls/rayon/map.rs":"96fdf39b3f601f77152d7ce84541b8f51f32b9274b7da9c294862892e721a5d8","src/external_trait_impls/rayon/mod.rs":"126edc882501dddd25e442d9236508b5b386eb8c0a9f5d654f2dd081086c1616","src/external_trait_impls/rayon/raw.rs":"04012fb2e99648819b4bc0044107ed3cb94013e242b7865075c5bd9ebf1b6865","src/external_trait_impls/rayon/set.rs":"7539348ff7bc6e3cce6b3c019d62dc401eea0138c578fef729c2593e8ead1cfa","src/external_trait_impls/rayon/table.rs":"8778d29509c68b5b7cb66859db025d3939ce22e7cf370b20ff3dea4fe4b29fd0","src/external_trait_impls/rkyv/hash_map.rs":"7abe24318143b776016052b05840656afc858b1ba5252f3d418d61972477f53d","src/external_trait_impls/rkyv/hash_set.rs":"38d969125d17d606492ec4ec9fc06b7e7118eb903240dacf40de21b9b06fa5c8","src/external_trait_impls/rkyv/mod.rs":"54399ce5574fd1d84b7b0cb4238fa3e898575e89a6724299be009d2172bda02e","src/external_trait_impls/serde.rs":"6dbe104dee16b453b6b048b541c6e02c6d067d970dfafd243fc4360288b0168c","src/lib.rs":"fbc05970d6458046590e9c4a33fc9a6fdc94ef725b9b00354fa609e207e6ae50","src/macros.rs":"98a26b908fc0fbe6a58d008a317e550013d615eb3cc17a5054a573c62c1d74cb","src/map.rs":"f1280987ac23fa387c4378666c8e0a971723b3935b5d76d6b17f1f707a20c30a","src/raw/alloc.rs":"902f8588d0fdee3e5c3dc02410f41d4b38ac88843727387f929f3186b3a2d322","src/raw/bitmask.rs":"3b3dce8d6a48856ada19085abf43908f124ab3419fcf434b9ca64d7bff243f67","src/raw/generic.rs":"efc5e603be3e9a17935aef1836a38ce01c78a0093b2af0671548eb5459b37921","src/raw/mod.rs":"42dc33a975e00fa4d984cc00d33915412b5c0a80341e38b53ad46a44f65170ad","src/raw/neon.rs":"9907d8ebc36fc3df562dde478ea9b72213fda65288a304718d8647f0029dc9ad","src/raw/sse2.rs":"39038e3344e49f4638e211bcdbf56565ac53e90dce56172cc3b526fea911c2af","src/rustc_entry.rs":"8142ed89b50155602ef8c1628382bd62d3ee903920fe49d403d4100a278c6ba4","src/scopeguard.rs":"1a246e08a63c06cd8ad934bd7da229421bf804f991ae93cd7e242da27ca6c601","src/set.rs":"c23534afec96391f396904150556b149fe8500f1c0d17d70cdf10e8fa1121b45","src/table.rs":"5f5038ff39ca1680e2f5e13f9b50c7166ed41b1fa1232f7d17ff53a96c5fa8b2","tests/equivalent_trait.rs":"84faa3fe9d67c375d03fec81f0f1412c47862477d42e84e7d235258236338d5b","tests/hasher.rs":"9a8fdf67e4415618e16729969c386eefe71408cded5d46cf7b67d969276a3452","tests/raw.rs":"43ed2f98877533a0905611d9a30f26b183dd3e103e3856eeab80e7b8ac7894d3","tests/rayon.rs":"39cb24ab45fce8087bb54948715c8b6973ebfba1a325292b5b3cd9aab50b5fd2","tests/serde.rs":"6bac8054db722dd049901b37a6e006535bac30f425eb5cd91af19b5bc1dfe78e","tests/set.rs":"9f8011c29d1059aadb54b6dd4623521d5178b4278b4a56021ef2cee4bbb19fd9"},"package":"290f1a1d9242c78d09ce40a5e87e7554ee637af1351968159f4952f028f75604"} \ No newline at end of file +{"files":{"CHANGELOG.md":"1a844fe3b7466b41ca1d5914af197d5aeed7cb14f30ebe4be351367d7ca905d2","Cargo.toml":"c011f10385da722056537329f3fcf8c9b93af742e79e38885c0152a0105fc227","LICENSE-APACHE":"a60eea817514531668d7e00765731449fe14d059d3249e0bc93b36de45f759f2","LICENSE-MIT":"ff8f68cb076caf8cefe7a6430d4ac086ce6af2ca8ce2c4e5a2004d4552ef52a2","README.md":"84c222ce49510535419d338b7532a72a2bf22b7466e44de78d92d25b6c7d636b","benches/bench.rs":"ef7bc025922f077d307c565640c005d056e3d6c1713448a95aae92d3c22c1005","benches/insert_unique_unchecked.rs":"cb84275f22d5f95a5ac995ac6b2df74ffcf342765b401d27c95f2955c7b7cb9f","clippy.toml":"7535949f908c6d9aea4f9a9f3a7625552c93fc29e963d059d40f4def9d77ea7b","src/external_trait_impls/mod.rs":"0625e6a5e3b8ecc8901a12aeeea54393fd84617fb3a14d98a34d2d2bddb8d257","src/external_trait_impls/rayon/helpers.rs":"ba105bf0853ebc45157f22116ad0f55d3bdab75e721d8e7a677c7b912d0c0c6d","src/external_trait_impls/rayon/map.rs":"96fdf39b3f601f77152d7ce84541b8f51f32b9274b7da9c294862892e721a5d8","src/external_trait_impls/rayon/mod.rs":"126edc882501dddd25e442d9236508b5b386eb8c0a9f5d654f2dd081086c1616","src/external_trait_impls/rayon/raw.rs":"04012fb2e99648819b4bc0044107ed3cb94013e242b7865075c5bd9ebf1b6865","src/external_trait_impls/rayon/set.rs":"7539348ff7bc6e3cce6b3c019d62dc401eea0138c578fef729c2593e8ead1cfa","src/external_trait_impls/rayon/table.rs":"8778d29509c68b5b7cb66859db025d3939ce22e7cf370b20ff3dea4fe4b29fd0","src/external_trait_impls/rkyv/hash_map.rs":"7abe24318143b776016052b05840656afc858b1ba5252f3d418d61972477f53d","src/external_trait_impls/rkyv/hash_set.rs":"38d969125d17d606492ec4ec9fc06b7e7118eb903240dacf40de21b9b06fa5c8","src/external_trait_impls/rkyv/mod.rs":"54399ce5574fd1d84b7b0cb4238fa3e898575e89a6724299be009d2172bda02e","src/external_trait_impls/serde.rs":"6dbe104dee16b453b6b048b541c6e02c6d067d970dfafd243fc4360288b0168c","src/lib.rs":"74e250c18e55994a4a902eaa06aca034559d6de53501ed4bf9010fabc67e88a2","src/macros.rs":"98a26b908fc0fbe6a58d008a317e550013d615eb3cc17a5054a573c62c1d74cb","src/map.rs":"d484f2f81e5b4acf4b615f187241e34c3016aaaca53a5e71019cceb993c4ebd7","src/raw/alloc.rs":"902f8588d0fdee3e5c3dc02410f41d4b38ac88843727387f929f3186b3a2d322","src/raw/bitmask.rs":"3b3dce8d6a48856ada19085abf43908f124ab3419fcf434b9ca64d7bff243f67","src/raw/generic.rs":"efc5e603be3e9a17935aef1836a38ce01c78a0093b2af0671548eb5459b37921","src/raw/mod.rs":"16bbabf42dde9f3fb17c4f7e768aef47752d839bf624b81d24a48af3d418b3a2","src/raw/neon.rs":"9907d8ebc36fc3df562dde478ea9b72213fda65288a304718d8647f0029dc9ad","src/raw/sse2.rs":"39038e3344e49f4638e211bcdbf56565ac53e90dce56172cc3b526fea911c2af","src/rustc_entry.rs":"8142ed89b50155602ef8c1628382bd62d3ee903920fe49d403d4100a278c6ba4","src/scopeguard.rs":"1a246e08a63c06cd8ad934bd7da229421bf804f991ae93cd7e242da27ca6c601","src/set.rs":"a620ed68bd1610b76c4c1890615d71b2c04928bf5b345133a0588a065bce06fa","src/table.rs":"7b7174099d2e3cade0caeddd73e29b7395f3b9f4f1f21013f885b52cd93438cb","tests/equivalent_trait.rs":"84faa3fe9d67c375d03fec81f0f1412c47862477d42e84e7d235258236338d5b","tests/hasher.rs":"9a8fdf67e4415618e16729969c386eefe71408cded5d46cf7b67d969276a3452","tests/raw.rs":"43ed2f98877533a0905611d9a30f26b183dd3e103e3856eeab80e7b8ac7894d3","tests/rayon.rs":"39cb24ab45fce8087bb54948715c8b6973ebfba1a325292b5b3cd9aab50b5fd2","tests/serde.rs":"6bac8054db722dd049901b37a6e006535bac30f425eb5cd91af19b5bc1dfe78e","tests/set.rs":"9f8011c29d1059aadb54b6dd4623521d5178b4278b4a56021ef2cee4bbb19fd9"},"package":"e5274423e17b7c9fc20b6e7e208532f9b19825d82dfd615708b70edd83df41f1"} \ No newline at end of file diff --git a/.cargo-vendor/hashbrown/CHANGELOG.md b/.cargo-vendor/hashbrown/CHANGELOG.md index 0901165167..8c4068089a 100644 --- a/.cargo-vendor/hashbrown/CHANGELOG.md +++ b/.cargo-vendor/hashbrown/CHANGELOG.md @@ -7,6 +7,20 @@ and this project adheres to [Semantic Versioning](https://semver.org/). ## [Unreleased] +### Changed + +- Changed `hash_set::{Entry, VacantEntry}::insert` to return `OccupiedEntry`. (#495) + +## [v0.14.5] - 2024-04-28 + +### Fixed + +- Fixed index calculation in panic guard of `clone_from_impl`. (#511) + +## ~~[v0.14.4] - 2024-03-19~~ + +This release was _yanked_ due to a breaking change. + ## [v0.14.3] - 2023-11-26 ### Added @@ -471,7 +485,9 @@ This release was _yanked_ due to a breaking change for users of `no-default-feat - Initial release -[Unreleased]: https://github.com/rust-lang/hashbrown/compare/v0.14.3...HEAD +[Unreleased]: https://github.com/rust-lang/hashbrown/compare/v0.14.5...HEAD +[v0.14.5]: https://github.com/rust-lang/hashbrown/compare/v0.14.4...v0.14.5 +[v0.14.4]: https://github.com/rust-lang/hashbrown/compare/v0.14.3...v0.14.4 [v0.14.3]: https://github.com/rust-lang/hashbrown/compare/v0.14.2...v0.14.3 [v0.14.2]: https://github.com/rust-lang/hashbrown/compare/v0.14.1...v0.14.2 [v0.14.1]: https://github.com/rust-lang/hashbrown/compare/v0.14.0...v0.14.1 diff --git a/.cargo-vendor/hashbrown/Cargo.toml b/.cargo-vendor/hashbrown/Cargo.toml index ffdc0c3b36..0a5434e494 100644 --- a/.cargo-vendor/hashbrown/Cargo.toml +++ b/.cargo-vendor/hashbrown/Cargo.toml @@ -13,7 +13,7 @@ edition = "2021" rust-version = "1.63.0" name = "hashbrown" -version = "0.14.3" +version = "0.14.5" authors = ["Amanieu d'Antras "] exclude = [ ".github", @@ -44,7 +44,7 @@ features = [ rustdoc-args = ["--generate-link-to-definition"] [dependencies.ahash] -version = "0.8.6" +version = "0.8.7" optional = true default-features = false diff --git a/.cargo-vendor/hashbrown/src/lib.rs b/.cargo-vendor/hashbrown/src/lib.rs index 6e9592abe7..f03ddb6ad9 100644 --- a/.cargo-vendor/hashbrown/src/lib.rs +++ b/.cargo-vendor/hashbrown/src/lib.rs @@ -37,6 +37,7 @@ #![warn(missing_docs)] #![warn(rust_2018_idioms)] #![cfg_attr(feature = "nightly", warn(fuzzy_provenance_casts))] +#![cfg_attr(feature = "nightly", allow(internal_features))] #[cfg(test)] #[macro_use] diff --git a/.cargo-vendor/hashbrown/src/map.rs b/.cargo-vendor/hashbrown/src/map.rs index 9cd768f20d..88a826582b 100644 --- a/.cargo-vendor/hashbrown/src/map.rs +++ b/.cargo-vendor/hashbrown/src/map.rs @@ -5,7 +5,7 @@ use crate::{Equivalent, TryReserveError}; use core::borrow::Borrow; use core::fmt::{self, Debug}; use core::hash::{BuildHasher, Hash}; -use core::iter::{FromIterator, FusedIterator}; +use core::iter::FusedIterator; use core::marker::PhantomData; use core::mem; use core::ops::Index; @@ -184,7 +184,7 @@ pub enum DefaultHashBuilder {} /// use hashbrown::HashMap; /// /// let timber_resources: HashMap<&str, i32> = [("Norway", 100), ("Denmark", 50), ("Iceland", 10)] -/// .iter().cloned().collect(); +/// .into_iter().collect(); /// // use the values stored in map /// ``` pub struct HashMap { @@ -6805,7 +6805,7 @@ mod test_map { assert_eq!(m2.len(), 2); } - thread_local! { static DROP_VECTOR: RefCell> = RefCell::new(Vec::new()) } + thread_local! { static DROP_VECTOR: RefCell> = const { RefCell::new(Vec::new()) } } #[derive(Hash, PartialEq, Eq)] struct Droppable { @@ -8524,7 +8524,7 @@ mod test_map { #[test] #[should_panic = "panic in clone"] fn test_clone_from_memory_leaks() { - use ::alloc::vec::Vec; + use alloc::vec::Vec; struct CheckedClone { panic_in_clone: bool, diff --git a/.cargo-vendor/hashbrown/src/raw/mod.rs b/.cargo-vendor/hashbrown/src/raw/mod.rs index 711fb89d07..c8e8e29122 100644 --- a/.cargo-vendor/hashbrown/src/raw/mod.rs +++ b/.cargo-vendor/hashbrown/src/raw/mod.rs @@ -910,7 +910,7 @@ impl RawTable { &self.alloc } - /// Returns pointer to one past last `data` element in the the table as viewed from + /// Returns pointer to one past last `data` element in the table as viewed from /// the start point of the allocation. /// /// The caller must ensure that the `RawTable` outlives the returned [`NonNull`], @@ -919,9 +919,7 @@ impl RawTable { /// [`undefined behavior`]: https://doc.rust-lang.org/reference/behavior-considered-undefined.html #[inline] pub fn data_end(&self) -> NonNull { - // SAFETY: `self.table.ctrl` is `NonNull`, so casting it is safe - // - // `self.table.ctrl.as_ptr().cast()` returns pointer that + // `self.table.ctrl.cast()` returns pointer that // points here (to the end of `T0`) // ∨ // [Pad], T_n, ..., T1, T0, |CT0, CT1, ..., CT_n|, CTa_0, CTa_1, ..., CTa_m @@ -938,7 +936,7 @@ impl RawTable { // // P.S. `h1(hash) & self.bucket_mask` is the same as `hash as usize % self.buckets()` because the number // of buckets is a power of two, and `self.bucket_mask = self.buckets() - 1`. - unsafe { NonNull::new_unchecked(self.table.ctrl.as_ptr().cast()) } + self.table.ctrl.cast() } /// Returns pointer to start of data table. @@ -2029,7 +2027,7 @@ impl RawTableInner { /// if this function returns an `index` it will be in the range `0..=self.buckets()`. /// /// This function does not make any changes to the `data` parts of the table, - /// or any changes to the the `items` or `growth_left` field of the table. + /// or any changes to the `items` or `growth_left` field of the table. /// /// # Safety /// @@ -2213,7 +2211,7 @@ impl RawTableInner { /// - `FULL` control bytes -> `DELETED`. /// /// This function does not make any changes to the `data` parts of the table, - /// or any changes to the the `items` or `growth_left` field of the table. + /// or any changes to the `items` or `growth_left` field of the table. /// /// # Safety /// @@ -2558,7 +2556,7 @@ impl RawTableInner { base.sub((index + 1) * size_of) } - /// Returns pointer to one past last `data` element in the the table as viewed from + /// Returns pointer to one past last `data` element in the table as viewed from /// the start point of the allocation (convenience for `self.ctrl.cast()`). /// /// This function actually returns a pointer to the end of the `data element` at @@ -2595,10 +2593,7 @@ impl RawTableInner { /// [`undefined behavior`]: https://doc.rust-lang.org/reference/behavior-considered-undefined.html #[inline] fn data_end(&self) -> NonNull { - unsafe { - // SAFETY: `self.ctrl` is `NonNull`, so casting it is safe - NonNull::new_unchecked(self.ctrl.as_ptr().cast()) - } + self.ctrl.cast() } /// Returns an iterator-like object for a probe sequence on the table. @@ -2650,7 +2645,7 @@ impl RawTableInner { /// the end of the array. /// /// This function does not make any changes to the `data` parts of the table, - /// or any changes to the the `items` or `growth_left` field of the table. + /// or any changes to the `items` or `growth_left` field of the table. /// /// # Safety /// @@ -2684,7 +2679,7 @@ impl RawTableInner { /// bytes, returning the old control byte. /// /// This function does not make any changes to the `data` parts of the table, - /// or any changes to the the `items` or `growth_left` field of the table. + /// or any changes to the `items` or `growth_left` field of the table. /// /// # Safety /// @@ -2719,7 +2714,7 @@ impl RawTableInner { /// the end of the array. /// /// This function does not make any changes to the `data` parts of the table, - /// or any changes to the the `items` or `growth_left` field of the table. + /// or any changes to the `items` or `growth_left` field of the table. /// /// # Safety /// @@ -3587,7 +3582,7 @@ impl RawTable { // cloned so far. let mut guard = guard((0, &mut *self), |(index, self_)| { if T::NEEDS_DROP { - for i in 0..=*index { + for i in 0..*index { if self_.is_bucket_full(i) { self_.bucket(i).drop(); } @@ -3601,7 +3596,7 @@ impl RawTable { to.write(from.as_ref().clone()); // Update the index in case we need to unwind. - guard.0 = index; + guard.0 = index + 1; } // Successfully cloned all items, no need to clean up. @@ -3901,10 +3896,10 @@ impl RawIterRange { // we will never end up in the given branch, since we should have already // yielded all the elements of the table. // - // 2. For tables larger than the group width. The the number of buckets is a - // power of two (2 ^ n), Group::WIDTH is also power of two (2 ^ k). Sinse + // 2. For tables larger than the group width. The number of buckets is a + // power of two (2 ^ n), Group::WIDTH is also power of two (2 ^ k). Since // `(2 ^ n) > (2 ^ k)`, than `(2 ^ n) % (2 ^ k) = 0`. As we start from the - // the start of the array of control bytes, and never try to iterate after + // start of the array of control bytes, and never try to iterate after // getting all the elements, the last `self.current_group` will read bytes // from the `self.buckets() - Group::WIDTH` index. We know also that // `self.current_group.next()` will always retun indices within the range @@ -4224,8 +4219,8 @@ impl FullBucketsIndices { // we will never end up in the given branch, since we should have already // yielded all the elements of the table. // - // 2. For tables larger than the group width. The the number of buckets is a - // power of two (2 ^ n), Group::WIDTH is also power of two (2 ^ k). Sinse + // 2. For tables larger than the group width. The number of buckets is a + // power of two (2 ^ n), Group::WIDTH is also power of two (2 ^ k). Since // `(2 ^ n) > (2 ^ k)`, than `(2 ^ n) % (2 ^ k) = 0`. As we start from the // the start of the array of control bytes, and never try to iterate after // getting all the elements, the last `self.ctrl` will be equal to diff --git a/.cargo-vendor/hashbrown/src/set.rs b/.cargo-vendor/hashbrown/src/set.rs index fdff46d88c..2125a7ac81 100644 --- a/.cargo-vendor/hashbrown/src/set.rs +++ b/.cargo-vendor/hashbrown/src/set.rs @@ -4,7 +4,7 @@ use crate::{Equivalent, TryReserveError}; use alloc::borrow::ToOwned; use core::fmt; use core::hash::{BuildHasher, Hash}; -use core::iter::{Chain, FromIterator, FusedIterator}; +use core::iter::{Chain, FusedIterator}; use core::ops::{BitAnd, BitOr, BitXor, Sub}; use super::map::{self, DefaultHashBuilder, HashMap, Keys}; @@ -102,7 +102,7 @@ use crate::raw::{Allocator, Global, RawExtractIf}; /// use hashbrown::HashSet; /// /// let viking_names: HashSet<&'static str> = -/// [ "Einar", "Olaf", "Harald" ].iter().cloned().collect(); +/// [ "Einar", "Olaf", "Harald" ].into_iter().collect(); /// // use the values stored in the set /// ``` /// @@ -335,7 +335,7 @@ impl HashSet { /// ``` /// use hashbrown::HashSet; /// - /// let mut set: HashSet<_> = [1, 2, 3].iter().cloned().collect(); + /// let mut set: HashSet<_> = [1, 2, 3].into_iter().collect(); /// assert!(!set.is_empty()); /// /// // print 1, 2, 3 in an arbitrary order @@ -362,7 +362,7 @@ impl HashSet { /// use hashbrown::HashSet; /// /// let xs = [1,2,3,4,5,6]; - /// let mut set: HashSet = xs.iter().cloned().collect(); + /// let mut set: HashSet = xs.into_iter().collect(); /// set.retain(|&k| k % 2 == 0); /// assert_eq!(set.len(), 3); /// ``` @@ -724,8 +724,8 @@ where /// /// ``` /// use hashbrown::HashSet; - /// let a: HashSet<_> = [1, 2, 3].iter().cloned().collect(); - /// let b: HashSet<_> = [4, 2, 3, 4].iter().cloned().collect(); + /// let a: HashSet<_> = [1, 2, 3].into_iter().collect(); + /// let b: HashSet<_> = [4, 2, 3, 4].into_iter().collect(); /// /// // Can be seen as `a - b`. /// for x in a.difference(&b) { @@ -755,8 +755,8 @@ where /// /// ``` /// use hashbrown::HashSet; - /// let a: HashSet<_> = [1, 2, 3].iter().cloned().collect(); - /// let b: HashSet<_> = [4, 2, 3, 4].iter().cloned().collect(); + /// let a: HashSet<_> = [1, 2, 3].into_iter().collect(); + /// let b: HashSet<_> = [4, 2, 3, 4].into_iter().collect(); /// /// // Print 1, 4 in arbitrary order. /// for x in a.symmetric_difference(&b) { @@ -783,8 +783,8 @@ where /// /// ``` /// use hashbrown::HashSet; - /// let a: HashSet<_> = [1, 2, 3].iter().cloned().collect(); - /// let b: HashSet<_> = [4, 2, 3, 4].iter().cloned().collect(); + /// let a: HashSet<_> = [1, 2, 3].into_iter().collect(); + /// let b: HashSet<_> = [4, 2, 3, 4].into_iter().collect(); /// /// // Print 2, 3 in arbitrary order. /// for x in a.intersection(&b) { @@ -814,8 +814,8 @@ where /// /// ``` /// use hashbrown::HashSet; - /// let a: HashSet<_> = [1, 2, 3].iter().cloned().collect(); - /// let b: HashSet<_> = [4, 2, 3, 4].iter().cloned().collect(); + /// let a: HashSet<_> = [1, 2, 3].into_iter().collect(); + /// let b: HashSet<_> = [4, 2, 3, 4].into_iter().collect(); /// /// // Print 1, 2, 3, 4 in arbitrary order. /// for x in a.union(&b) { @@ -850,7 +850,7 @@ where /// ``` /// use hashbrown::HashSet; /// - /// let set: HashSet<_> = [1, 2, 3].iter().cloned().collect(); + /// let set: HashSet<_> = [1, 2, 3].into_iter().collect(); /// assert_eq!(set.contains(&1), true); /// assert_eq!(set.contains(&4), false); /// ``` @@ -876,7 +876,7 @@ where /// ``` /// use hashbrown::HashSet; /// - /// let set: HashSet<_> = [1, 2, 3].iter().cloned().collect(); + /// let set: HashSet<_> = [1, 2, 3].into_iter().collect(); /// assert_eq!(set.get(&2), Some(&2)); /// assert_eq!(set.get(&4), None); /// ``` @@ -903,7 +903,7 @@ where /// ``` /// use hashbrown::HashSet; /// - /// let mut set: HashSet<_> = [1, 2, 3].iter().cloned().collect(); + /// let mut set: HashSet<_> = [1, 2, 3].into_iter().collect(); /// assert_eq!(set.len(), 3); /// assert_eq!(set.get_or_insert(2), &2); /// assert_eq!(set.get_or_insert(100), &100); @@ -1034,7 +1034,7 @@ where /// ``` /// use hashbrown::HashSet; /// - /// let a: HashSet<_> = [1, 2, 3].iter().cloned().collect(); + /// let a: HashSet<_> = [1, 2, 3].into_iter().collect(); /// let mut b = HashSet::new(); /// /// assert_eq!(a.is_disjoint(&b), true); @@ -1055,7 +1055,7 @@ where /// ``` /// use hashbrown::HashSet; /// - /// let sup: HashSet<_> = [1, 2, 3].iter().cloned().collect(); + /// let sup: HashSet<_> = [1, 2, 3].into_iter().collect(); /// let mut set = HashSet::new(); /// /// assert_eq!(set.is_subset(&sup), true); @@ -1076,7 +1076,7 @@ where /// ``` /// use hashbrown::HashSet; /// - /// let sub: HashSet<_> = [1, 2].iter().cloned().collect(); + /// let sub: HashSet<_> = [1, 2].into_iter().collect(); /// let mut set = HashSet::new(); /// /// assert_eq!(set.is_superset(&sub), false); @@ -1205,7 +1205,7 @@ where /// ``` /// use hashbrown::HashSet; /// - /// let mut set: HashSet<_> = [1, 2, 3].iter().cloned().collect(); + /// let mut set: HashSet<_> = [1, 2, 3].into_iter().collect(); /// assert_eq!(set.take(&2), Some(2)); /// assert_eq!(set.take(&2), None); /// ``` @@ -2820,7 +2820,7 @@ mod test_set { assert_eq!(last_i, 49); } - for _ in &s { + if !s.is_empty() { panic!("s should be empty!"); } @@ -2834,6 +2834,7 @@ mod test_set { use core::hash; #[derive(Debug)] + #[allow(dead_code)] struct Foo(&'static str, i32); impl PartialEq for Foo { diff --git a/.cargo-vendor/hashbrown/src/table.rs b/.cargo-vendor/hashbrown/src/table.rs index a7bb5fcc94..faf8a6330f 100644 --- a/.cargo-vendor/hashbrown/src/table.rs +++ b/.cargo-vendor/hashbrown/src/table.rs @@ -298,6 +298,7 @@ where /// # test() /// # } /// ``` + #[cfg_attr(feature = "inline-more", inline)] pub fn find_entry( &mut self, hash: u64, @@ -358,6 +359,7 @@ where /// # test() /// # } /// ``` + #[cfg_attr(feature = "inline-more", inline)] pub fn entry( &mut self, hash: u64, @@ -1514,6 +1516,7 @@ where /// # test() /// # } /// ``` + #[cfg_attr(feature = "inline-more", inline)] pub fn remove(self) -> (T, VacantEntry<'a, T, A>) { let (val, slot) = unsafe { self.table.raw.remove(self.bucket) }; ( @@ -1553,6 +1556,7 @@ where /// # test() /// # } /// ``` + #[inline] pub fn get(&self) -> &T { unsafe { self.bucket.as_ref() } } @@ -1606,6 +1610,7 @@ where /// # test() /// # } /// ``` + #[inline] pub fn get_mut(&mut self) -> &mut T { unsafe { self.bucket.as_mut() } } @@ -1759,6 +1764,7 @@ where /// # test() /// # } /// ``` + #[inline] pub fn insert(self, value: T) -> OccupiedEntry<'a, T, A> { let bucket = unsafe { self.table diff --git a/.cargo-vendor/nix/.cargo-checksum.json b/.cargo-vendor/nix/.cargo-checksum.json index d6bb7d3e2f..b3e2a9f9d5 100644 --- a/.cargo-vendor/nix/.cargo-checksum.json +++ b/.cargo-vendor/nix/.cargo-checksum.json @@ -1 +1 @@ -{"files":{"CHANGELOG.md":"92468d08ccd20acf93bac25d983dbaedbd6dafbfdebf45d670a557e1dd993650","Cargo.toml":"f0aad36a2247d974834440e07a9b220393460c2d466aa250987a1988cbe16baa","LICENSE":"66e3ee1fa7f909ad3c612d556f2a0cdabcd809ad6e66f3b0605015ac64841b70","README.md":"693748b472aa697105dbaf37ad95e41b9b3ed6480533e03a5a93b10ec70c987a","src/dir.rs":"d40e2bc1df553898e718de552ddb57a160b9957b7d6a0f7e27e3e7fe6af536ab","src/env.rs":"028bc5e20139ebba418a655a2978a53335dc7680bf1de43d2c8333dd72cfa5c4","src/errno.rs":"3c2935cc3238c13a545ab8ceb6a8aa9fd03a9cbf72be041e9ea032f6ee19c2f4","src/fcntl.rs":"8cda1abc82c562b2340b3d27176b674b65d0e1c4bf888e7700c6b50e63c3bf0d","src/features.rs":"5381d43a7759c0bf4a26fc25c602d507beafa85282764bdbae6eff59f98fd16d","src/ifaddrs.rs":"377865eb48040d28c392a1aec0221320108e3392ea285d23405ae2cfa5c54b20","src/kmod.rs":"d2ef26c35db790e589f6418c1631aa48b01d4ea5674e050c12d1cfa7a18681ef","src/lib.rs":"571f418caf6a9646939ae4976ec4bde5f9325e9b4320715c9586590b9d8d4963","src/macros.rs":"73ab3b56f4b7cd08d3c70f035cd74bcbdac17ff05946adc875e05fd93280eb7e","src/mount/bsd.rs":"9f12470d33d9b3d18fdba5a10952f6e76b254df3d8794f296437d266db9623c4","src/mount/linux.rs":"6b0ea0c4598f5537e2dc57bdad6d3acc86e29d258aef3a639e1a2308f38bdb0e","src/mount/mod.rs":"ba9f60eb831224ab73bdd87e00e15d13b9ce9efb70b18bf8f3fe60406d522b3e","src/mqueue.rs":"0c78ef1a52c2df05a48b390707764dfca27c056033e01d604a1aa91058c7e9b4","src/net/if_.rs":"fa7413a9676e552b3fa0576081b83ac91278bb0d7240b7cdd962ea911336bba0","src/net/mod.rs":"577f70170e53d4a6de1abb70bf8f1031ec3e65c0e63ef5fcf05c907125e7ac17","src/poll.rs":"8b26383af51ff0733e07e6a5a2e174462e8849b1118ca12bdf3540d40a298602","src/pty.rs":"6a1122c4e7ea236cc4e1e36e2eb587eddf1e323edacdbcdd3b3c1619a60eedbf","src/sched.rs":"217055e50a54398e5b75a247e1be9a81a764aadd0267bcf6367f633e9b277f84","src/sys/aio.rs":"3e2e93dff85180a98b2b09b1ea926f89ee17d235c60fd2a96adf0ff7db601e5c","src/sys/epoll.rs":"5c45733ea19802443cc3f9e21766013d4ff0125a52dbf5f5a13f10ff19914e1e","src/sys/event.rs":"9b3b02c42f471e3d9f974be1b60aab11ff4d1fc79692c3d40991f0c22ca9ea83","src/sys/eventfd.rs":"22c1205c948aeb29f7a8a0f298644eb393778585ecbd2091d40559e0ed2de06b","src/sys/inotify.rs":"68b80856937286a23917638ed8f5fc057e396fe7c4f4d1178865e720ba7dba95","src/sys/ioctl/bsd.rs":"bbd02e30b0a78c1cb22777d9b00cfcbba9c68505cffc06118ac68474cf6fea39","src/sys/ioctl/linux.rs":"2aec4b3b3beb8119b9bb0c8001b9bb66cba3f2ff778c432e62f2da4243787184","src/sys/ioctl/mod.rs":"80e683efac7d1e2bd88680f028370f7c778e6a5097cae7845566bc8f43f4ff4f","src/sys/memfd.rs":"e2653a3c476585e993d9e8551cd0f991ba141c6bb46d9ece7fa6fd5cdeb862ae","src/sys/mman.rs":"4604656656a061606f99ff2f117c8f7463cd87aedaa4b3de5de863056bec5499","src/sys/mod.rs":"f5a5f1b51bbd2c865bbda2652bf0d2fd38e0773bd1a37460869c5a7008d27f03","src/sys/personality.rs":"8fbd8b522b8be4591a4cf25cba023884d3ad39b26666708d43eb79b81bf1c203","src/sys/prctl.rs":"d5b695099d4ac1b44e552988f488d7b88d285e68968ac29b93c153da52acd2bf","src/sys/pthread.rs":"258cdf7ff0b61a4afa6d228109e4cb4fb88d859bb8dfe6c959d95130fb010906","src/sys/ptrace/bsd.rs":"4c590d8f023ff52f396f8b6f2150c08e5c9486d3088d9c173db33a70d616b800","src/sys/ptrace/linux.rs":"b14114c4cbefd58f9df48e93e47d8f82992167942d4e683018cd31ceed184bc6","src/sys/ptrace/mod.rs":"3b5e4cc9cf447e989f40c73cb1951a4705322852009023c5a3d7e39ec1e9c39b","src/sys/quota.rs":"421ff70a0749dd0cea37a22a971bf3e9474f627bfa0e37874d9893787271996b","src/sys/reboot.rs":"eacdf57694a6629fb05787e16450446102a62818274495f2ad4e445807d09221","src/sys/resource.rs":"84eba41f288c97b4ab9060a6046d0d34e66a1f8e12655032c60a703280cca832","src/sys/select.rs":"2520086330bc1978a7db183bee92d96ba2711a4505839179a5f082ad555045b2","src/sys/sendfile.rs":"2075cea1ea5967b5de18e5cecb94bc041ff2675f7eb9e223051aa8a52dd8f733","src/sys/signal.rs":"39492bd9a98a48616a2f66a717def527574c6429251b533d8406d2b25cc2cb3f","src/sys/signalfd.rs":"af9eee01d712e48609fddf6b0ec332cd5f80b9940081b4c2e16cc338e959b5f3","src/sys/socket/addr.rs":"1b6f4e1ca16004cd5fa511264076b2c24ccc9cf3d7727157a0fabc62c47fe94a","src/sys/socket/mod.rs":"e65112b3b54905166b7a412fd9811e1e123c5eb1b3b46286937082fa6e86973d","src/sys/socket/sockopt.rs":"386bc08c0faf49a9d0ef99c70538c66b7d426d3deeb7b0ebedee1ef917d7bafc","src/sys/stat.rs":"3928598e6428d7e44b42d36aeb59ac353eaf0270801a6ac72c511804c5fdf358","src/sys/statfs.rs":"89cbfcbccde7f97b95821f0d7b8a7a4a40a284f487b216bbf0605a77aead0278","src/sys/statvfs.rs":"f699280f3ee2645ce39631d404355e7b49818849c4afa0bdf4f5020931cb1bef","src/sys/sysinfo.rs":"b4519b1ca091c9dbe94d2a6fd6304944bf3df5626973d2c6884022559706f0d9","src/sys/termios.rs":"7c0d9f4bc0062a510cf0f799264f807530c3d1e9e23a0d405d595f395ad7e01c","src/sys/time.rs":"c991d69a892cd7201c53d1399533e45802d581a1afa109016014aa9872d8db53","src/sys/timer.rs":"8c10f0e7cfac857ad00460be30bc68b957909cc9296e70718d3b5d4a0babafde","src/sys/timerfd.rs":"8958120030ed7bb58028b75e7e1829d4d231fa0da2c65f9335df7b7f1e0f6074","src/sys/uio.rs":"0ed960748eb4a85ce8f8413ab478d451f4460e85130cc3b803c85d72c057a529","src/sys/utsname.rs":"0cdda0cc111caaa0e4ebe2d4588bdc825d878e5bcb7a9136073b15f87a20e11f","src/sys/wait.rs":"c4c19ce13ea96c47fd51e227a1982d2aaafdb6b75edd726159848dd617f70da8","src/time.rs":"d4e0872361a57810837f5bd790cbca3a2b9db1ac4694a3c52d1564ad3532d3be","src/ucontext.rs":"b8f2e04757a9c2bc38c3b1e259d3a013da8a730fe9bfbe5487637395681b43d3","src/unistd.rs":"e9d24b6490d0578fc3e31200023e131df9471c09b7553b452a9ad76399eea753","test/common/mod.rs":"1d7e28e3635754664cd056f3a1079232ff5c118df619e1d0551a9972eb0b3cd6","test/sys/mod.rs":"87b2891d83067ff21f72b8ff7fde3019dc45b6877282ac278b6da151de45c7a7","test/sys/test_aio.rs":"ea9c0af6632739439d7f8187d2c82aeca7ac177d817210815b1a3edcd7a84e9b","test/sys/test_aio_drop.rs":"614070155fa16a979b7341d001639c5ce24a1d6f632c3abce45a5a6d49c4039b","test/sys/test_epoll.rs":"c30b08d665a1fe7d7a04fe51d50ec78fc74c2ac707ae0f95f82104d5c76ceaf2","test/sys/test_inotify.rs":"a141b9a995892547b51ceeb6761a70a6b86d37e8f38d13ea2c497b81b4b0f49f","test/sys/test_ioctl.rs":"00ccc5afb665e533a0a4b6d6a6be438bcaea19fce335390feef4e91d17b3036c","test/sys/test_mman.rs":"fe9019927ed3ca51d2d59d3305a53cc31797a1460044d24e2631f120c9289552","test/sys/test_prctl.rs":"9c3d0fb16a41c3fd80541b313c2bb63de75634ad4711a71af106e58b0cec9ea8","test/sys/test_pthread.rs":"ace36a2f5587f1874854281b4fd84e4e4d892a1e3c5cc38ced57975739522ad6","test/sys/test_ptrace.rs":"0385eebc8b1b8c72f655b745769decd9143ad83018198375982da0896310456b","test/sys/test_select.rs":"2843bc2484d51ba335567cc50bbc4eb6848ac6c6702ced42b177ffe04b49f7f3","test/sys/test_signal.rs":"19c267ffe9a37452719c2b030c62ab8e123d20e3f6ba4da6902375283e3b9593","test/sys/test_signalfd.rs":"0e1060143e2612c490bc3d0168d0bbb042ef55e3f1d91d2578b9e42e4310a14d","test/sys/test_socket.rs":"de724f58d1d703d28be1d4e35fd72df41f835082cdcb4fb579330d0be31dc74f","test/sys/test_sockopt.rs":"4a7fbb08719ae99803280f8af94e134ad90d92bf3ca4fbee0ef0ab398aadecea","test/sys/test_stat.rs":"6630a28217fd708bb84cd4f7e7101836b74f2420f9888923fdab664ccc331c1d","test/sys/test_sysinfo.rs":"ffd49bc96375914a2c4a4a59730cae8072f85771e2c4a80d3403df38d967e272","test/sys/test_termios.rs":"f38dfe45ab4ac9760b1d8c49e18da900d544927080a4a0bbb02b0c854c130455","test/sys/test_timerfd.rs":"cfed3abf58118611d08f6985251a7739cff67108e11214222a1d2394a3a026ce","test/sys/test_uio.rs":"90d973858f3e303c9fb99bc49d8d9a2e184be17e4e771cf3682af80b2ebd1533","test/sys/test_wait.rs":"6fd59fffeeb09ff620c359baefd062ba777598982b6cb001ccc07b6bc7605493","test/test.rs":"58a302e9055555806942c35e0edd0aaa63b2ebb3205c9a7e29491b726a5e2abe","test/test_clearenv.rs":"45ca548035b3c20ec87314715feaba2be973709a635d85b8cde46fd1d9f1ecd4","test/test_dir.rs":"ae3c11c58cb06da6557aa2a839c6653c54cd7724283fffe9df5a5d3feabdd89a","test/test_fcntl.rs":"7a23635451ed4a7b061cdc3015723c803c901e665e2beffde726b7f20ddf61d2","test/test_kmod/hello_mod/Makefile":"0219f7bce0603f97d997fb377ca071966c90333ecc665e78a54dfeb97a9c811b","test/test_kmod/hello_mod/hello.c":"bcac6b19c5bd807e1f3878c15e426acc85785a8ade9840c3bb4d068635c9188c","test/test_kmod/mod.rs":"b4ae25841c2f06f32de9f1acd8230eeccd7095721302ebe78ad454e4e4f9c783","test/test_mount.rs":"7d04b7e0f0f56e8129a0e68a6a338d7d46fdedde863dae4732d3c899e7864c66","test/test_mq.rs":"84dffb2201e2a4bb19f476fa7c23bbc2615453d27e5b958d3841ff371b6faa81","test/test_net.rs":"f2912327ebb2a3d37e6cff02a5ac3106cf889cc5c74404db4ef0034059ba26f1","test/test_nix_path.rs":"01ba4719c80b6fe911b091a7c05124b64eeece964e09c058ef8f9805daca546b","test/test_nmount.rs":"d6c112547bb80968170b5497cda4b6cbf69dabec6f51d494bd52298995ceff18","test/test_poll.rs":"d6eef82848734e47cc9e1f1ce521e35587e63f69876baea660ef22eebc2b1ea6","test/test_pty.rs":"4184e446af7a365ead628596cd77ad168c835a5dea6abca3ee614d86a4412dda","test/test_resource.rs":"40aef790ab745cec31a4b333d2ca406b462aa9bdf4a6d3756371e498b8d51e9a","test/test_sched.rs":"c4579bd376fab8816e63b07fa9ace31dc08e63ebb7c855a2c450698090d1d1e8","test/test_sendfile.rs":"f7d52f6aa680b5667b966d5c046917ba43924e9b9fca6adbcf68479459e06366","test/test_stat.rs":"c407ca47a5258750076d041afad2f6add4c3563be36628bde1c5b314f5d0765d","test/test_time.rs":"f7a21b1e279e60e84909d5dadda97ded66d3326b131fe317badf9af0a1b50335","test/test_timer.rs":"3ae20d364f075d2811f3ff94eda9886682cc21d8807656007d2464fe36d1e361","test/test_unistd.rs":"3ef7b335639747b6d57a04c2264a38ad379b680cebc0b8d8b8e247610630e58a"},"package":null} \ No newline at end of file +{"files":{"CHANGELOG.md":"92468d08ccd20acf93bac25d983dbaedbd6dafbfdebf45d670a557e1dd993650","Cargo.toml":"aa00abfd7ee17fe2d0fbf663ffa093a0e895a645e29b755debda8ca1cd2440a9","LICENSE":"66e3ee1fa7f909ad3c612d556f2a0cdabcd809ad6e66f3b0605015ac64841b70","README.md":"693748b472aa697105dbaf37ad95e41b9b3ed6480533e03a5a93b10ec70c987a","src/dir.rs":"d40e2bc1df553898e718de552ddb57a160b9957b7d6a0f7e27e3e7fe6af536ab","src/env.rs":"028bc5e20139ebba418a655a2978a53335dc7680bf1de43d2c8333dd72cfa5c4","src/errno.rs":"3c2935cc3238c13a545ab8ceb6a8aa9fd03a9cbf72be041e9ea032f6ee19c2f4","src/fcntl.rs":"8cda1abc82c562b2340b3d27176b674b65d0e1c4bf888e7700c6b50e63c3bf0d","src/features.rs":"5381d43a7759c0bf4a26fc25c602d507beafa85282764bdbae6eff59f98fd16d","src/ifaddrs.rs":"377865eb48040d28c392a1aec0221320108e3392ea285d23405ae2cfa5c54b20","src/kmod.rs":"d2ef26c35db790e589f6418c1631aa48b01d4ea5674e050c12d1cfa7a18681ef","src/lib.rs":"571f418caf6a9646939ae4976ec4bde5f9325e9b4320715c9586590b9d8d4963","src/macros.rs":"73ab3b56f4b7cd08d3c70f035cd74bcbdac17ff05946adc875e05fd93280eb7e","src/mount/bsd.rs":"9f12470d33d9b3d18fdba5a10952f6e76b254df3d8794f296437d266db9623c4","src/mount/linux.rs":"6b0ea0c4598f5537e2dc57bdad6d3acc86e29d258aef3a639e1a2308f38bdb0e","src/mount/mod.rs":"ba9f60eb831224ab73bdd87e00e15d13b9ce9efb70b18bf8f3fe60406d522b3e","src/mqueue.rs":"0c78ef1a52c2df05a48b390707764dfca27c056033e01d604a1aa91058c7e9b4","src/net/if_.rs":"fa7413a9676e552b3fa0576081b83ac91278bb0d7240b7cdd962ea911336bba0","src/net/mod.rs":"577f70170e53d4a6de1abb70bf8f1031ec3e65c0e63ef5fcf05c907125e7ac17","src/poll.rs":"8b26383af51ff0733e07e6a5a2e174462e8849b1118ca12bdf3540d40a298602","src/pty.rs":"6a1122c4e7ea236cc4e1e36e2eb587eddf1e323edacdbcdd3b3c1619a60eedbf","src/sched.rs":"217055e50a54398e5b75a247e1be9a81a764aadd0267bcf6367f633e9b277f84","src/sys/aio.rs":"3e2e93dff85180a98b2b09b1ea926f89ee17d235c60fd2a96adf0ff7db601e5c","src/sys/epoll.rs":"5c45733ea19802443cc3f9e21766013d4ff0125a52dbf5f5a13f10ff19914e1e","src/sys/event.rs":"9b3b02c42f471e3d9f974be1b60aab11ff4d1fc79692c3d40991f0c22ca9ea83","src/sys/eventfd.rs":"22c1205c948aeb29f7a8a0f298644eb393778585ecbd2091d40559e0ed2de06b","src/sys/inotify.rs":"68b80856937286a23917638ed8f5fc057e396fe7c4f4d1178865e720ba7dba95","src/sys/ioctl/bsd.rs":"bbd02e30b0a78c1cb22777d9b00cfcbba9c68505cffc06118ac68474cf6fea39","src/sys/ioctl/linux.rs":"2aec4b3b3beb8119b9bb0c8001b9bb66cba3f2ff778c432e62f2da4243787184","src/sys/ioctl/mod.rs":"80e683efac7d1e2bd88680f028370f7c778e6a5097cae7845566bc8f43f4ff4f","src/sys/memfd.rs":"e2653a3c476585e993d9e8551cd0f991ba141c6bb46d9ece7fa6fd5cdeb862ae","src/sys/mman.rs":"4604656656a061606f99ff2f117c8f7463cd87aedaa4b3de5de863056bec5499","src/sys/mod.rs":"f5a5f1b51bbd2c865bbda2652bf0d2fd38e0773bd1a37460869c5a7008d27f03","src/sys/personality.rs":"8fbd8b522b8be4591a4cf25cba023884d3ad39b26666708d43eb79b81bf1c203","src/sys/prctl.rs":"d5b695099d4ac1b44e552988f488d7b88d285e68968ac29b93c153da52acd2bf","src/sys/pthread.rs":"258cdf7ff0b61a4afa6d228109e4cb4fb88d859bb8dfe6c959d95130fb010906","src/sys/ptrace/bsd.rs":"4c590d8f023ff52f396f8b6f2150c08e5c9486d3088d9c173db33a70d616b800","src/sys/ptrace/linux.rs":"b14114c4cbefd58f9df48e93e47d8f82992167942d4e683018cd31ceed184bc6","src/sys/ptrace/mod.rs":"3b5e4cc9cf447e989f40c73cb1951a4705322852009023c5a3d7e39ec1e9c39b","src/sys/quota.rs":"421ff70a0749dd0cea37a22a971bf3e9474f627bfa0e37874d9893787271996b","src/sys/reboot.rs":"eacdf57694a6629fb05787e16450446102a62818274495f2ad4e445807d09221","src/sys/resource.rs":"84eba41f288c97b4ab9060a6046d0d34e66a1f8e12655032c60a703280cca832","src/sys/select.rs":"2520086330bc1978a7db183bee92d96ba2711a4505839179a5f082ad555045b2","src/sys/sendfile.rs":"2075cea1ea5967b5de18e5cecb94bc041ff2675f7eb9e223051aa8a52dd8f733","src/sys/signal.rs":"39492bd9a98a48616a2f66a717def527574c6429251b533d8406d2b25cc2cb3f","src/sys/signalfd.rs":"af9eee01d712e48609fddf6b0ec332cd5f80b9940081b4c2e16cc338e959b5f3","src/sys/socket/addr.rs":"1b6f4e1ca16004cd5fa511264076b2c24ccc9cf3d7727157a0fabc62c47fe94a","src/sys/socket/mod.rs":"e65112b3b54905166b7a412fd9811e1e123c5eb1b3b46286937082fa6e86973d","src/sys/socket/sockopt.rs":"386bc08c0faf49a9d0ef99c70538c66b7d426d3deeb7b0ebedee1ef917d7bafc","src/sys/stat.rs":"3928598e6428d7e44b42d36aeb59ac353eaf0270801a6ac72c511804c5fdf358","src/sys/statfs.rs":"89cbfcbccde7f97b95821f0d7b8a7a4a40a284f487b216bbf0605a77aead0278","src/sys/statvfs.rs":"f699280f3ee2645ce39631d404355e7b49818849c4afa0bdf4f5020931cb1bef","src/sys/sysinfo.rs":"b4519b1ca091c9dbe94d2a6fd6304944bf3df5626973d2c6884022559706f0d9","src/sys/termios.rs":"7c0d9f4bc0062a510cf0f799264f807530c3d1e9e23a0d405d595f395ad7e01c","src/sys/time.rs":"c991d69a892cd7201c53d1399533e45802d581a1afa109016014aa9872d8db53","src/sys/timer.rs":"8c10f0e7cfac857ad00460be30bc68b957909cc9296e70718d3b5d4a0babafde","src/sys/timerfd.rs":"8958120030ed7bb58028b75e7e1829d4d231fa0da2c65f9335df7b7f1e0f6074","src/sys/uio.rs":"0ed960748eb4a85ce8f8413ab478d451f4460e85130cc3b803c85d72c057a529","src/sys/utsname.rs":"0cdda0cc111caaa0e4ebe2d4588bdc825d878e5bcb7a9136073b15f87a20e11f","src/sys/wait.rs":"c4c19ce13ea96c47fd51e227a1982d2aaafdb6b75edd726159848dd617f70da8","src/time.rs":"d4e0872361a57810837f5bd790cbca3a2b9db1ac4694a3c52d1564ad3532d3be","src/ucontext.rs":"b8f2e04757a9c2bc38c3b1e259d3a013da8a730fe9bfbe5487637395681b43d3","src/unistd.rs":"e9d24b6490d0578fc3e31200023e131df9471c09b7553b452a9ad76399eea753","test/common/mod.rs":"1d7e28e3635754664cd056f3a1079232ff5c118df619e1d0551a9972eb0b3cd6","test/sys/mod.rs":"87b2891d83067ff21f72b8ff7fde3019dc45b6877282ac278b6da151de45c7a7","test/sys/test_aio.rs":"ea9c0af6632739439d7f8187d2c82aeca7ac177d817210815b1a3edcd7a84e9b","test/sys/test_aio_drop.rs":"614070155fa16a979b7341d001639c5ce24a1d6f632c3abce45a5a6d49c4039b","test/sys/test_epoll.rs":"c30b08d665a1fe7d7a04fe51d50ec78fc74c2ac707ae0f95f82104d5c76ceaf2","test/sys/test_inotify.rs":"a141b9a995892547b51ceeb6761a70a6b86d37e8f38d13ea2c497b81b4b0f49f","test/sys/test_ioctl.rs":"00ccc5afb665e533a0a4b6d6a6be438bcaea19fce335390feef4e91d17b3036c","test/sys/test_mman.rs":"fe9019927ed3ca51d2d59d3305a53cc31797a1460044d24e2631f120c9289552","test/sys/test_prctl.rs":"9c3d0fb16a41c3fd80541b313c2bb63de75634ad4711a71af106e58b0cec9ea8","test/sys/test_pthread.rs":"ace36a2f5587f1874854281b4fd84e4e4d892a1e3c5cc38ced57975739522ad6","test/sys/test_ptrace.rs":"0385eebc8b1b8c72f655b745769decd9143ad83018198375982da0896310456b","test/sys/test_select.rs":"2843bc2484d51ba335567cc50bbc4eb6848ac6c6702ced42b177ffe04b49f7f3","test/sys/test_signal.rs":"19c267ffe9a37452719c2b030c62ab8e123d20e3f6ba4da6902375283e3b9593","test/sys/test_signalfd.rs":"0e1060143e2612c490bc3d0168d0bbb042ef55e3f1d91d2578b9e42e4310a14d","test/sys/test_socket.rs":"de724f58d1d703d28be1d4e35fd72df41f835082cdcb4fb579330d0be31dc74f","test/sys/test_sockopt.rs":"4a7fbb08719ae99803280f8af94e134ad90d92bf3ca4fbee0ef0ab398aadecea","test/sys/test_stat.rs":"6630a28217fd708bb84cd4f7e7101836b74f2420f9888923fdab664ccc331c1d","test/sys/test_sysinfo.rs":"ffd49bc96375914a2c4a4a59730cae8072f85771e2c4a80d3403df38d967e272","test/sys/test_termios.rs":"f38dfe45ab4ac9760b1d8c49e18da900d544927080a4a0bbb02b0c854c130455","test/sys/test_timerfd.rs":"cfed3abf58118611d08f6985251a7739cff67108e11214222a1d2394a3a026ce","test/sys/test_uio.rs":"90d973858f3e303c9fb99bc49d8d9a2e184be17e4e771cf3682af80b2ebd1533","test/sys/test_wait.rs":"6fd59fffeeb09ff620c359baefd062ba777598982b6cb001ccc07b6bc7605493","test/test.rs":"58a302e9055555806942c35e0edd0aaa63b2ebb3205c9a7e29491b726a5e2abe","test/test_clearenv.rs":"45ca548035b3c20ec87314715feaba2be973709a635d85b8cde46fd1d9f1ecd4","test/test_dir.rs":"ae3c11c58cb06da6557aa2a839c6653c54cd7724283fffe9df5a5d3feabdd89a","test/test_fcntl.rs":"7a23635451ed4a7b061cdc3015723c803c901e665e2beffde726b7f20ddf61d2","test/test_kmod/hello_mod/Makefile":"0219f7bce0603f97d997fb377ca071966c90333ecc665e78a54dfeb97a9c811b","test/test_kmod/hello_mod/hello.c":"bcac6b19c5bd807e1f3878c15e426acc85785a8ade9840c3bb4d068635c9188c","test/test_kmod/mod.rs":"b4ae25841c2f06f32de9f1acd8230eeccd7095721302ebe78ad454e4e4f9c783","test/test_mount.rs":"7d04b7e0f0f56e8129a0e68a6a338d7d46fdedde863dae4732d3c899e7864c66","test/test_mq.rs":"84dffb2201e2a4bb19f476fa7c23bbc2615453d27e5b958d3841ff371b6faa81","test/test_net.rs":"f2912327ebb2a3d37e6cff02a5ac3106cf889cc5c74404db4ef0034059ba26f1","test/test_nix_path.rs":"01ba4719c80b6fe911b091a7c05124b64eeece964e09c058ef8f9805daca546b","test/test_nmount.rs":"d6c112547bb80968170b5497cda4b6cbf69dabec6f51d494bd52298995ceff18","test/test_poll.rs":"d6eef82848734e47cc9e1f1ce521e35587e63f69876baea660ef22eebc2b1ea6","test/test_pty.rs":"4184e446af7a365ead628596cd77ad168c835a5dea6abca3ee614d86a4412dda","test/test_resource.rs":"40aef790ab745cec31a4b333d2ca406b462aa9bdf4a6d3756371e498b8d51e9a","test/test_sched.rs":"c4579bd376fab8816e63b07fa9ace31dc08e63ebb7c855a2c450698090d1d1e8","test/test_sendfile.rs":"f7d52f6aa680b5667b966d5c046917ba43924e9b9fca6adbcf68479459e06366","test/test_stat.rs":"c407ca47a5258750076d041afad2f6add4c3563be36628bde1c5b314f5d0765d","test/test_time.rs":"f7a21b1e279e60e84909d5dadda97ded66d3326b131fe317badf9af0a1b50335","test/test_timer.rs":"3ae20d364f075d2811f3ff94eda9886682cc21d8807656007d2464fe36d1e361","test/test_unistd.rs":"3ef7b335639747b6d57a04c2264a38ad379b680cebc0b8d8b8e247610630e58a"},"package":null} \ No newline at end of file diff --git a/.cargo-vendor/nix/Cargo.toml b/.cargo-vendor/nix/Cargo.toml index 86853b8c8d..702a4ba737 100644 --- a/.cargo-vendor/nix/Cargo.toml +++ b/.cargo-vendor/nix/Cargo.toml @@ -9,10 +9,6 @@ # will likely look very different (and much more reasonable). # See Cargo.toml.orig for the original contents. -bin = [] -example = [] -bench = [] - [package] edition = "2021" rust-version = "1.65" diff --git a/.cargo-vendor/serde/.cargo-checksum.json b/.cargo-vendor/serde/.cargo-checksum.json index eafc0b4222..77e49d83d1 100644 --- a/.cargo-vendor/serde/.cargo-checksum.json +++ b/.cargo-vendor/serde/.cargo-checksum.json @@ -1 +1 @@ -{"files":{"Cargo.toml":"68cf9c1f5e3213b996b890b110c4797fe537515e7b2558e32c29698bbd931320","LICENSE-APACHE":"62c7a1e35f56406896d7aa7ca52d0cc0d272ac022b5d2796e7d6905db8a3636a","LICENSE-MIT":"23f18e03dc49df91622fe2a76176497404e46ced8a715d9d2b67a7446571cca3","README.md":"731c044fc5f98b37a89e9049c9214267db98763309cb63146b45c029640f82a3","build.rs":"8653bc5c754a533b55849c29ccb0e75f06758d415cd768c94c3e08e790c2e953","crates-io.md":"407d92b2932923f8708aaf31db266fd7db32e2b0afa6c569d134b680b74a1920","src/de/format.rs":"c85071b016df643b161859682d21ce34fa0ebf2a3bdbeeea69859da48f5d934f","src/de/ignored_any.rs":"6480f2b2a83dc4764d01b2eec7309729eef2492eede2e5ee98d23a60b05198eb","src/de/impls.rs":"f1d691a1bd4f0404c590eb217bab1d07c7d56ff9e874da6ab28d4affa7fef94c","src/de/mod.rs":"14880617db97f5bd68f991248051c0327098730e6e0f15c763fc0f0048ce3dbe","src/de/seed.rs":"045d890712a04eb33ffc5a021e5d948a63c89402b8ffeea749df2171b7484f8f","src/de/size_hint.rs":"fff83dc39d30e75e8e611991f9c5399188a1aad23a6462dbca2c8b62655cfedb","src/de/value.rs":"0c485908b1f755e4750af0aefa2132460dadbcf30919c15c06ca795a92d96430","src/integer128.rs":"29ef30b7d94507b34807090e68173767cdc7aff62edccd38affe69e75338dddc","src/lib.rs":"6f5ec7c32e2d609815d08ccba25bc3d3e985725de9b65c9fb95c479a05d76ea6","src/macros.rs":"0d4b392ed6fe529fda2c5439c8547fe9717e64f528bfd01f633bb725f98b53cd","src/private/de.rs":"c12df7ee5ac43c9c30389e1f02d2bb5c206b1b850e598963dfedeb303e448f5a","src/private/doc.rs":"b222decb40321190155209e1b8a5a52e3adfaa470047e379e664b71e0320655a","src/private/mod.rs":"b8f0c348621d91dd9da3db83d8877e70bc61ad0a2dc2d6fb57c6fc2c2cbafa26","src/private/ser.rs":"4343ccbe0b345288dce0dbf1023c6082ef42ae7073c911b535e3d9e88c3aa472","src/ser/fmt.rs":"d1cfd9623605413e45a23ef778d97f0ac4da4adaed23739f1f9d7414b30e384b","src/ser/impls.rs":"585908d859fc89adcc1c6a7acc8f12467feba7daeb8c44ae28d25fd40d140f2c","src/ser/impossible.rs":"5c325da8e0370ab22abe1e15d8af1dc7a1707b127508f61e720cd7f0caa80593","src/ser/mod.rs":"eee3a4ecfc09993677df0be4772c1c7edde43ec9591be0b5595cb113a548a8a2","src/std_error.rs":"25a07149e2e468747ffa5a58051c7f93d7b3c0fa0372f012a96c97ec8ab03b97"},"package":"99fce0ffe7310761ca6bf9faf5115afbc19688edd00171d81b1bb1b116c63e09"} \ No newline at end of file +{"files":{"Cargo.toml":"6d6add51c2e5e089ce4597070f2a2770d3caaf07da77070b01afe7a2dec19592","LICENSE-APACHE":"62c7a1e35f56406896d7aa7ca52d0cc0d272ac022b5d2796e7d6905db8a3636a","LICENSE-MIT":"23f18e03dc49df91622fe2a76176497404e46ced8a715d9d2b67a7446571cca3","README.md":"731c044fc5f98b37a89e9049c9214267db98763309cb63146b45c029640f82a3","build.rs":"a98eaa82c783fdb4169d1646c06028ec5cb82937d39ee127ec8ed33651d2f238","crates-io.md":"407d92b2932923f8708aaf31db266fd7db32e2b0afa6c569d134b680b74a1920","src/de/ignored_any.rs":"6480f2b2a83dc4764d01b2eec7309729eef2492eede2e5ee98d23a60b05198eb","src/de/impls.rs":"18ed2d8221b04c7fe8f7a757445a04cd1d28c887f46f7a8717afff10eada146f","src/de/mod.rs":"b34735b2e5c9c93e9857540f24cba393f1b767a2ba33d469c2d28f15049e8f6c","src/de/seed.rs":"045d890712a04eb33ffc5a021e5d948a63c89402b8ffeea749df2171b7484f8f","src/de/size_hint.rs":"fff83dc39d30e75e8e611991f9c5399188a1aad23a6462dbca2c8b62655cfedb","src/de/value.rs":"0c485908b1f755e4750af0aefa2132460dadbcf30919c15c06ca795a92d96430","src/format.rs":"c85071b016df643b161859682d21ce34fa0ebf2a3bdbeeea69859da48f5d934f","src/integer128.rs":"29ef30b7d94507b34807090e68173767cdc7aff62edccd38affe69e75338dddc","src/lib.rs":"ff721a04872d840e4a9aabd0cbd98c1a60ae3eefd6237f5c6c1474b9549e4f04","src/macros.rs":"0d4b392ed6fe529fda2c5439c8547fe9717e64f528bfd01f633bb725f98b53cd","src/private/de.rs":"c12df7ee5ac43c9c30389e1f02d2bb5c206b1b850e598963dfedeb303e448f5a","src/private/doc.rs":"b222decb40321190155209e1b8a5a52e3adfaa470047e379e664b71e0320655a","src/private/mod.rs":"b8f0c348621d91dd9da3db83d8877e70bc61ad0a2dc2d6fb57c6fc2c2cbafa26","src/private/ser.rs":"4343ccbe0b345288dce0dbf1023c6082ef42ae7073c911b535e3d9e88c3aa472","src/ser/fmt.rs":"d1cfd9623605413e45a23ef778d97f0ac4da4adaed23739f1f9d7414b30e384b","src/ser/impls.rs":"00b58a84f7c07b2f575219d6d0745fd1258dae9b9c8ec5b9b299a712c482b1a3","src/ser/impossible.rs":"5c325da8e0370ab22abe1e15d8af1dc7a1707b127508f61e720cd7f0caa80593","src/ser/mod.rs":"9aab34f08defdd6be044383ad41aeb59acee3abe7cacb73ac5bc8c70f747a67e","src/std_error.rs":"25a07149e2e468747ffa5a58051c7f93d7b3c0fa0372f012a96c97ec8ab03b97"},"package":"c8e3592472072e6e22e0a54d5904d9febf8508f65fb8552499a1abc7d1078c3a"} \ No newline at end of file diff --git a/.cargo-vendor/serde/Cargo.toml b/.cargo-vendor/serde/Cargo.toml index 4486dcd02b..e6d535df4c 100644 --- a/.cargo-vendor/serde/Cargo.toml +++ b/.cargo-vendor/serde/Cargo.toml @@ -13,7 +13,7 @@ edition = "2018" rust-version = "1.31" name = "serde" -version = "1.0.209" +version = "1.0.210" authors = [ "Erick Tryzelaar ", "David Tolnay ", @@ -76,4 +76,4 @@ std = [] unstable = [] [target."cfg(any())".dependencies.serde_derive] -version = "=1.0.209" +version = "=1.0.210" diff --git a/.cargo-vendor/serde/build.rs b/.cargo-vendor/serde/build.rs index c32872b95d..8a4f7257c4 100644 --- a/.cargo-vendor/serde/build.rs +++ b/.cargo-vendor/serde/build.rs @@ -15,6 +15,8 @@ fn main() { if minor >= 77 { println!("cargo:rustc-check-cfg=cfg(no_core_cstr)"); + println!("cargo:rustc-check-cfg=cfg(no_core_error)"); + println!("cargo:rustc-check-cfg=cfg(no_core_net)"); println!("cargo:rustc-check-cfg=cfg(no_core_num_saturating)"); println!("cargo:rustc-check-cfg=cfg(no_core_try_from)"); println!("cargo:rustc-check-cfg=cfg(no_diagnostic_namespace)"); @@ -86,11 +88,23 @@ fn main() { println!("cargo:rustc-cfg=no_core_num_saturating"); } + // Support for core::net stabilized in Rust 1.77. + // https://blog.rust-lang.org/2024/03/21/Rust-1.77.0.html + if minor < 77 { + println!("cargo:rustc-cfg=no_core_net"); + } + // Support for the `#[diagnostic]` tool attribute namespace // https://blog.rust-lang.org/2024/05/02/Rust-1.78.0.html#diagnostic-attributes if minor < 78 { println!("cargo:rustc-cfg=no_diagnostic_namespace"); } + + // The Error trait became available in core in 1.81. + // https://blog.rust-lang.org/2024/09/05/Rust-1.81.0.html#coreerrorerror + if minor < 81 { + println!("cargo:rustc-cfg=no_core_error"); + } } fn rustc_minor_version() -> Option { diff --git a/.cargo-vendor/serde/src/de/impls.rs b/.cargo-vendor/serde/src/de/impls.rs index 02591d9822..2d8c99030c 100644 --- a/.cargo-vendor/serde/src/de/impls.rs +++ b/.cargo-vendor/serde/src/de/impls.rs @@ -1583,12 +1583,9 @@ map_impl! { //////////////////////////////////////////////////////////////////////////////// +#[cfg(any(feature = "std", not(no_core_net)))] macro_rules! parse_ip_impl { - ( - $(#[$attr:meta])* - $ty:ty, $expecting:expr, $size:tt - ) => { - $(#[$attr])* + ($ty:ty, $expecting:expr, $size:tt) => { impl<'de> Deserialize<'de> for $ty { fn deserialize(deserializer: D) -> Result where @@ -1604,7 +1601,7 @@ macro_rules! parse_ip_impl { }; } -#[cfg(feature = "std")] +#[cfg(any(feature = "std", not(no_core_net)))] macro_rules! variant_identifier { ( $name_kind:ident ($($variant:ident; $bytes:expr; $index:expr),*) @@ -1679,7 +1676,7 @@ macro_rules! variant_identifier { } } -#[cfg(feature = "std")] +#[cfg(any(feature = "std", not(no_core_net)))] macro_rules! deserialize_enum { ( $name:ident $name_kind:ident ($($variant:ident; $bytes:expr; $index:expr),*) @@ -1716,8 +1713,7 @@ macro_rules! deserialize_enum { } } -#[cfg(feature = "std")] -#[cfg_attr(docsrs, doc(cfg(feature = "std")))] +#[cfg(any(feature = "std", not(no_core_net)))] impl<'de> Deserialize<'de> for net::IpAddr { fn deserialize(deserializer: D) -> Result where @@ -1736,25 +1732,18 @@ impl<'de> Deserialize<'de> for net::IpAddr { } } -parse_ip_impl! { - #[cfg(feature = "std")] - #[cfg_attr(docsrs, doc(cfg(feature = "std")))] - net::Ipv4Addr, "IPv4 address", 4 -} +#[cfg(any(feature = "std", not(no_core_net)))] +parse_ip_impl!(net::Ipv4Addr, "IPv4 address", 4); -parse_ip_impl! { - #[cfg(feature = "std")] - #[cfg_attr(docsrs, doc(cfg(feature = "std")))] - net::Ipv6Addr, "IPv6 address", 16 -} +#[cfg(any(feature = "std", not(no_core_net)))] +parse_ip_impl!(net::Ipv6Addr, "IPv6 address", 16); +#[cfg(any(feature = "std", not(no_core_net)))] macro_rules! parse_socket_impl { ( - $(#[$attr:meta])* $ty:ty, $expecting:tt, $new:expr, ) => { - $(#[$attr])* impl<'de> Deserialize<'de> for $ty { fn deserialize(deserializer: D) -> Result where @@ -1770,8 +1759,7 @@ macro_rules! parse_socket_impl { }; } -#[cfg(feature = "std")] -#[cfg_attr(docsrs, doc(cfg(feature = "std")))] +#[cfg(any(feature = "std", not(no_core_net)))] impl<'de> Deserialize<'de> for net::SocketAddr { fn deserialize(deserializer: D) -> Result where @@ -1790,16 +1778,14 @@ impl<'de> Deserialize<'de> for net::SocketAddr { } } +#[cfg(any(feature = "std", not(no_core_net)))] parse_socket_impl! { - #[cfg(feature = "std")] - #[cfg_attr(docsrs, doc(cfg(feature = "std")))] net::SocketAddrV4, "IPv4 socket address", |(ip, port)| net::SocketAddrV4::new(ip, port), } +#[cfg(any(feature = "std", not(no_core_net)))] parse_socket_impl! { - #[cfg(feature = "std")] - #[cfg_attr(docsrs, doc(cfg(feature = "std")))] net::SocketAddrV6, "IPv6 socket address", |(ip, port)| net::SocketAddrV6::new(ip, port, 0, 0), } @@ -3160,13 +3146,13 @@ atomic_impl! { AtomicU64 "64" } -#[cfg(feature = "std")] +#[cfg(any(feature = "std", not(no_core_net)))] struct FromStrVisitor { expecting: &'static str, ty: PhantomData, } -#[cfg(feature = "std")] +#[cfg(any(feature = "std", not(no_core_net)))] impl FromStrVisitor { fn new(expecting: &'static str) -> Self { FromStrVisitor { @@ -3176,7 +3162,7 @@ impl FromStrVisitor { } } -#[cfg(feature = "std")] +#[cfg(any(feature = "std", not(no_core_net)))] impl<'de, T> Visitor<'de> for FromStrVisitor where T: str::FromStr, diff --git a/.cargo-vendor/serde/src/de/mod.rs b/.cargo-vendor/serde/src/de/mod.rs index d6b9f5ab44..21cfd0414b 100644 --- a/.cargo-vendor/serde/src/de/mod.rs +++ b/.cargo-vendor/serde/src/de/mod.rs @@ -118,17 +118,16 @@ use crate::lib::*; pub mod value; -mod format; mod ignored_any; mod impls; pub(crate) mod size_hint; pub use self::ignored_any::IgnoredAny; -#[cfg(not(any(feature = "std", feature = "unstable")))] +#[cfg(all(not(feature = "std"), no_core_error))] #[doc(no_inline)] pub use crate::std_error::Error as StdError; -#[cfg(all(feature = "unstable", not(feature = "std")))] +#[cfg(not(any(feature = "std", no_core_error)))] #[doc(no_inline)] pub use core::error::Error as StdError; #[cfg(feature = "std")] @@ -1374,7 +1373,7 @@ pub trait Visitor<'de>: Sized { E: Error, { let mut buf = [0u8; 58]; - let mut writer = format::Buf::new(&mut buf); + let mut writer = crate::format::Buf::new(&mut buf); fmt::Write::write_fmt(&mut writer, format_args!("integer `{}` as i128", v)).unwrap(); Err(Error::invalid_type( Unexpected::Other(writer.as_str()), @@ -1436,7 +1435,7 @@ pub trait Visitor<'de>: Sized { E: Error, { let mut buf = [0u8; 57]; - let mut writer = format::Buf::new(&mut buf); + let mut writer = crate::format::Buf::new(&mut buf); fmt::Write::write_fmt(&mut writer, format_args!("integer `{}` as u128", v)).unwrap(); Err(Error::invalid_type( Unexpected::Other(writer.as_str()), diff --git a/.cargo-vendor/serde/src/de/format.rs b/.cargo-vendor/serde/src/format.rs similarity index 100% rename from .cargo-vendor/serde/src/de/format.rs rename to .cargo-vendor/serde/src/format.rs diff --git a/.cargo-vendor/serde/src/lib.rs b/.cargo-vendor/serde/src/lib.rs index e9fc96cba2..15710d8d9c 100644 --- a/.cargo-vendor/serde/src/lib.rs +++ b/.cargo-vendor/serde/src/lib.rs @@ -95,7 +95,7 @@ //////////////////////////////////////////////////////////////////////////////// // Serde types in rustdoc of other crates get linked to here. -#![doc(html_root_url = "https://docs.rs/serde/1.0.209")] +#![doc(html_root_url = "https://docs.rs/serde/1.0.210")] // Support using Serde without the standard library! #![cfg_attr(not(feature = "std"), no_std)] // Show which crate feature enables conditionally compiled APIs in documentation. @@ -238,8 +238,13 @@ mod lib { #[cfg(feature = "std")] pub use std::ffi::CString; + #[cfg(all(not(no_core_net), not(feature = "std")))] + pub use self::core::net; #[cfg(feature = "std")] - pub use std::{error, net}; + pub use std::net; + + #[cfg(feature = "std")] + pub use std::error; #[cfg(feature = "std")] pub use std::collections::{HashMap, HashSet}; @@ -305,6 +310,8 @@ mod integer128; pub mod de; pub mod ser; +mod format; + #[doc(inline)] pub use crate::de::{Deserialize, Deserializer}; #[doc(inline)] @@ -318,7 +325,7 @@ pub mod __private; #[path = "de/seed.rs"] mod seed; -#[cfg(not(any(feature = "std", feature = "unstable")))] +#[cfg(all(not(feature = "std"), no_core_error))] mod std_error; // Re-export #[derive(Serialize, Deserialize)]. diff --git a/.cargo-vendor/serde/src/ser/impls.rs b/.cargo-vendor/serde/src/ser/impls.rs index 557b6aa12f..fb574eae1e 100644 --- a/.cargo-vendor/serde/src/ser/impls.rs +++ b/.cargo-vendor/serde/src/ser/impls.rs @@ -773,28 +773,17 @@ impl Serialize for SystemTime { /// statically known to never have more than a constant `MAX_LEN` bytes. /// /// Panics if the `Display` impl tries to write more than `MAX_LEN` bytes. -#[cfg(feature = "std")] +#[cfg(any(feature = "std", not(no_core_net)))] macro_rules! serialize_display_bounded_length { ($value:expr, $max:expr, $serializer:expr) => {{ let mut buffer = [0u8; $max]; - let remaining_len = { - let mut remaining = &mut buffer[..]; - write!(remaining, "{}", $value).unwrap(); - remaining.len() - }; - let written_len = buffer.len() - remaining_len; - let written = &buffer[..written_len]; - - // write! only provides fmt::Formatter to Display implementations, which - // has methods write_str and write_char but no method to write arbitrary - // bytes. Therefore `written` must be valid UTF-8. - let written_str = str::from_utf8(written).expect("must be valid UTF-8"); - $serializer.serialize_str(written_str) + let mut writer = crate::format::Buf::new(&mut buffer); + write!(&mut writer, "{}", $value).unwrap(); + $serializer.serialize_str(writer.as_str()) }}; } -#[cfg(feature = "std")] -#[cfg_attr(docsrs, doc(cfg(feature = "std")))] +#[cfg(any(feature = "std", not(no_core_net)))] impl Serialize for net::IpAddr { fn serialize(&self, serializer: S) -> Result where @@ -818,7 +807,7 @@ impl Serialize for net::IpAddr { } } -#[cfg(feature = "std")] +#[cfg(any(feature = "std", not(no_core_net)))] const DEC_DIGITS_LUT: &[u8] = b"\ 0001020304050607080910111213141516171819\ 2021222324252627282930313233343536373839\ @@ -826,7 +815,7 @@ const DEC_DIGITS_LUT: &[u8] = b"\ 6061626364656667686970717273747576777879\ 8081828384858687888990919293949596979899"; -#[cfg(feature = "std")] +#[cfg(any(feature = "std", not(no_core_net)))] #[inline] fn format_u8(mut n: u8, out: &mut [u8]) -> usize { if n >= 100 { @@ -847,7 +836,7 @@ fn format_u8(mut n: u8, out: &mut [u8]) -> usize { } } -#[cfg(feature = "std")] +#[cfg(any(feature = "std", not(no_core_net)))] #[test] fn test_format_u8() { let mut i = 0u8; @@ -864,8 +853,7 @@ fn test_format_u8() { } } -#[cfg(feature = "std")] -#[cfg_attr(docsrs, doc(cfg(feature = "std")))] +#[cfg(any(feature = "std", not(no_core_net)))] impl Serialize for net::Ipv4Addr { fn serialize(&self, serializer: S) -> Result where @@ -889,8 +877,7 @@ impl Serialize for net::Ipv4Addr { } } -#[cfg(feature = "std")] -#[cfg_attr(docsrs, doc(cfg(feature = "std")))] +#[cfg(any(feature = "std", not(no_core_net)))] impl Serialize for net::Ipv6Addr { fn serialize(&self, serializer: S) -> Result where @@ -906,8 +893,7 @@ impl Serialize for net::Ipv6Addr { } } -#[cfg(feature = "std")] -#[cfg_attr(docsrs, doc(cfg(feature = "std")))] +#[cfg(any(feature = "std", not(no_core_net)))] impl Serialize for net::SocketAddr { fn serialize(&self, serializer: S) -> Result where @@ -931,8 +917,7 @@ impl Serialize for net::SocketAddr { } } -#[cfg(feature = "std")] -#[cfg_attr(docsrs, doc(cfg(feature = "std")))] +#[cfg(any(feature = "std", not(no_core_net)))] impl Serialize for net::SocketAddrV4 { fn serialize(&self, serializer: S) -> Result where @@ -948,8 +933,7 @@ impl Serialize for net::SocketAddrV4 { } } -#[cfg(feature = "std")] -#[cfg_attr(docsrs, doc(cfg(feature = "std")))] +#[cfg(any(feature = "std", not(no_core_net)))] impl Serialize for net::SocketAddrV6 { fn serialize(&self, serializer: S) -> Result where diff --git a/.cargo-vendor/serde/src/ser/mod.rs b/.cargo-vendor/serde/src/ser/mod.rs index 30a6480933..fb0033ec02 100644 --- a/.cargo-vendor/serde/src/ser/mod.rs +++ b/.cargo-vendor/serde/src/ser/mod.rs @@ -115,10 +115,10 @@ mod impossible; pub use self::impossible::Impossible; -#[cfg(not(any(feature = "std", feature = "unstable")))] +#[cfg(all(not(feature = "std"), no_core_error))] #[doc(no_inline)] pub use crate::std_error::Error as StdError; -#[cfg(all(feature = "unstable", not(feature = "std")))] +#[cfg(not(any(feature = "std", no_core_error)))] #[doc(no_inline)] pub use core::error::Error as StdError; #[cfg(feature = "std")] diff --git a/.cargo-vendor/serde_derive/.cargo-checksum.json b/.cargo-vendor/serde_derive/.cargo-checksum.json index af9bed7f2e..0927fc9693 100644 --- a/.cargo-vendor/serde_derive/.cargo-checksum.json +++ b/.cargo-vendor/serde_derive/.cargo-checksum.json @@ -1 +1 @@ -{"files":{"Cargo.toml":"7ca37ffebc73fe7fc549fc7675bcd014538a03da37b4e9c82879adce2c84a57c","LICENSE-APACHE":"62c7a1e35f56406896d7aa7ca52d0cc0d272ac022b5d2796e7d6905db8a3636a","LICENSE-MIT":"23f18e03dc49df91622fe2a76176497404e46ced8a715d9d2b67a7446571cca3","README.md":"731c044fc5f98b37a89e9049c9214267db98763309cb63146b45c029640f82a3","crates-io.md":"407d92b2932923f8708aaf31db266fd7db32e2b0afa6c569d134b680b74a1920","src/bound.rs":"6c5c20785ac95af9480f8d0de35a7e844cc36a16012f6468db148acd03cb15c2","src/de.rs":"e0a2186fb31e24b95cdfc499b1adad295bb3eac0448a41fc37f7609cadda52c7","src/dummy.rs":"9533dfee23f20d92ea75734c739022820c2787ded0d54f459feacdeb770ec912","src/fragment.rs":"6757cb4c3131d4300f093572efc273c4ab5a20e3e1efb54a311dcfa52d0bd6eb","src/internals/ast.rs":"171478e83d203193cd96f2c9c922bd240214e05fdf76add73fb7e029784bace8","src/internals/attr.rs":"8ab89c54ec7713a16767971507733f6692eff1919fe7add6911b33c40dfc45a7","src/internals/case.rs":"10c8dda2b32d8c6c6b63cf09cdc63d02375af7e95ecefe8fecb34f93b65191bb","src/internals/check.rs":"d842eb9912fd29311060b67f3bc62c438eb7b5d86093355acb4de7eee02a0ef8","src/internals/ctxt.rs":"83a4e6fbe0e439d578478883594407e03f2f340541be479bdf0b04a202633a37","src/internals/mod.rs":"ed021ca635c18132a0e5c3d90f21b7f65def0a61e946421a30200b5b9ab6ad43","src/internals/receiver.rs":"710f875da3bad3e2a7fc1df40ab6805bb5e971b6a2a04c1b643b8a0aa29e8496","src/internals/respan.rs":"899753859c58ce5f532a3ec4584796a52f13ed5a0533191e48c953ba5c1b52ff","src/internals/symbol.rs":"d619e88caa3c7a09b03014257f2b349ee922290062d9b97b4dd19d0e64532690","src/lib.rs":"859329090a2685a2d4e6c6fe3e6ff2e7c17db5ca488bcff95431dee26fcfc93e","src/pretend.rs":"7facc10a5b805564dd95735ae11118ec17ca6adcc49a59764e7c920e27b9fc4a","src/ser.rs":"120588172988a1078af4a090fbe6ffc2f9ba3ac6993f9baebea17cfe5ac6e7fa","src/this.rs":"87818dc80cbb521b51938a653d09daf10aafc220bb10425948de82ad670fcb85"},"package":"a5831b979fd7b5439637af1752d535ff49f4860c0f341d1baeb6faf0f4242170"} \ No newline at end of file +{"files":{"Cargo.toml":"f02849531e614dd38ab37ad86c0e4f5bf16ede7becaa75ebbb6604170ea294e6","LICENSE-APACHE":"62c7a1e35f56406896d7aa7ca52d0cc0d272ac022b5d2796e7d6905db8a3636a","LICENSE-MIT":"23f18e03dc49df91622fe2a76176497404e46ced8a715d9d2b67a7446571cca3","README.md":"731c044fc5f98b37a89e9049c9214267db98763309cb63146b45c029640f82a3","crates-io.md":"407d92b2932923f8708aaf31db266fd7db32e2b0afa6c569d134b680b74a1920","src/bound.rs":"6c5c20785ac95af9480f8d0de35a7e844cc36a16012f6468db148acd03cb15c2","src/de.rs":"e0a2186fb31e24b95cdfc499b1adad295bb3eac0448a41fc37f7609cadda52c7","src/dummy.rs":"9533dfee23f20d92ea75734c739022820c2787ded0d54f459feacdeb770ec912","src/fragment.rs":"6757cb4c3131d4300f093572efc273c4ab5a20e3e1efb54a311dcfa52d0bd6eb","src/internals/ast.rs":"171478e83d203193cd96f2c9c922bd240214e05fdf76add73fb7e029784bace8","src/internals/attr.rs":"8ab89c54ec7713a16767971507733f6692eff1919fe7add6911b33c40dfc45a7","src/internals/case.rs":"10c8dda2b32d8c6c6b63cf09cdc63d02375af7e95ecefe8fecb34f93b65191bb","src/internals/check.rs":"d842eb9912fd29311060b67f3bc62c438eb7b5d86093355acb4de7eee02a0ef8","src/internals/ctxt.rs":"83a4e6fbe0e439d578478883594407e03f2f340541be479bdf0b04a202633a37","src/internals/mod.rs":"ed021ca635c18132a0e5c3d90f21b7f65def0a61e946421a30200b5b9ab6ad43","src/internals/receiver.rs":"710f875da3bad3e2a7fc1df40ab6805bb5e971b6a2a04c1b643b8a0aa29e8496","src/internals/respan.rs":"899753859c58ce5f532a3ec4584796a52f13ed5a0533191e48c953ba5c1b52ff","src/internals/symbol.rs":"d619e88caa3c7a09b03014257f2b349ee922290062d9b97b4dd19d0e64532690","src/lib.rs":"67d0a9e8509324573bf42467f98eb3d9e4e15da67410a3e23bb87bdbd742f5ed","src/pretend.rs":"7facc10a5b805564dd95735ae11118ec17ca6adcc49a59764e7c920e27b9fc4a","src/ser.rs":"120588172988a1078af4a090fbe6ffc2f9ba3ac6993f9baebea17cfe5ac6e7fa","src/this.rs":"87818dc80cbb521b51938a653d09daf10aafc220bb10425948de82ad670fcb85"},"package":"243902eda00fad750862fc144cea25caca5e20d615af0a81bee94ca738f1df1f"} \ No newline at end of file diff --git a/.cargo-vendor/serde_derive/Cargo.toml b/.cargo-vendor/serde_derive/Cargo.toml index 1266d010ec..2bd5bb348a 100644 --- a/.cargo-vendor/serde_derive/Cargo.toml +++ b/.cargo-vendor/serde_derive/Cargo.toml @@ -13,7 +13,7 @@ edition = "2015" rust-version = "1.56" name = "serde_derive" -version = "1.0.209" +version = "1.0.210" authors = [ "Erick Tryzelaar ", "David Tolnay ", diff --git a/.cargo-vendor/serde_derive/src/lib.rs b/.cargo-vendor/serde_derive/src/lib.rs index 48104ed327..bedd1cb3d1 100644 --- a/.cargo-vendor/serde_derive/src/lib.rs +++ b/.cargo-vendor/serde_derive/src/lib.rs @@ -13,7 +13,7 @@ //! //! [https://serde.rs/derive.html]: https://serde.rs/derive.html -#![doc(html_root_url = "https://docs.rs/serde_derive/1.0.209")] +#![doc(html_root_url = "https://docs.rs/serde_derive/1.0.210")] #![cfg_attr(not(check_cfg), allow(unexpected_cfgs))] // Ignored clippy lints #![allow( diff --git a/.cargo-vendor/serde_json/.cargo-checksum.json b/.cargo-vendor/serde_json/.cargo-checksum.json index 08a9b5d878..7ddeb48066 100644 --- a/.cargo-vendor/serde_json/.cargo-checksum.json +++ b/.cargo-vendor/serde_json/.cargo-checksum.json @@ -1 +1 @@ -{"files":{"CONTRIBUTING.md":"f5270cafba66223a7b51ffc0d286075a17bb7cd88762fc80d333d3102629f4d8","Cargo.toml":"699638d9877d2dd89483774cfae4e26be87799a34cc0127aba3b95d11ff64184","LICENSE-APACHE":"62c7a1e35f56406896d7aa7ca52d0cc0d272ac022b5d2796e7d6905db8a3636a","LICENSE-MIT":"23f18e03dc49df91622fe2a76176497404e46ced8a715d9d2b67a7446571cca3","README.md":"f223b99630bae262eb2b88bb95d0f496db8f1ff4e94e43dbfc8d95d3a6c98d8f","build.rs":"1630d0bbfc936b0975d840cec5cfb5910d861b6afeeeeabe11000a2c202d571d","src/de.rs":"e2755b92b4e61d5fefa14ca93acaac5e7c21c0fbf7adc09e2a039d0bf8d94d5e","src/error.rs":"a9b5de0a82f95608b51b8e8875c7c49f94fb60b9f976fc6277aec0213926dec9","src/io/core.rs":"60ba28f67a9acaecf8964b611efba416b13f9f2bae4befc329fdf0e037293802","src/io/mod.rs":"fd1ed5080495cab21117f6f7d3c2c9e3687cad0c69a0cd087b08a145a9e672da","src/iter.rs":"f832c469cd7999d26ba9b76baa69b257a212a7edb3dfdf9b1d1bb35e8da85fa9","src/lexical/algorithm.rs":"bd6106e5d8875c9ff1c1d57256b459a4f0992d14a0df1a5fffcd3d3cbdccee8c","src/lexical/bhcomp.rs":"26f39d52008225a6b377d7246d326940d44200e160a7b4652733e712e1a45a04","src/lexical/bignum.rs":"db688e8112389998d0f91906f6857e28f9b510a8b4065ad476c8e8be2f77becf","src/lexical/cached.rs":"0e127398691f8042c19cde209e7f4b0161f0f3150342430145929f711e6fdac8","src/lexical/cached_float80.rs":"0f8f74a22cb7d871322a9893bffd0255ca10bf9dffd13afb2462dd3d7f51805f","src/lexical/digit.rs":"9502805adbc3da059131d1fac0a802e17065b36cd7472606b3af24e3241d5cb8","src/lexical/errors.rs":"3d9f6de6245533bcb101dfd718cfed61d59dc293f6768cedae28aa13ace164f5","src/lexical/exponent.rs":"51f19443008e8884b15c7d5d4b1f1cfbd5673a9d1da02f1af39fcf20e315f01f","src/lexical/float.rs":"fe356213c92a049f4bef2f58bc0e3a26866ca06b8c1d74d0f961c5b883852cad","src/lexical/large_powers.rs":"18d697b846b44ecb61bfaaa3b881e0696f9b7bb6be582623e9d3a8a176a48d2f","src/lexical/large_powers32.rs":"c70b57a727960beec258758a4d4a1050f8eaf3b4e60027c663a2bfb0246e0153","src/lexical/large_powers64.rs":"e7af83ce3159b5fc4669fc5a231e767d8af21bacaece52a0a48951198965b197","src/lexical/math.rs":"6866e8f8241bd718c8f599f17a589be17038533c38e16ac26e8294c49e400bbc","src/lexical/mod.rs":"ace2ccea2cd541f019a84b9eeb3b9ecd88daf6bccbe9edf0eac00b62704f47c4","src/lexical/num.rs":"2d06111d28616221995f7b4d4f13625b8d902884921268b0e02e544f871a5339","src/lexical/parse.rs":"c2bfac4c70a19938ced61e991f4ec606764887cf12bac1a0978b5b5318a56aac","src/lexical/rounding.rs":"4762af3612880b17468ff2a1bb800c8e99f08330ae439699dd53d8dc5463ad13","src/lexical/shift.rs":"bc1ed053dd63d45ac9c35302f18de9f00d94027f28af4ab749c9248439de832a","src/lexical/small_powers.rs":"73c56b7b83310c6fefa898fb94771c65bdc251c1579ab105151da43935ea02be","src/lib.rs":"c513faec5b1ad5a8e861cbd76cbe136f1c044478e4cac83389fc3f2618d30b58","src/macros.rs":"f917820b8e568b46b3fb4568bb131860d41d272446418d5708659b4bab246266","src/map.rs":"2cb5755d9cfa822a9a1ba43278be977d85d9f41e61277149befc98523c6fe9a3","src/number.rs":"537be73fe2f1f4c654a41e0b6461493ca7e3c20265163b3fb3405d047c163c1a","src/raw.rs":"74f5937706324c9325acc42597ff0a226faeaae38d270ab61ba6283e37616c86","src/read.rs":"5915d1ee818059e05c86df2540ca63140eaa1af9754a5233fcb967708df71e31","src/ser.rs":"ee5b6cb04c2ff7058b52cb5d0383218f484505ce0896e5c7fd5076bd9d90952e","src/value/de.rs":"890d88303ce0036a5efd1c57378dab7f8c45dabd798cece2248c2d9db52fa011","src/value/from.rs":"add9687e35db3962729d986c8aa54785cadeb07b8b7121cd4075e3a37ecc73a1","src/value/index.rs":"93eb54ba9d74f6853e080418774e8854d4fd965c4a94c52507d5109a1ad949ca","src/value/mod.rs":"3fc652476a2fc3e4791dd000ff8f2c22e725cf46041c2b89099f293074ae2bb8","src/value/partial_eq.rs":"655fd0bf3ab1d6669444a55ab849f43bb333032de8ca8f1ee95e1068da43ee22","src/value/ser.rs":"d59f959448de1f4115ed62359e7444081741215e7005bcf97f7584b5e31e3b15","tests/compiletest.rs":"4e381aa8ca3eabb7ac14d1e0c3700b3223e47640547a6988cfa13ad68255f60f","tests/debug.rs":"a8451217c1e127ad6e653ef11e0513525ee350e1e37dd575758a8ee9301b28fb","tests/lexical.rs":"8ee6e617ef62a090de49ac2a930130a6913ab5316100781543c7788f89ef99c2","tests/lexical/algorithm.rs":"da378df9ee24bfa033968d5c94e91b58e52c39bf6c825dec51c3eb7250cc5874","tests/lexical/exponent.rs":"dc8fa8d05e561ff256f8b09385291768c7f45e5ad6cb878ef9194757aa014386","tests/lexical/float.rs":"0440f2d85c993bcccd925096d7f4136bf624ffd66b3c7ee565d158390685eb11","tests/lexical/math.rs":"4142ef090f563df1f6b14c9a4e6d4723535fa816dca3febc94b3423240e9db20","tests/lexical/num.rs":"e0bdc3b4facd579e9cfdf87c8bae107ed227c63cf9ef920fd85e9febb985c693","tests/lexical/parse.rs":"a11f09bb003a3a024548008cf78bf76526ed71b00077d1989f45eb8cebc93b9c","tests/lexical/rounding.rs":"6c56e39ba534616c1b2146e8efa6eb57aed322e683bf23183cd32a61fae6447e","tests/macros/mod.rs":"93aa1d54af20bc2c55b6ae8db73c1414cda2626eb9fa7bd57b9d613a3c6e6a19","tests/map.rs":"c83b59fbfa6f157b552ccd3536f46ddf63d7b5aa9fdb1dfb698a226a0b53a13b","tests/regression.rs":"86731134bfb9bb693d9a4fc62393027de80a8bf031109ea6c7ea475b1ebdde8d","tests/regression/issue1004.rs":"38d7e3b6c515b881078ebd21ca8063d2ca105cd319695d29538f879e37f091b5","tests/regression/issue520.rs":"f95b362e45c57b431720c48eb47f7ddddf4078195d6859df523dc32950ce980a","tests/regression/issue795.rs":"37ff26744b1f950dd212565c6e3f276268882f7724cc589ac8b21ca8bd608413","tests/regression/issue845.rs":"10d2895cd1412cb6630f0a59db367f79ee672edb501151c7581e9921b5a84b92","tests/regression/issue953.rs":"b2cddc761f5ca6639900c173765a8a5868528a896924e5e925db2696469208f7","tests/stream.rs":"794b672b52eb8f1696b32b8dd125a660fc19b83fcfef5390896b02149b5f0a9b","tests/test.rs":"851dcfa5c9c65909fb7d90bd2523d3ea4e1b41331486ef3f6c139234de4a949e","tests/ui/missing_colon.rs":"d07e0c34d98eb43465f0a0310f2c0b5d5b0d26d243b352a1c6bbe6ad3b27eda9","tests/ui/missing_colon.stderr":"a543cf9931a6224ba74f4592ea551f19438752c09427c649cd0211d363e88e75","tests/ui/missing_comma.rs":"b8a9662f99c3e6dd2b6417892c37640578ce91d3a8365bf10c1f686a3227aa87","tests/ui/missing_comma.stderr":"eae626cf93c97abd105066e624ca4e8cb096784413b9d2564cf9414a8492bc4d","tests/ui/missing_value.rs":"bca25d67127fb88e7c191c7b03af5a4ce8a9abb630f3d2e6a6c1e77e213dc9a4","tests/ui/missing_value.stderr":"a03be58cfa3d80cf1bd967bc8473933e87226db69c7967710084b13ca43bccdc","tests/ui/not_found.rs":"d0a7adb309879ff65aee115b52cc33d36f4bad353cf97c4effc34a6128c2bee3","tests/ui/not_found.stderr":"359b751c0c21fab6d460daef4d5f73a265f7769c9b578f98ea3cb6cbf2387643","tests/ui/parse_expr.rs":"32e6d51f528db3d1ab0ed1e24765b865be393565c26f77413c5aa39d601ac563","tests/ui/parse_expr.stderr":"4fcd0a014fbce31c9266bab8527d6e6b6806a0e21d9e0275ce713137856073ce","tests/ui/parse_key.rs":"18829b2af320d5cf8a0a5cd3aaf84c7e92cc874651c30e45a3acafb76c2d8b93","tests/ui/parse_key.stderr":"20cf0d2898749f3c36780fc065f5049ee809e74cb6f0ef776f43f45e01596ee3","tests/ui/unexpected_after_array_element.rs":"a343fc3104431720bdfcf330bcc3cfcd98c8dec3e951133b495242478b0b7eb3","tests/ui/unexpected_after_array_element.stderr":"8df615998fa3057bb9ed865981a35cdbb771625337048f0ad3fba7734e607adf","tests/ui/unexpected_after_map_entry.rs":"6e3bd2def435ca610e346bbc75cdbaf61963eb2ef1885bb5f76781ba1fac37ef","tests/ui/unexpected_after_map_entry.stderr":"b1985c89075ab48b2158bd1705ed766d37854b3d4620ab257cc8bc319d224f17","tests/ui/unexpected_colon.rs":"a313cff3fed4be4c33f1eda5d0c5c98147fb835a56d36470d9f367352c1d61ef","tests/ui/unexpected_colon.stderr":"b2288742fa6a4a7eb65d2ae899bcfed8795b57bd04958da227d60928a8df26c5","tests/ui/unexpected_comma.rs":"55a8b684bde1ce905837cce719fd457d8898b61cebc27e5b420d05cb6be97256","tests/ui/unexpected_comma.stderr":"4c103ca63ff15e2ca659242cc0eae0612bf050e7580da62f1cf50de8082aa7dc"},"package":"8043c06d9f82bd7271361ed64f415fe5e12a77fdb52e573e7f06a516dea329ad"} \ No newline at end of file +{"files":{"CONTRIBUTING.md":"f5270cafba66223a7b51ffc0d286075a17bb7cd88762fc80d333d3102629f4d8","Cargo.toml":"ba4ed0881d1eb030190336aea006ee7c5d779fc6b800ef4ca0d51f17108fe4d6","LICENSE-APACHE":"62c7a1e35f56406896d7aa7ca52d0cc0d272ac022b5d2796e7d6905db8a3636a","LICENSE-MIT":"23f18e03dc49df91622fe2a76176497404e46ced8a715d9d2b67a7446571cca3","README.md":"f223b99630bae262eb2b88bb95d0f496db8f1ff4e94e43dbfc8d95d3a6c98d8f","build.rs":"1630d0bbfc936b0975d840cec5cfb5910d861b6afeeeeabe11000a2c202d571d","src/de.rs":"e2755b92b4e61d5fefa14ca93acaac5e7c21c0fbf7adc09e2a039d0bf8d94d5e","src/error.rs":"a9b5de0a82f95608b51b8e8875c7c49f94fb60b9f976fc6277aec0213926dec9","src/io/core.rs":"60ba28f67a9acaecf8964b611efba416b13f9f2bae4befc329fdf0e037293802","src/io/mod.rs":"fd1ed5080495cab21117f6f7d3c2c9e3687cad0c69a0cd087b08a145a9e672da","src/iter.rs":"f832c469cd7999d26ba9b76baa69b257a212a7edb3dfdf9b1d1bb35e8da85fa9","src/lexical/algorithm.rs":"bd6106e5d8875c9ff1c1d57256b459a4f0992d14a0df1a5fffcd3d3cbdccee8c","src/lexical/bhcomp.rs":"26f39d52008225a6b377d7246d326940d44200e160a7b4652733e712e1a45a04","src/lexical/bignum.rs":"db688e8112389998d0f91906f6857e28f9b510a8b4065ad476c8e8be2f77becf","src/lexical/cached.rs":"0e127398691f8042c19cde209e7f4b0161f0f3150342430145929f711e6fdac8","src/lexical/cached_float80.rs":"0f8f74a22cb7d871322a9893bffd0255ca10bf9dffd13afb2462dd3d7f51805f","src/lexical/digit.rs":"9502805adbc3da059131d1fac0a802e17065b36cd7472606b3af24e3241d5cb8","src/lexical/errors.rs":"3d9f6de6245533bcb101dfd718cfed61d59dc293f6768cedae28aa13ace164f5","src/lexical/exponent.rs":"51f19443008e8884b15c7d5d4b1f1cfbd5673a9d1da02f1af39fcf20e315f01f","src/lexical/float.rs":"fe356213c92a049f4bef2f58bc0e3a26866ca06b8c1d74d0f961c5b883852cad","src/lexical/large_powers.rs":"18d697b846b44ecb61bfaaa3b881e0696f9b7bb6be582623e9d3a8a176a48d2f","src/lexical/large_powers32.rs":"c70b57a727960beec258758a4d4a1050f8eaf3b4e60027c663a2bfb0246e0153","src/lexical/large_powers64.rs":"e7af83ce3159b5fc4669fc5a231e767d8af21bacaece52a0a48951198965b197","src/lexical/math.rs":"6866e8f8241bd718c8f599f17a589be17038533c38e16ac26e8294c49e400bbc","src/lexical/mod.rs":"ace2ccea2cd541f019a84b9eeb3b9ecd88daf6bccbe9edf0eac00b62704f47c4","src/lexical/num.rs":"2d06111d28616221995f7b4d4f13625b8d902884921268b0e02e544f871a5339","src/lexical/parse.rs":"c2bfac4c70a19938ced61e991f4ec606764887cf12bac1a0978b5b5318a56aac","src/lexical/rounding.rs":"4762af3612880b17468ff2a1bb800c8e99f08330ae439699dd53d8dc5463ad13","src/lexical/shift.rs":"bc1ed053dd63d45ac9c35302f18de9f00d94027f28af4ab749c9248439de832a","src/lexical/small_powers.rs":"73c56b7b83310c6fefa898fb94771c65bdc251c1579ab105151da43935ea02be","src/lib.rs":"ec4f48b3f5344692c30ae793ebc094090fd70e3841b7f9f9a92fea124f7d1129","src/macros.rs":"f917820b8e568b46b3fb4568bb131860d41d272446418d5708659b4bab246266","src/map.rs":"2cb5755d9cfa822a9a1ba43278be977d85d9f41e61277149befc98523c6fe9a3","src/number.rs":"537be73fe2f1f4c654a41e0b6461493ca7e3c20265163b3fb3405d047c163c1a","src/raw.rs":"74f5937706324c9325acc42597ff0a226faeaae38d270ab61ba6283e37616c86","src/read.rs":"5915d1ee818059e05c86df2540ca63140eaa1af9754a5233fcb967708df71e31","src/ser.rs":"ee5b6cb04c2ff7058b52cb5d0383218f484505ce0896e5c7fd5076bd9d90952e","src/value/de.rs":"890d88303ce0036a5efd1c57378dab7f8c45dabd798cece2248c2d9db52fa011","src/value/from.rs":"add9687e35db3962729d986c8aa54785cadeb07b8b7121cd4075e3a37ecc73a1","src/value/index.rs":"93eb54ba9d74f6853e080418774e8854d4fd965c4a94c52507d5109a1ad949ca","src/value/mod.rs":"3fc652476a2fc3e4791dd000ff8f2c22e725cf46041c2b89099f293074ae2bb8","src/value/partial_eq.rs":"655fd0bf3ab1d6669444a55ab849f43bb333032de8ca8f1ee95e1068da43ee22","src/value/ser.rs":"2cbed8aec4c714e73145d6c2d84fb9443f010c31c6e766dfeed61a4e9810807f","tests/compiletest.rs":"4e381aa8ca3eabb7ac14d1e0c3700b3223e47640547a6988cfa13ad68255f60f","tests/debug.rs":"a8451217c1e127ad6e653ef11e0513525ee350e1e37dd575758a8ee9301b28fb","tests/lexical.rs":"8ee6e617ef62a090de49ac2a930130a6913ab5316100781543c7788f89ef99c2","tests/lexical/algorithm.rs":"da378df9ee24bfa033968d5c94e91b58e52c39bf6c825dec51c3eb7250cc5874","tests/lexical/exponent.rs":"dc8fa8d05e561ff256f8b09385291768c7f45e5ad6cb878ef9194757aa014386","tests/lexical/float.rs":"0440f2d85c993bcccd925096d7f4136bf624ffd66b3c7ee565d158390685eb11","tests/lexical/math.rs":"4142ef090f563df1f6b14c9a4e6d4723535fa816dca3febc94b3423240e9db20","tests/lexical/num.rs":"e0bdc3b4facd579e9cfdf87c8bae107ed227c63cf9ef920fd85e9febb985c693","tests/lexical/parse.rs":"a11f09bb003a3a024548008cf78bf76526ed71b00077d1989f45eb8cebc93b9c","tests/lexical/rounding.rs":"6c56e39ba534616c1b2146e8efa6eb57aed322e683bf23183cd32a61fae6447e","tests/macros/mod.rs":"93aa1d54af20bc2c55b6ae8db73c1414cda2626eb9fa7bd57b9d613a3c6e6a19","tests/map.rs":"c83b59fbfa6f157b552ccd3536f46ddf63d7b5aa9fdb1dfb698a226a0b53a13b","tests/regression.rs":"86731134bfb9bb693d9a4fc62393027de80a8bf031109ea6c7ea475b1ebdde8d","tests/regression/issue1004.rs":"38d7e3b6c515b881078ebd21ca8063d2ca105cd319695d29538f879e37f091b5","tests/regression/issue520.rs":"f95b362e45c57b431720c48eb47f7ddddf4078195d6859df523dc32950ce980a","tests/regression/issue795.rs":"37ff26744b1f950dd212565c6e3f276268882f7724cc589ac8b21ca8bd608413","tests/regression/issue845.rs":"10d2895cd1412cb6630f0a59db367f79ee672edb501151c7581e9921b5a84b92","tests/regression/issue953.rs":"b2cddc761f5ca6639900c173765a8a5868528a896924e5e925db2696469208f7","tests/stream.rs":"794b672b52eb8f1696b32b8dd125a660fc19b83fcfef5390896b02149b5f0a9b","tests/test.rs":"851dcfa5c9c65909fb7d90bd2523d3ea4e1b41331486ef3f6c139234de4a949e","tests/ui/missing_colon.rs":"d07e0c34d98eb43465f0a0310f2c0b5d5b0d26d243b352a1c6bbe6ad3b27eda9","tests/ui/missing_colon.stderr":"a543cf9931a6224ba74f4592ea551f19438752c09427c649cd0211d363e88e75","tests/ui/missing_comma.rs":"b8a9662f99c3e6dd2b6417892c37640578ce91d3a8365bf10c1f686a3227aa87","tests/ui/missing_comma.stderr":"eae626cf93c97abd105066e624ca4e8cb096784413b9d2564cf9414a8492bc4d","tests/ui/missing_value.rs":"bca25d67127fb88e7c191c7b03af5a4ce8a9abb630f3d2e6a6c1e77e213dc9a4","tests/ui/missing_value.stderr":"a03be58cfa3d80cf1bd967bc8473933e87226db69c7967710084b13ca43bccdc","tests/ui/not_found.rs":"d0a7adb309879ff65aee115b52cc33d36f4bad353cf97c4effc34a6128c2bee3","tests/ui/not_found.stderr":"359b751c0c21fab6d460daef4d5f73a265f7769c9b578f98ea3cb6cbf2387643","tests/ui/parse_expr.rs":"32e6d51f528db3d1ab0ed1e24765b865be393565c26f77413c5aa39d601ac563","tests/ui/parse_expr.stderr":"4fcd0a014fbce31c9266bab8527d6e6b6806a0e21d9e0275ce713137856073ce","tests/ui/parse_key.rs":"18829b2af320d5cf8a0a5cd3aaf84c7e92cc874651c30e45a3acafb76c2d8b93","tests/ui/parse_key.stderr":"20cf0d2898749f3c36780fc065f5049ee809e74cb6f0ef776f43f45e01596ee3","tests/ui/unexpected_after_array_element.rs":"a343fc3104431720bdfcf330bcc3cfcd98c8dec3e951133b495242478b0b7eb3","tests/ui/unexpected_after_array_element.stderr":"8df615998fa3057bb9ed865981a35cdbb771625337048f0ad3fba7734e607adf","tests/ui/unexpected_after_map_entry.rs":"6e3bd2def435ca610e346bbc75cdbaf61963eb2ef1885bb5f76781ba1fac37ef","tests/ui/unexpected_after_map_entry.stderr":"b1985c89075ab48b2158bd1705ed766d37854b3d4620ab257cc8bc319d224f17","tests/ui/unexpected_colon.rs":"a313cff3fed4be4c33f1eda5d0c5c98147fb835a56d36470d9f367352c1d61ef","tests/ui/unexpected_colon.stderr":"b2288742fa6a4a7eb65d2ae899bcfed8795b57bd04958da227d60928a8df26c5","tests/ui/unexpected_comma.rs":"55a8b684bde1ce905837cce719fd457d8898b61cebc27e5b420d05cb6be97256","tests/ui/unexpected_comma.stderr":"4c103ca63ff15e2ca659242cc0eae0612bf050e7580da62f1cf50de8082aa7dc"},"package":"6ff5456707a1de34e7e37f2a6fd3d3f808c318259cbd01ab6377795054b483d8"} \ No newline at end of file diff --git a/.cargo-vendor/serde_json/Cargo.toml b/.cargo-vendor/serde_json/Cargo.toml index 1aa92c73ee..e9f7716d63 100644 --- a/.cargo-vendor/serde_json/Cargo.toml +++ b/.cargo-vendor/serde_json/Cargo.toml @@ -13,7 +13,7 @@ edition = "2021" rust-version = "1.56" name = "serde_json" -version = "1.0.127" +version = "1.0.128" authors = [ "Erick Tryzelaar ", "David Tolnay ", diff --git a/.cargo-vendor/serde_json/src/lib.rs b/.cargo-vendor/serde_json/src/lib.rs index 479e19cec0..8358c76d7e 100644 --- a/.cargo-vendor/serde_json/src/lib.rs +++ b/.cargo-vendor/serde_json/src/lib.rs @@ -299,7 +299,7 @@ //! [macro]: crate::json //! [`serde-json-core`]: https://github.com/rust-embedded-community/serde-json-core -#![doc(html_root_url = "https://docs.rs/serde_json/1.0.127")] +#![doc(html_root_url = "https://docs.rs/serde_json/1.0.128")] // Ignored clippy lints #![allow( clippy::collapsible_else_if, diff --git a/.cargo-vendor/serde_json/src/value/ser.rs b/.cargo-vendor/serde_json/src/value/ser.rs index e869ae160f..b292f98208 100644 --- a/.cargo-vendor/serde_json/src/value/ser.rs +++ b/.cargo-vendor/serde_json/src/value/ser.rs @@ -505,6 +505,10 @@ impl serde::Serializer for MapKeySerializer { Ok(value.to_string()) } + fn serialize_i128(self, value: i128) -> Result { + Ok(value.to_string()) + } + fn serialize_u8(self, value: u8) -> Result { Ok(value.to_string()) } @@ -521,6 +525,10 @@ impl serde::Serializer for MapKeySerializer { Ok(value.to_string()) } + fn serialize_u128(self, value: u128) -> Result { + Ok(value.to_string()) + } + fn serialize_f32(self, value: f32) -> Result { if value.is_finite() { Ok(ryu::Buffer::new().format_finite(value).to_owned()) diff --git a/.cargo-vendor/syn/.cargo-checksum.json b/.cargo-vendor/syn/.cargo-checksum.json index d623b9445e..101d905536 100644 --- a/.cargo-vendor/syn/.cargo-checksum.json +++ b/.cargo-vendor/syn/.cargo-checksum.json @@ -1 +1 @@ -{"files":{"Cargo.toml":"2fc30efe60e47d9c79006768da7d3dd65d2219236f7e6f731f0984bbe14efc37","LICENSE-APACHE":"62c7a1e35f56406896d7aa7ca52d0cc0d272ac022b5d2796e7d6905db8a3636a","LICENSE-MIT":"23f18e03dc49df91622fe2a76176497404e46ced8a715d9d2b67a7446571cca3","README.md":"ae6deb98ea51df4829c0327139a555cc115c6bcf6fb459db0ef0d6a96c4566ec","benches/file.rs":"0a0527c78d849148cbb6118b4d36f72da7d4add865ba1a410e0a1be9e8dbfe0e","benches/rust.rs":"a4b2ac626d36df1e344b1389384a559fb47da291b8ad3aa964d59d93279eebb1","src/attr.rs":"94089e45d40b1b4610e3167c0715c9075bcfc87e74cb7e306cbb0635786ea9b9","src/bigint.rs":"0299829b2f7a1a798fe2f7bc1680e4a10f9b6f4a852d09af4da2deab466c4242","src/buffer.rs":"00f28570908d311f3f568f3b116dc4f6aa3da556eb0bd5af8d6771f3301ab060","src/classify.rs":"00312dc6d51f634530f06b44365365a2588a3f6f40740224f64d0cde94839b5b","src/custom_keyword.rs":"322114e36ae43a2f8605506fb4568efdbc2986853e2fee74bd10a4ca0fb60c69","src/custom_punctuation.rs":"2ae2339c29b1aff3ab16157d51a3a07bfca594aa38586981534fe07a62cdd9d1","src/data.rs":"6f20b5ebbac7c3e9389cb0b5b0637f34d3ab721b6d6707b0eed274024ac78675","src/derive.rs":"f54f8cf9386a2d45186ff3c86ade5dae59e0e337b0198532449190ae8520cff8","src/discouraged.rs":"88b38a75d074d3f0b4186f2b4988844e8284a0c9d279d784327c6b595b9e33ea","src/drops.rs":"013385f1dd95663f1afab41abc1e2eea04181998644828935ca564c74d6462ae","src/error.rs":"3b03fd75eee8b0bb646eaf20f7e287345bdc7515ad5286024a2dd1e53c1e7bf2","src/export.rs":"b260cc49da1da3489e7755832bc8015cfad79e84f6c74e237f65ae25a2385e56","src/expr.rs":"53df6c7a2623492ca48f64241bc73bd0feaf05d80b89138b950ded728e90391d","src/ext.rs":"ed143b029af286e62ceb4310286a4ce894792dd588465face042b4199b39d329","src/file.rs":"39d4ed9c56a7dc0d83259843732c434cd187248a4cde3dba4a98c3b92df6d08f","src/fixup.rs":"b312a6a527f81df17a94cb9f08def820584ca76cbef07893bbed492f2f0506af","src/gen/clone.rs":"36491f5f9e9cad6c4eb354b3331ec2b672607bb26429eba6379d1e9a4919170f","src/gen/debug.rs":"c9b2547663ed9025ba614fb1a70810df1b25f471ebb57abb01de5ab8e4fa8bf0","src/gen/eq.rs":"b5fffca0c3b6c31b3fcc80a7bd8fec65baed982a4e2fb4c8862db6059ab7dea1","src/gen/fold.rs":"345e6a6d9a7d2d09e09cd5857fc903af4202df42f0759a3da118556e98829fd2","src/gen/hash.rs":"447e840245178d0777b4e143b54c356b88962456e80282dcaad1763093709c13","src/gen/visit.rs":"178a6841d7d1974bff8c8c2f9a18e9b77384956841861a50828252bcaef67c18","src/gen/visit_mut.rs":"2a8f9a1c0259060f3fa1d6cab8a1924c1b07d713561aa9562cde8e79a39e66d5","src/generics.rs":"f532d7e4516c250e3eeda92e98ab2d1af19c9a368850abc8f56c230f1bbe534a","src/group.rs":"ddbff97e41315bdf9dfce215a8c00bb4d532827cf794246afde7308b39dc09ca","src/ident.rs":"d6061030fadae9c7dc847e1ee46178d9657d782aad108c7197e8cafe765b3eaa","src/item.rs":"7867cc00affe8df97d23cb104ce6371ac168ed97443ed99062a920bdd542c9f6","src/lib.rs":"1447e95f6c98c3776a492582c57f6f4ce2d0c4aad84ede25bb021011c25e1c35","src/lifetime.rs":"5787d5a5dc7e5332b03283a25ae0a9e826464242ca2d149b1a19e7cae9cee34d","src/lit.rs":"8fa6fa2d752bd1bf5a94cd5cbf9becbcba37d491876614ce62dba0f8fc745a3d","src/lookahead.rs":"eae3c1855dfd1f9bca5dd4afba07d41b15f8c108017f9eda3dc515567160a2af","src/mac.rs":"fdce8291f71adef3f69975f229156dca2309ca232ed943061afaf96220908ab8","src/macros.rs":"2a6e895dfe1c3a9a7237b5e23358ca5d8967e2beae6d094dda68d3659f9a5c84","src/meta.rs":"969d8ccbdbc6ea2e4928a21831b791c57447b231e1373149e4c63b46f3951801","src/op.rs":"a61757370f802e44efa3c4a1057ae2cd26e64e273f7d76c06d5ffb49602319e2","src/parse.rs":"fc010e04b49c36813ee50f37d974289ae7081b3f96c37051340040f460b375aa","src/parse_macro_input.rs":"e4e22b63d0496d06a4ca17742a22467ed93f08a739081324773828bad63175ee","src/parse_quote.rs":"6f4e5e28622205651bdb23fcf0f0526aef81a7921aaeac2e7a1a1e3b67916fe9","src/pat.rs":"1455a882df5defbf6b774a80f37fe24cf96d5ad1e5584c5204c0c9723883566b","src/path.rs":"1cd7f82a79d0978c3d017e545e7147f50d54a8a8348ed18b21359d5d5c7763aa","src/precedence.rs":"a0c3cd0d873e7c40b609ce3279838deb42cec4004bd4bf53276325428d7584fb","src/print.rs":"22910bf0521ab868ebd7c62601c55912d12cfb400c65723e08e5cfa3a2d111c0","src/punctuated.rs":"6e4a63b736f371bbb4cba83bb674e29aa25f9f214bc10e9acf785673a39d3fc5","src/restriction.rs":"a7152ec5a4ee4f55446019aa2b4d84f2238776f0e6ffc0c22adf3374b517fe56","src/sealed.rs":"6ece3b3dcb30f6bb98b93d83759ca7712ee8592bef9c0511141039c38765db0e","src/span.rs":"0a48e375e5c9768f6f64174a91ba6a255f4b021e2fb3548d8494e617f142601b","src/spanned.rs":"4b9bd65f60ab81922adfd0be8f03b6d50e98da3a5f525f242f9639aec4beac79","src/stmt.rs":"bb4cd196ce23c3fc07fefa47e67a0cd815db4f02ce1192625379d60bd657ffd2","src/thread.rs":"1f1deb1272525ab2af9a36aac4bce8f65b0e315adb1656641fd7075662f49222","src/token.rs":"3625e05bfaaf48adf7685669a59186386862572fa4550c5e94bf9a1febdb069e","src/tt.rs":"a58303a95d08d6bf3f3e09715b9b70a57b91b54774cfc1f00f2848034d2ff5c7","src/ty.rs":"1deae7fdaba88c0300ff562cb844f78742e379ece4254e54986e32721116126f","src/verbatim.rs":"87cbe82a90f48efb57ffd09141042698b3e011a21d0d5412154d80324b0a5ef0","src/whitespace.rs":"9cdcbfe9045b259046329a795bc1105ab5a871471a6d3f7318d275ee53f7a825","tests/common/eq.rs":"c4503ecbb7014eb816f6e6768c8e7853aa3d389419db5cd9ef122707cc168de2","tests/common/mod.rs":"1f43ce65b273172c87640e87ee0775ecb6f19280fbf8f792570d019b61f9a32d","tests/common/parse.rs":"c173bd515ba1d53b3b676161849fa8df0ae3d5592445843cee65b6628b71ac32","tests/debug/gen.rs":"3ca161a049fe72ff73ead99fbfe78335fdb2ac7c41085fe8cd0c9a0b29995151","tests/debug/mod.rs":"b56136586267ae1812a937b69215dd053ada2c21717771d89dcd3ce52bcb27f5","tests/macros/mod.rs":"64b0da858096e7cf0f772e66bc1787a867e45897d7677de580c0a1f35c0f6852","tests/regression.rs":"e9565ea0efecb4136f099164ffcfa26e1996b0a27fb9c6659e90ad9bdd42e7b6","tests/regression/issue1108.rs":"f32db35244a674e22ff824ca9e5bbec2184e287b59f022db68c418b5878a2edc","tests/regression/issue1235.rs":"a2266b10c3f7c7af5734817ab0a3e8b309b51e7d177b63f26e67e6b744d280b0","tests/repo/mod.rs":"7d2c93eecb65204c8417db8ebe3e6875a56f1cd6975263ccca9440cf43832266","tests/repo/progress.rs":"c08d0314a7f3ecf760d471f27da3cd2a500aeb9f1c8331bffb2aa648f9fabf3f","tests/test_asyncness.rs":"8982f6bc4e36510f924e288247473403e72697389ce9dda4e4b5ab0a8e49259f","tests/test_attribute.rs":"b35550a43bbd187bb330997ba36f90c65d8fc489135b1d32ef4547f145cb7612","tests/test_derive_input.rs":"99c4e6e45e3322ea9e269b309059c8a00fda1dcc03aed41f6e7d8c7e0a72fa2b","tests/test_expr.rs":"08129117bd4f6b8c2faea8e241e62ec8428c5286b20b5bb1583422f2b661d2f4","tests/test_generics.rs":"2fcc8575d695b568f3724b3b33d853b8fa6d9864eb816b5e3ca82420682e6155","tests/test_grouping.rs":"1bd63c8ca0b90bd493fb3f927079ab9ddf74d2a78da82db2f638e652d22305d5","tests/test_ident.rs":"d5850e817720e774cd397a46dbc5298c57933823c18e20805e84503fc9387e8f","tests/test_item.rs":"1b8412a5581adf93eaa215785a592f139af8511c954dee283d52dff2718a6cc2","tests/test_iterators.rs":"e7bd4e0743b852b9e0286489aee24fb08d48559bfa20ae55f3c7552ab69a5ba1","tests/test_lit.rs":"01b0acfe03cff16e7c1a45ceb7f4b637e5cbc6145840886ba981b7ed8e83691c","tests/test_meta.rs":"4ae570333f849ed8edec5dd957111a2deb721ede360f1e1ffeeab75380578ad4","tests/test_parse_buffer.rs":"0de6af13ba0345986b18d495063f9b75a1018e8569c34b277f9522c63a6c0941","tests/test_parse_quote.rs":"928176da6ebb449ef01a798f3352c9b181d3077c1266eb008df73876f4013c47","tests/test_parse_stream.rs":"b6b533432173123d6d01d8d2cb33714bc50b30b16ffbb6116f93937221ad4594","tests/test_pat.rs":"f6954a50e62a97ac2bc1ba0cb7a5a1fc53b7b01fb55ffe0176bee3fe1955d460","tests/test_path.rs":"d54350aa91508f8d301f5be3e3a34e03b0615b1a04e8fbbab9840da20161838b","tests/test_precedence.rs":"7e825e3845a96a274d99484f720db7ddf06205ba96cfcbef191749bcbce89620","tests/test_receiver.rs":"af64117acd66fbf42edc476f731ecd20c88009d9cb641dbd7a1d6384ae99ae73","tests/test_round_trip.rs":"48559ad63116f31fbbfd0d8501c5ace77d47f60a26b70359244bb0988fe65084","tests/test_shebang.rs":"98e8a6690c04e0aad2893b747593620b51836fe704f50f5c6fe352609837138a","tests/test_size.rs":"03efaf829b80b7db1f831474c1d3ce268914fc499d0e2a7eea03cad04a482974","tests/test_stmt.rs":"bbc305ea888254798b6faf285187d8bc7a955e4402d9a497d4b9d361e0436691","tests/test_token_trees.rs":"d012da9c3c861073711b006bf6ffdc073821fb9fb0a08733628cdae57124d1f5","tests/test_ty.rs":"aa14822fe99f3ac22eb056f5488a8110dfdb922e0008ea82b73bca8e1a613cd5","tests/test_unparenthesize.rs":"6c723cd6332b7d8be703fab20f085cef7716692eb07b1d75f2e590935656641d","tests/test_visibility.rs":"7bd239aef6f6d8173462dbd869064f3fdb9ba71644ac1f62c5d2fbb2568fb986","tests/zzz_stable.rs":"2a862e59cb446235ed99aec0e6ada8e16d3ecc30229b29d825b7c0bbc2602989"},"package":"578e081a14e0cefc3279b0472138c513f37b41a08d5a3cca9b6e4e8ceb6cd525"} \ No newline at end of file +{"files":{"Cargo.toml":"e40f1d466d7265b13e659ebfd02c964e258f5da673b7c7b43c1eec677842bcce","LICENSE-APACHE":"62c7a1e35f56406896d7aa7ca52d0cc0d272ac022b5d2796e7d6905db8a3636a","LICENSE-MIT":"23f18e03dc49df91622fe2a76176497404e46ced8a715d9d2b67a7446571cca3","README.md":"ae6deb98ea51df4829c0327139a555cc115c6bcf6fb459db0ef0d6a96c4566ec","benches/file.rs":"0a0527c78d849148cbb6118b4d36f72da7d4add865ba1a410e0a1be9e8dbfe0e","benches/rust.rs":"a4b2ac626d36df1e344b1389384a559fb47da291b8ad3aa964d59d93279eebb1","src/attr.rs":"94089e45d40b1b4610e3167c0715c9075bcfc87e74cb7e306cbb0635786ea9b9","src/bigint.rs":"0299829b2f7a1a798fe2f7bc1680e4a10f9b6f4a852d09af4da2deab466c4242","src/buffer.rs":"00f28570908d311f3f568f3b116dc4f6aa3da556eb0bd5af8d6771f3301ab060","src/classify.rs":"00312dc6d51f634530f06b44365365a2588a3f6f40740224f64d0cde94839b5b","src/custom_keyword.rs":"322114e36ae43a2f8605506fb4568efdbc2986853e2fee74bd10a4ca0fb60c69","src/custom_punctuation.rs":"2ae2339c29b1aff3ab16157d51a3a07bfca594aa38586981534fe07a62cdd9d1","src/data.rs":"6f20b5ebbac7c3e9389cb0b5b0637f34d3ab721b6d6707b0eed274024ac78675","src/derive.rs":"f54f8cf9386a2d45186ff3c86ade5dae59e0e337b0198532449190ae8520cff8","src/discouraged.rs":"88b38a75d074d3f0b4186f2b4988844e8284a0c9d279d784327c6b595b9e33ea","src/drops.rs":"013385f1dd95663f1afab41abc1e2eea04181998644828935ca564c74d6462ae","src/error.rs":"3b03fd75eee8b0bb646eaf20f7e287345bdc7515ad5286024a2dd1e53c1e7bf2","src/export.rs":"b260cc49da1da3489e7755832bc8015cfad79e84f6c74e237f65ae25a2385e56","src/expr.rs":"115679336541d15d01f5d9c3a37523c0bea8bdfab1f789b464b8e31d6a710668","src/ext.rs":"ed143b029af286e62ceb4310286a4ce894792dd588465face042b4199b39d329","src/file.rs":"39d4ed9c56a7dc0d83259843732c434cd187248a4cde3dba4a98c3b92df6d08f","src/fixup.rs":"b312a6a527f81df17a94cb9f08def820584ca76cbef07893bbed492f2f0506af","src/gen/clone.rs":"c8d65438186665ed59084dbf1d6e5d78c1a4a88d515eba605c2a6fe2f6dfc293","src/gen/debug.rs":"d670460305ea3088211008e16590d0830a32c9520d5b22749f8c1d94eaae63d3","src/gen/eq.rs":"584ba47856dbb702ccf973e10a3c178146770cde542ffad5c1bc2b04b2aa3c40","src/gen/fold.rs":"e8ba8fe047a70a3285d55c6baa146c08be9554c5dbf0f8e6946496607b724f03","src/gen/hash.rs":"4b3f3251698412984b0a1c77b5b5f63eeb27bc783e270272e6f6dcaf83490146","src/gen/visit.rs":"7f80b4e6a7b33558824378fceb9f2e388453dac8b5cdaaa5e7b0faf8bb44bbdb","src/gen/visit_mut.rs":"126c0cede7870202ba4163791fa190bda49764c7f9e0a5983ad9ca49064a2e6d","src/generics.rs":"f532d7e4516c250e3eeda92e98ab2d1af19c9a368850abc8f56c230f1bbe534a","src/group.rs":"ddbff97e41315bdf9dfce215a8c00bb4d532827cf794246afde7308b39dc09ca","src/ident.rs":"d6061030fadae9c7dc847e1ee46178d9657d782aad108c7197e8cafe765b3eaa","src/item.rs":"7867cc00affe8df97d23cb104ce6371ac168ed97443ed99062a920bdd542c9f6","src/lib.rs":"4db838a9d27eda36fbf255a3ee0a0b526fa3357e18b5d03d2e46207876b1b457","src/lifetime.rs":"5787d5a5dc7e5332b03283a25ae0a9e826464242ca2d149b1a19e7cae9cee34d","src/lit.rs":"8fa6fa2d752bd1bf5a94cd5cbf9becbcba37d491876614ce62dba0f8fc745a3d","src/lookahead.rs":"eae3c1855dfd1f9bca5dd4afba07d41b15f8c108017f9eda3dc515567160a2af","src/mac.rs":"fdce8291f71adef3f69975f229156dca2309ca232ed943061afaf96220908ab8","src/macros.rs":"2a6e895dfe1c3a9a7237b5e23358ca5d8967e2beae6d094dda68d3659f9a5c84","src/meta.rs":"969d8ccbdbc6ea2e4928a21831b791c57447b231e1373149e4c63b46f3951801","src/op.rs":"a61757370f802e44efa3c4a1057ae2cd26e64e273f7d76c06d5ffb49602319e2","src/parse.rs":"fc010e04b49c36813ee50f37d974289ae7081b3f96c37051340040f460b375aa","src/parse_macro_input.rs":"e4e22b63d0496d06a4ca17742a22467ed93f08a739081324773828bad63175ee","src/parse_quote.rs":"6f4e5e28622205651bdb23fcf0f0526aef81a7921aaeac2e7a1a1e3b67916fe9","src/pat.rs":"1455a882df5defbf6b774a80f37fe24cf96d5ad1e5584c5204c0c9723883566b","src/path.rs":"1cd7f82a79d0978c3d017e545e7147f50d54a8a8348ed18b21359d5d5c7763aa","src/precedence.rs":"a0c3cd0d873e7c40b609ce3279838deb42cec4004bd4bf53276325428d7584fb","src/print.rs":"22910bf0521ab868ebd7c62601c55912d12cfb400c65723e08e5cfa3a2d111c0","src/punctuated.rs":"6e4a63b736f371bbb4cba83bb674e29aa25f9f214bc10e9acf785673a39d3fc5","src/restriction.rs":"a7152ec5a4ee4f55446019aa2b4d84f2238776f0e6ffc0c22adf3374b517fe56","src/sealed.rs":"6ece3b3dcb30f6bb98b93d83759ca7712ee8592bef9c0511141039c38765db0e","src/span.rs":"0a48e375e5c9768f6f64174a91ba6a255f4b021e2fb3548d8494e617f142601b","src/spanned.rs":"4b9bd65f60ab81922adfd0be8f03b6d50e98da3a5f525f242f9639aec4beac79","src/stmt.rs":"bb4cd196ce23c3fc07fefa47e67a0cd815db4f02ce1192625379d60bd657ffd2","src/thread.rs":"1f1deb1272525ab2af9a36aac4bce8f65b0e315adb1656641fd7075662f49222","src/token.rs":"3625e05bfaaf48adf7685669a59186386862572fa4550c5e94bf9a1febdb069e","src/tt.rs":"a58303a95d08d6bf3f3e09715b9b70a57b91b54774cfc1f00f2848034d2ff5c7","src/ty.rs":"1deae7fdaba88c0300ff562cb844f78742e379ece4254e54986e32721116126f","src/verbatim.rs":"87cbe82a90f48efb57ffd09141042698b3e011a21d0d5412154d80324b0a5ef0","src/whitespace.rs":"9cdcbfe9045b259046329a795bc1105ab5a871471a6d3f7318d275ee53f7a825","tests/common/eq.rs":"c4503ecbb7014eb816f6e6768c8e7853aa3d389419db5cd9ef122707cc168de2","tests/common/mod.rs":"1f43ce65b273172c87640e87ee0775ecb6f19280fbf8f792570d019b61f9a32d","tests/common/parse.rs":"c173bd515ba1d53b3b676161849fa8df0ae3d5592445843cee65b6628b71ac32","tests/debug/gen.rs":"3ca161a049fe72ff73ead99fbfe78335fdb2ac7c41085fe8cd0c9a0b29995151","tests/debug/mod.rs":"b56136586267ae1812a937b69215dd053ada2c21717771d89dcd3ce52bcb27f5","tests/macros/mod.rs":"64b0da858096e7cf0f772e66bc1787a867e45897d7677de580c0a1f35c0f6852","tests/regression.rs":"e9565ea0efecb4136f099164ffcfa26e1996b0a27fb9c6659e90ad9bdd42e7b6","tests/regression/issue1108.rs":"f32db35244a674e22ff824ca9e5bbec2184e287b59f022db68c418b5878a2edc","tests/regression/issue1235.rs":"a2266b10c3f7c7af5734817ab0a3e8b309b51e7d177b63f26e67e6b744d280b0","tests/repo/mod.rs":"7d2c93eecb65204c8417db8ebe3e6875a56f1cd6975263ccca9440cf43832266","tests/repo/progress.rs":"c08d0314a7f3ecf760d471f27da3cd2a500aeb9f1c8331bffb2aa648f9fabf3f","tests/test_asyncness.rs":"8982f6bc4e36510f924e288247473403e72697389ce9dda4e4b5ab0a8e49259f","tests/test_attribute.rs":"b35550a43bbd187bb330997ba36f90c65d8fc489135b1d32ef4547f145cb7612","tests/test_derive_input.rs":"99c4e6e45e3322ea9e269b309059c8a00fda1dcc03aed41f6e7d8c7e0a72fa2b","tests/test_expr.rs":"08129117bd4f6b8c2faea8e241e62ec8428c5286b20b5bb1583422f2b661d2f4","tests/test_generics.rs":"2fcc8575d695b568f3724b3b33d853b8fa6d9864eb816b5e3ca82420682e6155","tests/test_grouping.rs":"1bd63c8ca0b90bd493fb3f927079ab9ddf74d2a78da82db2f638e652d22305d5","tests/test_ident.rs":"d5850e817720e774cd397a46dbc5298c57933823c18e20805e84503fc9387e8f","tests/test_item.rs":"1b8412a5581adf93eaa215785a592f139af8511c954dee283d52dff2718a6cc2","tests/test_iterators.rs":"e7bd4e0743b852b9e0286489aee24fb08d48559bfa20ae55f3c7552ab69a5ba1","tests/test_lit.rs":"01b0acfe03cff16e7c1a45ceb7f4b637e5cbc6145840886ba981b7ed8e83691c","tests/test_meta.rs":"4ae570333f849ed8edec5dd957111a2deb721ede360f1e1ffeeab75380578ad4","tests/test_parse_buffer.rs":"0de6af13ba0345986b18d495063f9b75a1018e8569c34b277f9522c63a6c0941","tests/test_parse_quote.rs":"928176da6ebb449ef01a798f3352c9b181d3077c1266eb008df73876f4013c47","tests/test_parse_stream.rs":"b6b533432173123d6d01d8d2cb33714bc50b30b16ffbb6116f93937221ad4594","tests/test_pat.rs":"f6954a50e62a97ac2bc1ba0cb7a5a1fc53b7b01fb55ffe0176bee3fe1955d460","tests/test_path.rs":"d54350aa91508f8d301f5be3e3a34e03b0615b1a04e8fbbab9840da20161838b","tests/test_precedence.rs":"7e825e3845a96a274d99484f720db7ddf06205ba96cfcbef191749bcbce89620","tests/test_receiver.rs":"af64117acd66fbf42edc476f731ecd20c88009d9cb641dbd7a1d6384ae99ae73","tests/test_round_trip.rs":"48559ad63116f31fbbfd0d8501c5ace77d47f60a26b70359244bb0988fe65084","tests/test_shebang.rs":"98e8a6690c04e0aad2893b747593620b51836fe704f50f5c6fe352609837138a","tests/test_size.rs":"03efaf829b80b7db1f831474c1d3ce268914fc499d0e2a7eea03cad04a482974","tests/test_stmt.rs":"bbc305ea888254798b6faf285187d8bc7a955e4402d9a497d4b9d361e0436691","tests/test_token_trees.rs":"d012da9c3c861073711b006bf6ffdc073821fb9fb0a08733628cdae57124d1f5","tests/test_ty.rs":"aa14822fe99f3ac22eb056f5488a8110dfdb922e0008ea82b73bca8e1a613cd5","tests/test_unparenthesize.rs":"6c723cd6332b7d8be703fab20f085cef7716692eb07b1d75f2e590935656641d","tests/test_visibility.rs":"7bd239aef6f6d8173462dbd869064f3fdb9ba71644ac1f62c5d2fbb2568fb986","tests/zzz_stable.rs":"2a862e59cb446235ed99aec0e6ada8e16d3ecc30229b29d825b7c0bbc2602989"},"package":"9f35bcdf61fd8e7be6caf75f429fdca8beb3ed76584befb503b1569faee373ed"} \ No newline at end of file diff --git a/.cargo-vendor/syn/Cargo.toml b/.cargo-vendor/syn/Cargo.toml index e4b655573a..1e31014faf 100644 --- a/.cargo-vendor/syn/Cargo.toml +++ b/.cargo-vendor/syn/Cargo.toml @@ -13,7 +13,7 @@ edition = "2021" rust-version = "1.61" name = "syn" -version = "2.0.76" +version = "2.0.77" authors = ["David Tolnay "] build = false include = [ diff --git a/.cargo-vendor/syn/src/expr.rs b/.cargo-vendor/syn/src/expr.rs index d5c631ed37..db8d5b9211 100644 --- a/.cargo-vendor/syn/src/expr.rs +++ b/.cargo-vendor/syn/src/expr.rs @@ -647,7 +647,7 @@ ast_struct! { ast_struct! { /// A tuple expression: `(a, b, c, d)`. #[cfg_attr(docsrs, doc(cfg(feature = "full")))] - pub struct ExprTuple #full { + pub struct ExprTuple { pub attrs: Vec, pub paren_token: token::Paren, pub elems: Punctuated, @@ -1111,13 +1111,13 @@ pub(crate) mod parsing { use crate::expr::{ Arm, ExprArray, ExprAssign, ExprAsync, ExprAwait, ExprBlock, ExprBreak, ExprClosure, ExprConst, ExprContinue, ExprForLoop, ExprIf, ExprInfer, ExprLet, ExprLoop, ExprMatch, - ExprRange, ExprRepeat, ExprReturn, ExprTry, ExprTryBlock, ExprTuple, ExprUnsafe, ExprWhile, - ExprYield, Label, RangeLimits, + ExprRange, ExprRepeat, ExprReturn, ExprTry, ExprTryBlock, ExprUnsafe, ExprWhile, ExprYield, + Label, RangeLimits, }; use crate::expr::{ Expr, ExprBinary, ExprCall, ExprCast, ExprField, ExprGroup, ExprIndex, ExprLit, ExprMacro, - ExprMethodCall, ExprParen, ExprPath, ExprReference, ExprStruct, ExprUnary, FieldValue, - Index, Member, + ExprMethodCall, ExprParen, ExprPath, ExprReference, ExprStruct, ExprTuple, ExprUnary, + FieldValue, Index, Member, }; #[cfg(feature = "full")] use crate::ext::IdentExt as _; @@ -1807,7 +1807,7 @@ pub(crate) mod parsing { } else if input.peek(Lit) { input.parse().map(Expr::Lit) } else if input.peek(token::Paren) { - input.call(expr_paren).map(Expr::Paren) + paren_or_tuple(input) } else if input.peek(Ident) || input.peek(Token![::]) || input.peek(Token![<]) @@ -1911,7 +1911,6 @@ pub(crate) mod parsing { } } - #[cfg(feature = "full")] fn paren_or_tuple(input: ParseStream) -> Result { let content; let paren_token = parenthesized!(content in input); @@ -2103,19 +2102,15 @@ pub(crate) mod parsing { #[cfg_attr(docsrs, doc(cfg(feature = "parsing")))] impl Parse for ExprParen { fn parse(input: ParseStream) -> Result { - expr_paren(input) + let content; + Ok(ExprParen { + attrs: Vec::new(), + paren_token: parenthesized!(content in input), + expr: content.parse()?, + }) } } - fn expr_paren(input: ParseStream) -> Result { - let content; - Ok(ExprParen { - attrs: Vec::new(), - paren_token: parenthesized!(content in input), - expr: content.parse()?, - }) - } - #[cfg(feature = "full")] #[cfg_attr(docsrs, doc(cfg(feature = "parsing")))] impl Parse for ExprLet { @@ -3000,13 +2995,13 @@ pub(crate) mod printing { use crate::expr::{ Arm, ExprArray, ExprAssign, ExprAsync, ExprAwait, ExprBlock, ExprBreak, ExprClosure, ExprConst, ExprContinue, ExprForLoop, ExprIf, ExprInfer, ExprLet, ExprLoop, ExprMatch, - ExprRange, ExprRepeat, ExprReturn, ExprTry, ExprTryBlock, ExprTuple, ExprUnsafe, ExprWhile, - ExprYield, Label, RangeLimits, + ExprRange, ExprRepeat, ExprReturn, ExprTry, ExprTryBlock, ExprUnsafe, ExprWhile, ExprYield, + Label, RangeLimits, }; use crate::expr::{ Expr, ExprBinary, ExprCall, ExprCast, ExprField, ExprGroup, ExprIndex, ExprLit, ExprMacro, - ExprMethodCall, ExprParen, ExprPath, ExprReference, ExprStruct, ExprUnary, FieldValue, - Index, Member, + ExprMethodCall, ExprParen, ExprPath, ExprReference, ExprStruct, ExprTuple, ExprUnary, + FieldValue, Index, Member, }; use crate::fixup::FixupContext; use crate::op::BinOp; @@ -3781,7 +3776,6 @@ pub(crate) mod printing { } } - #[cfg(feature = "full")] #[cfg_attr(docsrs, doc(cfg(feature = "printing")))] impl ToTokens for ExprTuple { fn to_tokens(&self, tokens: &mut TokenStream) { diff --git a/.cargo-vendor/syn/src/gen/clone.rs b/.cargo-vendor/syn/src/gen/clone.rs index de8d574516..9757561395 100644 --- a/.cargo-vendor/syn/src/gen/clone.rs +++ b/.cargo-vendor/syn/src/gen/clone.rs @@ -280,7 +280,6 @@ impl Clone for crate::Expr { crate::Expr::Try(v0) => crate::Expr::Try(v0.clone()), #[cfg(feature = "full")] crate::Expr::TryBlock(v0) => crate::Expr::TryBlock(v0.clone()), - #[cfg(feature = "full")] crate::Expr::Tuple(v0) => crate::Expr::Tuple(v0.clone()), crate::Expr::Unary(v0) => crate::Expr::Unary(v0.clone()), #[cfg(feature = "full")] @@ -695,7 +694,7 @@ impl Clone for crate::ExprTryBlock { } } } -#[cfg(feature = "full")] +#[cfg(any(feature = "derive", feature = "full"))] #[cfg_attr(docsrs, doc(cfg(feature = "clone-impls")))] impl Clone for crate::ExprTuple { fn clone(&self) -> Self { diff --git a/.cargo-vendor/syn/src/gen/debug.rs b/.cargo-vendor/syn/src/gen/debug.rs index 9232ece8ac..fe1179c9ff 100644 --- a/.cargo-vendor/syn/src/gen/debug.rs +++ b/.cargo-vendor/syn/src/gen/debug.rs @@ -451,7 +451,6 @@ impl Debug for crate::Expr { crate::Expr::Try(v0) => v0.debug(formatter, "Try"), #[cfg(feature = "full")] crate::Expr::TryBlock(v0) => v0.debug(formatter, "TryBlock"), - #[cfg(feature = "full")] crate::Expr::Tuple(v0) => v0.debug(formatter, "Tuple"), crate::Expr::Unary(v0) => v0.debug(formatter, "Unary"), #[cfg(feature = "full")] @@ -1068,14 +1067,14 @@ impl crate::ExprTryBlock { formatter.finish() } } -#[cfg(feature = "full")] +#[cfg(any(feature = "derive", feature = "full"))] #[cfg_attr(docsrs, doc(cfg(feature = "extra-traits")))] impl Debug for crate::ExprTuple { fn fmt(&self, formatter: &mut fmt::Formatter) -> fmt::Result { self.debug(formatter, "ExprTuple") } } -#[cfg(feature = "full")] +#[cfg(any(feature = "derive", feature = "full"))] impl crate::ExprTuple { fn debug(&self, formatter: &mut fmt::Formatter, name: &str) -> fmt::Result { let mut formatter = formatter.debug_struct(name); diff --git a/.cargo-vendor/syn/src/gen/eq.rs b/.cargo-vendor/syn/src/gen/eq.rs index bbcca47281..936293c39a 100644 --- a/.cargo-vendor/syn/src/gen/eq.rs +++ b/.cargo-vendor/syn/src/gen/eq.rs @@ -311,7 +311,6 @@ impl PartialEq for crate::Expr { (crate::Expr::TryBlock(self0), crate::Expr::TryBlock(other0)) => { self0 == other0 } - #[cfg(feature = "full")] (crate::Expr::Tuple(self0), crate::Expr::Tuple(other0)) => self0 == other0, (crate::Expr::Unary(self0), crate::Expr::Unary(other0)) => self0 == other0, #[cfg(feature = "full")] @@ -674,10 +673,10 @@ impl PartialEq for crate::ExprTryBlock { self.attrs == other.attrs && self.block == other.block } } -#[cfg(feature = "full")] +#[cfg(any(feature = "derive", feature = "full"))] #[cfg_attr(docsrs, doc(cfg(feature = "extra-traits")))] impl Eq for crate::ExprTuple {} -#[cfg(feature = "full")] +#[cfg(any(feature = "derive", feature = "full"))] #[cfg_attr(docsrs, doc(cfg(feature = "extra-traits")))] impl PartialEq for crate::ExprTuple { fn eq(&self, other: &Self) -> bool { diff --git a/.cargo-vendor/syn/src/gen/fold.rs b/.cargo-vendor/syn/src/gen/fold.rs index e5662f5834..c3de096682 100644 --- a/.cargo-vendor/syn/src/gen/fold.rs +++ b/.cargo-vendor/syn/src/gen/fold.rs @@ -299,8 +299,8 @@ pub trait Fold { fn fold_expr_try_block(&mut self, i: crate::ExprTryBlock) -> crate::ExprTryBlock { fold_expr_try_block(self, i) } - #[cfg(feature = "full")] - #[cfg_attr(docsrs, doc(cfg(feature = "full")))] + #[cfg(any(feature = "derive", feature = "full"))] + #[cfg_attr(docsrs, doc(cfg(any(feature = "derive", feature = "full"))))] fn fold_expr_tuple(&mut self, i: crate::ExprTuple) -> crate::ExprTuple { fold_expr_tuple(self, i) } @@ -1358,7 +1358,7 @@ where crate::Expr::TryBlock(full!(f.fold_expr_try_block(_binding_0))) } crate::Expr::Tuple(_binding_0) => { - crate::Expr::Tuple(full!(f.fold_expr_tuple(_binding_0))) + crate::Expr::Tuple(f.fold_expr_tuple(_binding_0)) } crate::Expr::Unary(_binding_0) => { crate::Expr::Unary(f.fold_expr_unary(_binding_0)) @@ -1819,8 +1819,8 @@ where block: f.fold_block(node.block), } } -#[cfg(feature = "full")] -#[cfg_attr(docsrs, doc(cfg(feature = "full")))] +#[cfg(any(feature = "derive", feature = "full"))] +#[cfg_attr(docsrs, doc(cfg(any(feature = "derive", feature = "full"))))] pub fn fold_expr_tuple(f: &mut F, node: crate::ExprTuple) -> crate::ExprTuple where F: Fold + ?Sized, diff --git a/.cargo-vendor/syn/src/gen/hash.rs b/.cargo-vendor/syn/src/gen/hash.rs index 02097b9d6e..4dedba4a1f 100644 --- a/.cargo-vendor/syn/src/gen/hash.rs +++ b/.cargo-vendor/syn/src/gen/hash.rs @@ -484,7 +484,6 @@ impl Hash for crate::Expr { state.write_u8(32u8); v0.hash(state); } - #[cfg(feature = "full")] crate::Expr::Tuple(v0) => { state.write_u8(33u8); v0.hash(state); @@ -916,7 +915,7 @@ impl Hash for crate::ExprTryBlock { self.block.hash(state); } } -#[cfg(feature = "full")] +#[cfg(any(feature = "derive", feature = "full"))] #[cfg_attr(docsrs, doc(cfg(feature = "extra-traits")))] impl Hash for crate::ExprTuple { fn hash(&self, state: &mut H) diff --git a/.cargo-vendor/syn/src/gen/visit.rs b/.cargo-vendor/syn/src/gen/visit.rs index b61997f177..6c96a3f31d 100644 --- a/.cargo-vendor/syn/src/gen/visit.rs +++ b/.cargo-vendor/syn/src/gen/visit.rs @@ -294,8 +294,8 @@ pub trait Visit<'ast> { fn visit_expr_try_block(&mut self, i: &'ast crate::ExprTryBlock) { visit_expr_try_block(self, i); } - #[cfg(feature = "full")] - #[cfg_attr(docsrs, doc(cfg(feature = "full")))] + #[cfg(any(feature = "derive", feature = "full"))] + #[cfg_attr(docsrs, doc(cfg(any(feature = "derive", feature = "full"))))] fn visit_expr_tuple(&mut self, i: &'ast crate::ExprTuple) { visit_expr_tuple(self, i); } @@ -1374,7 +1374,7 @@ where full!(v.visit_expr_try_block(_binding_0)); } crate::Expr::Tuple(_binding_0) => { - full!(v.visit_expr_tuple(_binding_0)); + v.visit_expr_tuple(_binding_0); } crate::Expr::Unary(_binding_0) => { v.visit_expr_unary(_binding_0); @@ -1874,8 +1874,8 @@ where skip!(node.try_token); v.visit_block(&node.block); } -#[cfg(feature = "full")] -#[cfg_attr(docsrs, doc(cfg(feature = "full")))] +#[cfg(any(feature = "derive", feature = "full"))] +#[cfg_attr(docsrs, doc(cfg(any(feature = "derive", feature = "full"))))] pub fn visit_expr_tuple<'ast, V>(v: &mut V, node: &'ast crate::ExprTuple) where V: Visit<'ast> + ?Sized, diff --git a/.cargo-vendor/syn/src/gen/visit_mut.rs b/.cargo-vendor/syn/src/gen/visit_mut.rs index 9d457f1640..b70a4227ec 100644 --- a/.cargo-vendor/syn/src/gen/visit_mut.rs +++ b/.cargo-vendor/syn/src/gen/visit_mut.rs @@ -295,8 +295,8 @@ pub trait VisitMut { fn visit_expr_try_block_mut(&mut self, i: &mut crate::ExprTryBlock) { visit_expr_try_block_mut(self, i); } - #[cfg(feature = "full")] - #[cfg_attr(docsrs, doc(cfg(feature = "full")))] + #[cfg(any(feature = "derive", feature = "full"))] + #[cfg_attr(docsrs, doc(cfg(any(feature = "derive", feature = "full"))))] fn visit_expr_tuple_mut(&mut self, i: &mut crate::ExprTuple) { visit_expr_tuple_mut(self, i); } @@ -1375,7 +1375,7 @@ where full!(v.visit_expr_try_block_mut(_binding_0)); } crate::Expr::Tuple(_binding_0) => { - full!(v.visit_expr_tuple_mut(_binding_0)); + v.visit_expr_tuple_mut(_binding_0); } crate::Expr::Unary(_binding_0) => { v.visit_expr_unary_mut(_binding_0); @@ -1875,8 +1875,8 @@ where skip!(node.try_token); v.visit_block_mut(&mut node.block); } -#[cfg(feature = "full")] -#[cfg_attr(docsrs, doc(cfg(feature = "full")))] +#[cfg(any(feature = "derive", feature = "full"))] +#[cfg_attr(docsrs, doc(cfg(any(feature = "derive", feature = "full"))))] pub fn visit_expr_tuple_mut(v: &mut V, node: &mut crate::ExprTuple) where V: VisitMut + ?Sized, diff --git a/.cargo-vendor/syn/src/lib.rs b/.cargo-vendor/syn/src/lib.rs index 0862f53826..0da4204426 100644 --- a/.cargo-vendor/syn/src/lib.rs +++ b/.cargo-vendor/syn/src/lib.rs @@ -249,7 +249,7 @@ //! dynamic library libproc_macro from rustc toolchain. // Syn types in rustdoc of other crates get linked to here. -#![doc(html_root_url = "https://docs.rs/syn/2.0.76")] +#![doc(html_root_url = "https://docs.rs/syn/2.0.77")] #![cfg_attr(docsrs, feature(doc_cfg))] #![deny(unsafe_op_in_unsafe_fn)] #![allow(non_camel_case_types)] diff --git a/.cargo-vendor/time-core/.cargo-checksum.json b/.cargo-vendor/time-core/.cargo-checksum.json index 978746f2d3..0af183873c 100644 --- a/.cargo-vendor/time-core/.cargo-checksum.json +++ b/.cargo-vendor/time-core/.cargo-checksum.json @@ -1 +1 @@ -{"files":{"Cargo.toml":"4864a287e62e004c753b3b2093a90b29d26d21055f2ab5f41d0a07c8455ed956","LICENSE-Apache":"b8929fea28678da67251fb2daf9438f67503814211051861612441806d8edb05","LICENSE-MIT":"04620bf27e4a643dd47bf27652320c205acdb776c1f9f24bb8c3bfaba10804c5","src/convert.rs":"59566933f2977d62abbfe39b20be16a85df00db8627211471ccfe182dbbe684c","src/lib.rs":"18020c914b1cd561465e624ef3ea3eef980bd82bc93847e2543bce12da28b043","src/util.rs":"52c1fbf68b71c3582caf0d9a8255378c6c14a737e2df8d7e6d6603b0eb12ca06"},"package":null} \ No newline at end of file +{"files":{"Cargo.toml":"05b1c2666c8d5106fdf458830d4825789ff72d0aaa19605f3edaf8a9b1910ac3","LICENSE-Apache":"b8929fea28678da67251fb2daf9438f67503814211051861612441806d8edb05","LICENSE-MIT":"04620bf27e4a643dd47bf27652320c205acdb776c1f9f24bb8c3bfaba10804c5","src/convert.rs":"59566933f2977d62abbfe39b20be16a85df00db8627211471ccfe182dbbe684c","src/lib.rs":"18020c914b1cd561465e624ef3ea3eef980bd82bc93847e2543bce12da28b043","src/util.rs":"52c1fbf68b71c3582caf0d9a8255378c6c14a737e2df8d7e6d6603b0eb12ca06"},"package":null} \ No newline at end of file diff --git a/.cargo-vendor/time-core/Cargo.toml b/.cargo-vendor/time-core/Cargo.toml index 97cb2fbb0e..809fe017d3 100644 --- a/.cargo-vendor/time-core/Cargo.toml +++ b/.cargo-vendor/time-core/Cargo.toml @@ -9,11 +9,6 @@ # will likely look very different (and much more reasonable). # See Cargo.toml.orig for the original contents. -bin = [] -example = [] -test = [] -bench = [] - [package] edition = "2021" rust-version = "1.65.0" diff --git a/.cargo-vendor/time-macros/.cargo-checksum.json b/.cargo-vendor/time-macros/.cargo-checksum.json index e72d749c10..a0234f9af2 100644 --- a/.cargo-vendor/time-macros/.cargo-checksum.json +++ b/.cargo-vendor/time-macros/.cargo-checksum.json @@ -1 +1 @@ -{"files":{"Cargo.toml":"d3567938ef45dc9889ce80710830b39b1c2ddee3d538fac46d4024ca9cf555a5","LICENSE-Apache":"b8929fea28678da67251fb2daf9438f67503814211051861612441806d8edb05","LICENSE-MIT":"04620bf27e4a643dd47bf27652320c205acdb776c1f9f24bb8c3bfaba10804c5","src/date.rs":"ffcd3d0998ec67abb43a3f8eccc6104172f5061b855312b89d53bb82fece2460","src/datetime.rs":"5c7f6e07dc2f0dcfcd86216664df53bc008dbc86f346df57a9ff57f52fe43bc6","src/error.rs":"b3dea92631092068dd73e57e1cbf548f7ae85762826dcdea7fd6454bf357a50a","src/format_description/ast.rs":"8ba87e3249766b89c42b040f623d3134aeec46b78208fdfee825ed0eeeb4591a","src/format_description/format_item.rs":"03ff10699383e5ad08fe690199d45288f13363337abbc811a70b03a8b1703ab1","src/format_description/lexer.rs":"e7db7b6431f00c81b8d15a162088a1622ecd65bfb58d4e642c3c93a8dd5ae4ad","src/format_description/mod.rs":"f48c0ff590bc74529f06a98f60a6af5814bc30d1456bf0b81ac334c0b3f41bba","src/format_description/public/component.rs":"e2c2c8a189e2eb9f9354ff1d9d8edeafa34303e91dc58457df373e7e61c38b78","src/format_description/public/mod.rs":"5260592b310ea9e30808d30c92ea94c7bf1bdb171250a1342279e927d2528d73","src/format_description/public/modifier.rs":"37661e1f7cd9fd11a82f5a1ce6d5971686afa91e6feebc7b9d32df297e8b667f","src/helpers/mod.rs":"a8f8ed59a72b239d7a530357d212873f2e75ea924ec19a6d5d6e24a2baa8100c","src/helpers/string.rs":"3af2d0c701ca978c705922a272e76506dbdf0f376d44ed9ae7283086c67852ba","src/lib.rs":"200678edc14d5920abc0516717b8e010667e58da8bdc65c1cb583fdde0353089","src/offset.rs":"4b9c001a954c1f121a572f5675073f7a4e46d00cc9eb77736bfea2df94ffd05b","src/quote.rs":"634a12b95236e4ab2b8ab70a1a4a2629113c3ce3cf6defefc7ffeb81544c1d89","src/serde_format_description.rs":"db5fb2dc94e01c5114cab3484e68334516d53c4642f31dae0d66f1183253a17c","src/time.rs":"d762e8f22f749d9546d5d2a78b8a0380510be27b4cd3fed375695d7982d8396e","src/to_tokens.rs":"6636ea489c7484bad9b39f72d6956a04c95ce82d8462b12079cc03db778fd263"},"package":null} \ No newline at end of file +{"files":{"Cargo.toml":"ab6408bd927cbbc780ab4e04dc4819d8e0b267809cd4f0aa43bac2db7d4b3650","LICENSE-Apache":"b8929fea28678da67251fb2daf9438f67503814211051861612441806d8edb05","LICENSE-MIT":"04620bf27e4a643dd47bf27652320c205acdb776c1f9f24bb8c3bfaba10804c5","src/date.rs":"ffcd3d0998ec67abb43a3f8eccc6104172f5061b855312b89d53bb82fece2460","src/datetime.rs":"5c7f6e07dc2f0dcfcd86216664df53bc008dbc86f346df57a9ff57f52fe43bc6","src/error.rs":"b3dea92631092068dd73e57e1cbf548f7ae85762826dcdea7fd6454bf357a50a","src/format_description/ast.rs":"8ba87e3249766b89c42b040f623d3134aeec46b78208fdfee825ed0eeeb4591a","src/format_description/format_item.rs":"03ff10699383e5ad08fe690199d45288f13363337abbc811a70b03a8b1703ab1","src/format_description/lexer.rs":"e7db7b6431f00c81b8d15a162088a1622ecd65bfb58d4e642c3c93a8dd5ae4ad","src/format_description/mod.rs":"f48c0ff590bc74529f06a98f60a6af5814bc30d1456bf0b81ac334c0b3f41bba","src/format_description/public/component.rs":"e2c2c8a189e2eb9f9354ff1d9d8edeafa34303e91dc58457df373e7e61c38b78","src/format_description/public/mod.rs":"5260592b310ea9e30808d30c92ea94c7bf1bdb171250a1342279e927d2528d73","src/format_description/public/modifier.rs":"37661e1f7cd9fd11a82f5a1ce6d5971686afa91e6feebc7b9d32df297e8b667f","src/helpers/mod.rs":"a8f8ed59a72b239d7a530357d212873f2e75ea924ec19a6d5d6e24a2baa8100c","src/helpers/string.rs":"3af2d0c701ca978c705922a272e76506dbdf0f376d44ed9ae7283086c67852ba","src/lib.rs":"200678edc14d5920abc0516717b8e010667e58da8bdc65c1cb583fdde0353089","src/offset.rs":"4b9c001a954c1f121a572f5675073f7a4e46d00cc9eb77736bfea2df94ffd05b","src/quote.rs":"634a12b95236e4ab2b8ab70a1a4a2629113c3ce3cf6defefc7ffeb81544c1d89","src/serde_format_description.rs":"db5fb2dc94e01c5114cab3484e68334516d53c4642f31dae0d66f1183253a17c","src/time.rs":"d762e8f22f749d9546d5d2a78b8a0380510be27b4cd3fed375695d7982d8396e","src/to_tokens.rs":"6636ea489c7484bad9b39f72d6956a04c95ce82d8462b12079cc03db778fd263"},"package":null} \ No newline at end of file diff --git a/.cargo-vendor/time-macros/Cargo.toml b/.cargo-vendor/time-macros/Cargo.toml index 7507d575ad..8af9bcd610 100644 --- a/.cargo-vendor/time-macros/Cargo.toml +++ b/.cargo-vendor/time-macros/Cargo.toml @@ -9,11 +9,6 @@ # will likely look very different (and much more reasonable). # See Cargo.toml.orig for the original contents. -bin = [] -example = [] -test = [] -bench = [] - [package] edition = "2021" rust-version = "1.65.0" diff --git a/.cargo-vendor/time/.cargo-checksum.json b/.cargo-vendor/time/.cargo-checksum.json index 850cb12017..78584d3b7b 100644 --- a/.cargo-vendor/time/.cargo-checksum.json +++ b/.cargo-vendor/time/.cargo-checksum.json @@ -1 +1 @@ -{"files":{"Cargo.toml":"2be457549b9b541c639ae5da24032e2e69570647ce70bf761695e83927fc2b14","LICENSE-Apache":"b8929fea28678da67251fb2daf9438f67503814211051861612441806d8edb05","LICENSE-MIT":"04620bf27e4a643dd47bf27652320c205acdb776c1f9f24bb8c3bfaba10804c5","src/date.rs":"5c0ae4a98530dd954c19b972df517b80bd6f35c73747e422b55ea0162d4c5fcf","src/date_time.rs":"37c97a93ca15be9b9bbd64b497429c430e91b6bcf51a50f571f79646b4348707","src/duration.rs":"469e62e0b545f45b99c37a7033c269474a932b52a2dc9399d62bf7877be1a8ce","src/error/component_range.rs":"26a1aa4ea2d0f9887efcbe9584d5aa14b1e5d37525a52dc9f18e1e282599625d","src/error/conversion_range.rs":"972abb765370070de01e2fc2e1bb1e80808a069e6213577d7beaca02e1d707c3","src/error/different_variant.rs":"107bef7b3addd7108b36a2da8389f611d4482f34a5b63429841141e05c8cb30c","src/error/format.rs":"d87846c2ac62dec421402ea21e5d2a8d73add6658df4ac914067a4b43cb0ef20","src/error/indeterminate_offset.rs":"1f52f9ea107847fa781399cfcc8046451d70155fb497486c80b2138f82782941","src/error/invalid_format_description.rs":"cf617348b55d9c3273060fa2d99bd4eda215452270025f2b6caef6ef9f387af5","src/error/invalid_variant.rs":"b653a3e6e902f06cb9f2e0366c4da84b92e8bdb03164c2f8cb15fe66415706e4","src/error/mod.rs":"15fb848b1919d9cfb50fb9091abfcea6a8c7db5a2fcd6cb8f32c4af5f1ea4464","src/error/parse.rs":"3bdc8201a14469d2cc7a12a295058569098f9cfc9bd1e8fc9f526ada8298e4f8","src/error/parse_from_description.rs":"990359eb5fcb64c1ee363b044147b7330a92a4cb7373dc2f17f6fd3bcc6411a0","src/error/try_from_parsed.rs":"8c227be52653a1d33af01a8024c0fc56f1f9803f08ef01487a7eaa5833adbb57","src/ext.rs":"f31cdcf38c23a0111524ae431420f299d4d4735d99fc9a873d3472a3699de7ef","src/format_description/borrowed_format_item.rs":"afab66e65a84895751d3557fc5b8a3a5e63f9c483a6a534aa4f86fd2a5145f0b","src/format_description/component.rs":"289469371588f24de6c7afdd40e7ce65f6b08c3e05434900eafdca7dde59ab07","src/format_description/mod.rs":"955a227e9bb13e3085a43457bf8028085db92c0266b6573ddf1e12df3b937c0f","src/format_description/modifier.rs":"5c6330b3557a156d2acfd4eb454783a41a6edf62c5046e2ca60dc060caf31451","src/format_description/owned_format_item.rs":"419f5354bf504562c9225dfe90b61eee9bc959211a86a327197b4f54283da775","src/format_description/parse/ast.rs":"c20fedf0314a2ede5e3ee66024534ca8a65a2b623959386872250e19d5d43b6e","src/format_description/parse/format_item.rs":"4639e23fb86dbbef6d764e8279cc43dd5f6e09d8b14b277e6f6b9bce81f5c3ff","src/format_description/parse/lexer.rs":"c10105640a618e1e850eb6e4fd888c47d881b3f85bde691fdf204199a693e127","src/format_description/parse/mod.rs":"f3b145333cb9ea6f56889698a1569b669c680c684aee3b117ff43065959db2e2","src/format_description/well_known/iso8601.rs":"8313905039a637d4d132f8318a59c06246e7b61550b4e4bc7d129232ac022e43","src/format_description/well_known/iso8601/adt_hack.rs":"59a5182dc200a26654944a64a81488a55c7a387485f219371503a010c751e338","src/format_description/well_known/rfc2822.rs":"36c23394724ae12250d4193cab26887a6ff8f82ca441ea6b0d03c4f1c928b3dd","src/format_description/well_known/rfc3339.rs":"1a6318dffd3ebb6ac7cf96eae3d9b1eb44b1089cf4284fa6a7e935c6fcf1b43c","src/formatting/formattable.rs":"fe75a835d20f144faf8f1297d9b501e72fcce321c7dc1077805e4a2b2f9b9390","src/formatting/iso8601.rs":"3dc83bf234b60e80ab499bf3ec490b2772d69a02b452f93cbc8e843ebf340fc2","src/formatting/mod.rs":"b4f98455609968a28e6479077d01eec60e3331064dbcd453f29c6d5a768d9857","src/instant.rs":"f1724e49b173b16b08818bfd06133ce4f61da7df286ff61982113cc184efe1c0","src/lib.rs":"be86048ca1c4ab497384edd9507b41c5683d946b3149ff978277c1323cbc2889","src/macros.rs":"eb9e02a1f97bb8befab7bc27c937136817e4f65e0b3e040a81394ae938980558","src/month.rs":"91b20ea12b1a36a9ddb828279572c6098b8504a048627088137963a612b572b8","src/offset_date_time.rs":"288d7a34eecbbd9345e13804302bcb55df716fdef0fafe1d2d06e52c0d77829e","src/parsing/combinator/mod.rs":"b342fbd95dd986309d81e8910363920ba6db00958b459f6d97f57da3ae3e550d","src/parsing/combinator/rfc/iso8601.rs":"13289a0d58de273327830a3001167a8964edc5045486301efdf3ddc2e4079c32","src/parsing/combinator/rfc/mod.rs":"f30b75d248f5ae92c27646d504703f5489185afb76c998cc4375437b3d15c822","src/parsing/combinator/rfc/rfc2234.rs":"08e2813c6d40c0dae881875fe0417ae06886c73679256587e33186e46b3c3bae","src/parsing/combinator/rfc/rfc2822.rs":"2aff3a6a2778bc806031cff92ad2f43f0874620b5d484b5b39ee2d2507212f06","src/parsing/component.rs":"09008cf9d08c4b0c3cb051b986291a29e977a780bb1455f9c33e472db983e8da","src/parsing/iso8601.rs":"8dd99317a6fcde7d85f8bf5c492675efde751731b687b0cde0d5653cb129743a","src/parsing/mod.rs":"37082ac824c6c3f4900766a0a3140dc7aa46b3f85cb6098f11da7da333e421b0","src/parsing/parsable.rs":"d1b3c001f57c735af395553d35e76f9342a83da87b5a843d1eb015807a076db9","src/parsing/parsed.rs":"5cafd2220fe325817b8b65729274a0ca7c741f4579d99bc888cb1997436ef127","src/parsing/shim.rs":"46efc374bc3129e28936a850143fff8e42aafe10c69ebbb904195aaeca26adc9","src/primitive_date_time.rs":"ce557a9db6d7ed663ff78d62a60af5ee8a287f04f6fc979e81047c339d50495a","src/quickcheck.rs":"94640161a21319b75c9b31a6bbc6e34a4d573c20606b954db1bd12ddef366af8","src/rand.rs":"889c98938427a4885036673df8fcebd84c7cc20fb4b3ca82c447ff4b977c8a15","src/serde/iso8601.rs":"997bbf4fe4018f8fdc9335ac863b543fb24a58b2dee394615505a24311331516","src/serde/mod.rs":"a575be28adaf89ff5b1476b367e2019ea09d68368f227d211bc6f33f192bc1e3","src/serde/rfc2822.rs":"fe97aa1311037a362eb477fe8c6729b3b85ff2d0afab7148f10f64d109081f90","src/serde/rfc3339.rs":"9835c8b8fb24b53657769b81a71188fe4261e5869917779e1702b3a0aa854654","src/serde/timestamp.rs":"30971ad5d1fef11e396eee48d476b828ed4e99f6eac587383b864dd95c120fe4","src/serde/visitor.rs":"c5293181f337ab09ae98ce4ef41eae558ae5e3b86f961e4a0c9c93cb034647ed","src/sys/local_offset_at/imp.rs":"4b6e57f02566364270ac9b7e1540290a5658a296f7e911f988264d103e420326","src/sys/local_offset_at/mod.rs":"95b042824b414b3021eda2bcf0821afc529bfd8d4cfcad0b893edb197e48461b","src/sys/local_offset_at/unix.rs":"339ab502e121c24c6ea617f444a58fb7e23cf5afd13c5f7a52eda6d69591d580","src/sys/local_offset_at/wasm_js.rs":"e49ef256c874d6b8d15ef264a66c0b837ac42cd0683e38f3f31af2c2e8fca459","src/sys/local_offset_at/windows.rs":"0836e20249421b1f32e77f0ce4be0d3db30be00478f4c56fda9ddbff0bbb0c5d","src/sys/mod.rs":"0a43797e55e986233a71f1cc4b3a21997da42bc15db7d912373296cd535e49bc","src/tests.rs":"38d1f794892e6ab3fece55839a8e4ab6d0d2c325323310eda32144eb7240bf59","src/time.rs":"197c53ef2b49f73c363eabe2332ffd4eaba18f91f2d17070e8d568069a977c64","src/utc_offset.rs":"ce39c34ec5419a1bf51f7b8401e38a4e0daab7e827fe2fd239fae8089a212c7e","src/util.rs":"1fff6c7d712a4d2665cca55db9c142185cc13afa20f925912cb85abbcc366938","src/weekday.rs":"0a9f79b6aef6bb085204216d0be1c7666426c589c3263b63384c4b74e8b54658"},"package":null} \ No newline at end of file +{"files":{"Cargo.toml":"4086be06004a71ea137e23e6f1d94d89ff0890f8ee3120335eb0d6246ca598c0","LICENSE-Apache":"b8929fea28678da67251fb2daf9438f67503814211051861612441806d8edb05","LICENSE-MIT":"04620bf27e4a643dd47bf27652320c205acdb776c1f9f24bb8c3bfaba10804c5","src/date.rs":"5c0ae4a98530dd954c19b972df517b80bd6f35c73747e422b55ea0162d4c5fcf","src/date_time.rs":"37c97a93ca15be9b9bbd64b497429c430e91b6bcf51a50f571f79646b4348707","src/duration.rs":"469e62e0b545f45b99c37a7033c269474a932b52a2dc9399d62bf7877be1a8ce","src/error/component_range.rs":"26a1aa4ea2d0f9887efcbe9584d5aa14b1e5d37525a52dc9f18e1e282599625d","src/error/conversion_range.rs":"972abb765370070de01e2fc2e1bb1e80808a069e6213577d7beaca02e1d707c3","src/error/different_variant.rs":"107bef7b3addd7108b36a2da8389f611d4482f34a5b63429841141e05c8cb30c","src/error/format.rs":"d87846c2ac62dec421402ea21e5d2a8d73add6658df4ac914067a4b43cb0ef20","src/error/indeterminate_offset.rs":"1f52f9ea107847fa781399cfcc8046451d70155fb497486c80b2138f82782941","src/error/invalid_format_description.rs":"cf617348b55d9c3273060fa2d99bd4eda215452270025f2b6caef6ef9f387af5","src/error/invalid_variant.rs":"b653a3e6e902f06cb9f2e0366c4da84b92e8bdb03164c2f8cb15fe66415706e4","src/error/mod.rs":"15fb848b1919d9cfb50fb9091abfcea6a8c7db5a2fcd6cb8f32c4af5f1ea4464","src/error/parse.rs":"3bdc8201a14469d2cc7a12a295058569098f9cfc9bd1e8fc9f526ada8298e4f8","src/error/parse_from_description.rs":"990359eb5fcb64c1ee363b044147b7330a92a4cb7373dc2f17f6fd3bcc6411a0","src/error/try_from_parsed.rs":"8c227be52653a1d33af01a8024c0fc56f1f9803f08ef01487a7eaa5833adbb57","src/ext.rs":"f31cdcf38c23a0111524ae431420f299d4d4735d99fc9a873d3472a3699de7ef","src/format_description/borrowed_format_item.rs":"afab66e65a84895751d3557fc5b8a3a5e63f9c483a6a534aa4f86fd2a5145f0b","src/format_description/component.rs":"289469371588f24de6c7afdd40e7ce65f6b08c3e05434900eafdca7dde59ab07","src/format_description/mod.rs":"955a227e9bb13e3085a43457bf8028085db92c0266b6573ddf1e12df3b937c0f","src/format_description/modifier.rs":"5c6330b3557a156d2acfd4eb454783a41a6edf62c5046e2ca60dc060caf31451","src/format_description/owned_format_item.rs":"419f5354bf504562c9225dfe90b61eee9bc959211a86a327197b4f54283da775","src/format_description/parse/ast.rs":"c20fedf0314a2ede5e3ee66024534ca8a65a2b623959386872250e19d5d43b6e","src/format_description/parse/format_item.rs":"4639e23fb86dbbef6d764e8279cc43dd5f6e09d8b14b277e6f6b9bce81f5c3ff","src/format_description/parse/lexer.rs":"c10105640a618e1e850eb6e4fd888c47d881b3f85bde691fdf204199a693e127","src/format_description/parse/mod.rs":"f3b145333cb9ea6f56889698a1569b669c680c684aee3b117ff43065959db2e2","src/format_description/well_known/iso8601.rs":"8313905039a637d4d132f8318a59c06246e7b61550b4e4bc7d129232ac022e43","src/format_description/well_known/iso8601/adt_hack.rs":"59a5182dc200a26654944a64a81488a55c7a387485f219371503a010c751e338","src/format_description/well_known/rfc2822.rs":"36c23394724ae12250d4193cab26887a6ff8f82ca441ea6b0d03c4f1c928b3dd","src/format_description/well_known/rfc3339.rs":"1a6318dffd3ebb6ac7cf96eae3d9b1eb44b1089cf4284fa6a7e935c6fcf1b43c","src/formatting/formattable.rs":"fe75a835d20f144faf8f1297d9b501e72fcce321c7dc1077805e4a2b2f9b9390","src/formatting/iso8601.rs":"3dc83bf234b60e80ab499bf3ec490b2772d69a02b452f93cbc8e843ebf340fc2","src/formatting/mod.rs":"b4f98455609968a28e6479077d01eec60e3331064dbcd453f29c6d5a768d9857","src/instant.rs":"f1724e49b173b16b08818bfd06133ce4f61da7df286ff61982113cc184efe1c0","src/lib.rs":"be86048ca1c4ab497384edd9507b41c5683d946b3149ff978277c1323cbc2889","src/macros.rs":"eb9e02a1f97bb8befab7bc27c937136817e4f65e0b3e040a81394ae938980558","src/month.rs":"91b20ea12b1a36a9ddb828279572c6098b8504a048627088137963a612b572b8","src/offset_date_time.rs":"288d7a34eecbbd9345e13804302bcb55df716fdef0fafe1d2d06e52c0d77829e","src/parsing/combinator/mod.rs":"b342fbd95dd986309d81e8910363920ba6db00958b459f6d97f57da3ae3e550d","src/parsing/combinator/rfc/iso8601.rs":"13289a0d58de273327830a3001167a8964edc5045486301efdf3ddc2e4079c32","src/parsing/combinator/rfc/mod.rs":"f30b75d248f5ae92c27646d504703f5489185afb76c998cc4375437b3d15c822","src/parsing/combinator/rfc/rfc2234.rs":"08e2813c6d40c0dae881875fe0417ae06886c73679256587e33186e46b3c3bae","src/parsing/combinator/rfc/rfc2822.rs":"2aff3a6a2778bc806031cff92ad2f43f0874620b5d484b5b39ee2d2507212f06","src/parsing/component.rs":"09008cf9d08c4b0c3cb051b986291a29e977a780bb1455f9c33e472db983e8da","src/parsing/iso8601.rs":"8dd99317a6fcde7d85f8bf5c492675efde751731b687b0cde0d5653cb129743a","src/parsing/mod.rs":"37082ac824c6c3f4900766a0a3140dc7aa46b3f85cb6098f11da7da333e421b0","src/parsing/parsable.rs":"d1b3c001f57c735af395553d35e76f9342a83da87b5a843d1eb015807a076db9","src/parsing/parsed.rs":"5cafd2220fe325817b8b65729274a0ca7c741f4579d99bc888cb1997436ef127","src/parsing/shim.rs":"46efc374bc3129e28936a850143fff8e42aafe10c69ebbb904195aaeca26adc9","src/primitive_date_time.rs":"ce557a9db6d7ed663ff78d62a60af5ee8a287f04f6fc979e81047c339d50495a","src/quickcheck.rs":"94640161a21319b75c9b31a6bbc6e34a4d573c20606b954db1bd12ddef366af8","src/rand.rs":"889c98938427a4885036673df8fcebd84c7cc20fb4b3ca82c447ff4b977c8a15","src/serde/iso8601.rs":"997bbf4fe4018f8fdc9335ac863b543fb24a58b2dee394615505a24311331516","src/serde/mod.rs":"a575be28adaf89ff5b1476b367e2019ea09d68368f227d211bc6f33f192bc1e3","src/serde/rfc2822.rs":"fe97aa1311037a362eb477fe8c6729b3b85ff2d0afab7148f10f64d109081f90","src/serde/rfc3339.rs":"9835c8b8fb24b53657769b81a71188fe4261e5869917779e1702b3a0aa854654","src/serde/timestamp.rs":"30971ad5d1fef11e396eee48d476b828ed4e99f6eac587383b864dd95c120fe4","src/serde/visitor.rs":"c5293181f337ab09ae98ce4ef41eae558ae5e3b86f961e4a0c9c93cb034647ed","src/sys/local_offset_at/imp.rs":"4b6e57f02566364270ac9b7e1540290a5658a296f7e911f988264d103e420326","src/sys/local_offset_at/mod.rs":"95b042824b414b3021eda2bcf0821afc529bfd8d4cfcad0b893edb197e48461b","src/sys/local_offset_at/unix.rs":"339ab502e121c24c6ea617f444a58fb7e23cf5afd13c5f7a52eda6d69591d580","src/sys/local_offset_at/wasm_js.rs":"e49ef256c874d6b8d15ef264a66c0b837ac42cd0683e38f3f31af2c2e8fca459","src/sys/local_offset_at/windows.rs":"0836e20249421b1f32e77f0ce4be0d3db30be00478f4c56fda9ddbff0bbb0c5d","src/sys/mod.rs":"0a43797e55e986233a71f1cc4b3a21997da42bc15db7d912373296cd535e49bc","src/tests.rs":"38d1f794892e6ab3fece55839a8e4ab6d0d2c325323310eda32144eb7240bf59","src/time.rs":"197c53ef2b49f73c363eabe2332ffd4eaba18f91f2d17070e8d568069a977c64","src/utc_offset.rs":"ce39c34ec5419a1bf51f7b8401e38a4e0daab7e827fe2fd239fae8089a212c7e","src/util.rs":"1fff6c7d712a4d2665cca55db9c142185cc13afa20f925912cb85abbcc366938","src/weekday.rs":"0a9f79b6aef6bb085204216d0be1c7666426c589c3263b63384c4b74e8b54658"},"package":null} \ No newline at end of file diff --git a/.cargo-vendor/time/Cargo.toml b/.cargo-vendor/time/Cargo.toml index 68fdf8d76f..caaa995f5c 100644 --- a/.cargo-vendor/time/Cargo.toml +++ b/.cargo-vendor/time/Cargo.toml @@ -9,9 +9,6 @@ # will likely look very different (and much more reasonable). # See Cargo.toml.orig for the original contents. -bin = [] -example = [] - [package] edition = "2021" rust-version = "1.65.0" @@ -62,15 +59,6 @@ name = "time" path = "src/lib.rs" bench = false -[[test]] -name = "tests" -path = "../tests/main.rs" - -[[bench]] -name = "benchmarks" -path = "../benchmarks/main.rs" -harness = false - [dependencies.itoa] version = "1.0.1" optional = true diff --git a/Cargo.lock b/Cargo.lock index 050793afcc..1c56183035 100644 --- a/Cargo.lock +++ b/Cargo.lock @@ -86,9 +86,9 @@ dependencies = [ [[package]] name = "anyhow" -version = "1.0.86" +version = "1.0.87" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b3d1d046238990b9cf5bcde22a3fb3584ee5cf65fb2765f454ed428c7a0063da" +checksum = "10f00e1f6e58a40e807377c75c6a7f97bf9044fab57816f2414e6f5f4499d7b8" [[package]] name = "async-stream" @@ -109,7 +109,7 @@ checksum = "16e62a023e7c117e27523144c5d2459f4397fcc3cab0085af8e2224f643a0193" dependencies = [ "proc-macro2", "quote", - "syn 2.0.76", + "syn 2.0.77", ] [[package]] @@ -120,7 +120,7 @@ checksum = "6e0c28dcc82d7c8ead5cb13beb15405b57b8546e93215673ff8ca0349a028107" dependencies = [ "proc-macro2", "quote", - "syn 2.0.76", + "syn 2.0.77", ] [[package]] @@ -255,9 +255,9 @@ dependencies = [ [[package]] name = "capnp-rpc" -version = "0.19.2" +version = "0.19.4" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "13b692f9454566fa16c5897a5d329e77496b6c8012777025f18cc82f7a65617e" +checksum = "04f09758ec79a2825c9bc87cbe1c8ded306c99a83b52cf89577667ebff2d3ff7" dependencies = [ "capnp", "capnp-futures", @@ -325,7 +325,7 @@ dependencies = [ "heck 0.4.1", "proc-macro2", "quote", - "syn 2.0.76", + "syn 2.0.77", ] [[package]] @@ -488,13 +488,13 @@ dependencies = [ [[package]] name = "dashmap" -version = "6.0.1" +version = "6.1.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "804c8821570c3f8b70230c2ba75ffa5c0f9a4189b9a432b6656c536712acae28" +checksum = "5041cc499144891f3790297212f32a74fb938e5136a14943f338ef9e0ae276cf" dependencies = [ "cfg-if", "crossbeam-utils", - "hashbrown 0.14.3", + "hashbrown 0.14.5", "lock_api", "once_cell", "parking_lot_core", @@ -682,7 +682,7 @@ checksum = "87750cf4b7a4c0625b1529e4c543c2182106e4dedc60a2a6455e00d212c489ac" dependencies = [ "proc-macro2", "quote", - "syn 2.0.76", + "syn 2.0.77", ] [[package]] @@ -800,9 +800,9 @@ checksum = "8a9ee70c43aaf417c914396645a0fa852624801b24ebb7ae78fe8272889ac888" [[package]] name = "hashbrown" -version = "0.14.3" +version = "0.14.5" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "290f1a1d9242c78d09ce40a5e87e7554ee637af1351968159f4952f028f75604" +checksum = "e5274423e17b7c9fc20b6e7e208532f9b19825d82dfd615708b70edd83df41f1" [[package]] name = "heck" @@ -951,7 +951,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "168fb715dda47215e360912c096649d23d58bf392ac62f73919e831745e40f26" dependencies = [ "equivalent", - "hashbrown 0.14.3", + "hashbrown 0.14.5", ] [[package]] @@ -1226,7 +1226,7 @@ dependencies = [ "cfg-if", "proc-macro2", "quote", - "syn 2.0.76", + "syn 2.0.77", ] [[package]] @@ -1460,7 +1460,7 @@ checksum = "2f38a4412a78282e09a2cf38d195ea5420d15ba0602cb375210efbc877243965" dependencies = [ "proc-macro2", "quote", - "syn 2.0.76", + "syn 2.0.77", ] [[package]] @@ -1580,7 +1580,7 @@ dependencies = [ "itertools", "proc-macro2", "quote", - "syn 2.0.76", + "syn 2.0.77", ] [[package]] @@ -1741,29 +1741,29 @@ dependencies = [ [[package]] name = "serde" -version = "1.0.209" +version = "1.0.210" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "99fce0ffe7310761ca6bf9faf5115afbc19688edd00171d81b1bb1b116c63e09" +checksum = "c8e3592472072e6e22e0a54d5904d9febf8508f65fb8552499a1abc7d1078c3a" dependencies = [ "serde_derive", ] [[package]] name = "serde_derive" -version = "1.0.209" +version = "1.0.210" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a5831b979fd7b5439637af1752d535ff49f4860c0f341d1baeb6faf0f4242170" +checksum = "243902eda00fad750862fc144cea25caca5e20d615af0a81bee94ca738f1df1f" dependencies = [ "proc-macro2", "quote", - "syn 2.0.76", + "syn 2.0.77", ] [[package]] name = "serde_json" -version = "1.0.127" +version = "1.0.128" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "8043c06d9f82bd7271361ed64f415fe5e12a77fdb52e573e7f06a516dea329ad" +checksum = "6ff5456707a1de34e7e37f2a6fd3d3f808c318259cbd01ab6377795054b483d8" dependencies = [ "itoa", "memchr", @@ -1873,7 +1873,7 @@ dependencies = [ "proc-macro2", "quote", "rustversion", - "syn 2.0.76", + "syn 2.0.77", ] [[package]] @@ -1895,9 +1895,9 @@ dependencies = [ [[package]] name = "syn" -version = "2.0.76" +version = "2.0.77" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "578e081a14e0cefc3279b0472138c513f37b41a08d5a3cca9b6e4e8ceb6cd525" +checksum = "9f35bcdf61fd8e7be6caf75f429fdca8beb3ed76584befb503b1569faee373ed" dependencies = [ "proc-macro2", "quote", @@ -1956,7 +1956,7 @@ checksum = "a4558b58466b9ad7ca0f102865eccc95938dca1a74a856f2b57b6629050da261" dependencies = [ "proc-macro2", "quote", - "syn 2.0.76", + "syn 2.0.77", ] [[package]] @@ -2057,7 +2057,7 @@ checksum = "5f5ae998a069d4b5aba8ee9dad856af7d520c3699e6159b185c2acd48155d39a" dependencies = [ "proc-macro2", "quote", - "syn 2.0.76", + "syn 2.0.77", ] [[package]] @@ -2174,7 +2174,7 @@ checksum = "34704c8d6ebcbc939824180af020566b01a7c01f80641264eba0999f6c2b6be7" dependencies = [ "proc-macro2", "quote", - "syn 2.0.76", + "syn 2.0.77", ] [[package]] @@ -2350,7 +2350,7 @@ checksum = "ee1cd046f83ea2c4e920d6ee9f7c3537ef928d75dce5d84a87c2c5d6b3999a3a" dependencies = [ "proc-macro2", "quote", - "syn 2.0.76", + "syn 2.0.77", ] [[package]] @@ -2423,7 +2423,7 @@ dependencies = [ "once_cell", "proc-macro2", "quote", - "syn 2.0.76", + "syn 2.0.77", "wasm-bindgen-shared", ] @@ -2445,7 +2445,7 @@ checksum = "e94f17b526d0a461a191c78ea52bbce64071ed5c04c9ffe424dcb38f74171bb7" dependencies = [ "proc-macro2", "quote", - "syn 2.0.76", + "syn 2.0.77", "wasm-bindgen-backend", "wasm-bindgen-shared", ] @@ -2672,5 +2672,5 @@ checksum = "fa4f8080344d4671fb4e831a13ad1e68092748387dfc4f55e356242fae12ce3e" dependencies = [ "proc-macro2", "quote", - "syn 2.0.76", + "syn 2.0.77", ] diff --git a/conmon-rs/client/Cargo.toml b/conmon-rs/client/Cargo.toml index 40fb9f980f..411dca70b3 100644 --- a/conmon-rs/client/Cargo.toml +++ b/conmon-rs/client/Cargo.toml @@ -5,10 +5,10 @@ edition = "2021" [dependencies] capnp = "0.19.6" -capnp-rpc = "0.19.2" +capnp-rpc = "0.19.4" conmon-common = { path = "../common" } futures = "0.3.30" log = { version = "0.4.22", features = ["serde", "std"] } -serde = { version = "1.0.209", features = ["derive"] } +serde = { version = "1.0.210", features = ["derive"] } tokio = { version = "1.38.1", features = ["fs", "macros", "net", "process", "rt", "signal", "time"] } tokio-util = { version = "0.7.11", features = ["compat"] } diff --git a/conmon-rs/server/Cargo.toml b/conmon-rs/server/Cargo.toml index c7e68ab842..804a946850 100644 --- a/conmon-rs/server/Cargo.toml +++ b/conmon-rs/server/Cargo.toml @@ -8,9 +8,9 @@ name = "conmonrs" path = "src/main.rs" [dependencies] -anyhow = "1.0.86" +anyhow = "1.0.87" capnp = "0.19.6" -capnp-rpc = "0.19.2" +capnp-rpc = "0.19.4" clap = { version = "4.3.24", features = ["color", "cargo", "deprecated", "derive", "deprecated", "env", "string", "unicode", "wrap_help"] } command-fds = { version = "0.3.0", features = ["tokio"] } conmon-common = { path = "../common" } @@ -31,8 +31,8 @@ opentelemetry-semantic-conventions = "0.15.0" prctl = "1.0.0" regex = "1.10.6" sendfd = { version = "0.4.3", features = ["tokio"] } -serde = { version = "1.0.209", features = ["derive"] } -serde_json = "1.0.127" +serde = { version = "1.0.210", features = ["derive"] } +serde_json = "1.0.128" shadow-rs = "0.31.1" signal-hook = "0.3.17" strum = { version = "0.26.3", features = ["derive"] } @@ -49,7 +49,7 @@ uuid = { version = "1.10.0", features = ["v4", "fast-rng", "macro-diagnostics"] [build-dependencies] shadow-rs = "0.31.1" -dashmap = "6.0.1" +dashmap = "6.1.0" [dev-dependencies] mockall = "0.13.0"