diff options
author | Florian Klink <flokli@flokli.de> | 2023-05-11T15·06+0300 |
---|---|---|
committer | flokli <flokli@flokli.de> | 2023-05-11T18·19+0000 |
commit | 6a30eb69e067afd541312b3eb4d68416c6734e2d (patch) | |
tree | aa4425a5f4cffc706b7d1a5bb9dc7a94dc80b2b9 | |
parent | 616fa4476f93e1782e68dc713e9e8cb77a426c7d (diff) |
chore(tvix/*): bump to smol_str 0.2.0 r/6134
Change-Id: Ic9ac1b6fecb564eafb41b265bf317cd385fdc170 Reviewed-on: https://cl.tvl.fyi/c/depot/+/8560 Reviewed-by: tazjin <tazjin@tvl.su> Tested-by: BuildkiteCI Autosubmit: flokli <flokli@flokli.de>
-rw-r--r-- | corp/tvixbolt/Cargo.lock | 66 | ||||
-rw-r--r-- | tvix/Cargo.lock | 4 | ||||
-rw-r--r-- | tvix/Cargo.nix | 8 | ||||
-rw-r--r-- | tvix/cli/Cargo.toml | 2 | ||||
-rw-r--r-- | tvix/eval/Cargo.toml | 2 |
5 files changed, 12 insertions, 70 deletions
diff --git a/corp/tvixbolt/Cargo.lock b/corp/tvixbolt/Cargo.lock index 11ff5336167d..d12d9ce96387 100644 --- a/corp/tvixbolt/Cargo.lock +++ b/corp/tvixbolt/Cargo.lock @@ -148,8 +148,6 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "c86bd0361bcbde39b13475e6e36cb24c329964aa2611be285289d1e4b751c1a0" dependencies = [ "genawaiter-macro", - "genawaiter-proc-macro", - "proc-macro-hack", ] [[package]] @@ -159,19 +157,6 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "0b32dfe1fdfc0bbde1f22a5da25355514b5e450c33a6af6770884c8750aedfbc" [[package]] -name = "genawaiter-proc-macro" -version = "0.99.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "784f84eebc366e15251c4a8c3acee82a6a6f427949776ecb88377362a9621738" -dependencies = [ - "proc-macro-error 0.4.12", - "proc-macro-hack", - "proc-macro2", - "quote", - "syn", -] - -[[package]] name = "getrandom" version = "0.2.8" source = "registry+https://github.com/rust-lang/crates.io-index" @@ -486,24 +471,11 @@ checksum = "478c572c3d73181ff3c2539045f6eb99e5491218eae919370993b890cdbdd98e" [[package]] name = "proc-macro-error" -version = "0.4.12" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "18f33027081eba0a6d8aba6d1b1c3a3be58cbb12106341c2d5759fcd9b5277e7" -dependencies = [ - "proc-macro-error-attr 0.4.12", - "proc-macro2", - "quote", - "syn", - "version_check", -] - -[[package]] -name = "proc-macro-error" version = "1.0.4" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "da25490ff9892aab3fcf7c36f08cfb902dd3e71ca0f9f9517bea02a73a5ce38c" dependencies = [ - "proc-macro-error-attr 1.0.4", + "proc-macro-error-attr", "proc-macro2", "quote", "syn", @@ -512,19 +484,6 @@ dependencies = [ [[package]] name = "proc-macro-error-attr" -version = "0.4.12" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "8a5b4b77fdb63c1eca72173d68d24501c54ab1269409f6b672c85deb18af69de" -dependencies = [ - "proc-macro2", - "quote", - "syn", - "syn-mid", - "version_check", -] - -[[package]] -name = "proc-macro-error-attr" version = "1.0.4" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "a1be40180e52ecc98ad80b184934baf3d0d29f979574e439af5a55274b35f869" @@ -535,12 +494,6 @@ dependencies = [ ] [[package]] -name = "proc-macro-hack" -version = "0.5.20+deprecated" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "dc375e1527247fe1a97d8b7156678dfe7c1af2fc075c9a4db3690ecd2a148068" - -[[package]] name = "proc-macro2" version = "1.0.50" source = "registry+https://github.com/rust-lang/crates.io-index" @@ -731,9 +684,9 @@ dependencies = [ [[package]] name = "smol_str" -version = "0.1.23" +version = "0.2.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "7475118a28b7e3a2e157ce0131ba8c5526ea96e90ee601d9f6bb2e286a35ab44" +checksum = "74212e6bbe9a4352329b2f68ba3130c15a3f26fe88ff22dbdc6cdd58fa85e99c" dependencies = [ "serde", ] @@ -756,17 +709,6 @@ dependencies = [ ] [[package]] -name = "syn-mid" -version = "0.5.3" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "baa8e7560a164edb1621a55d18a0c59abf49d360f47aa7b821061dd7eea7fac9" -dependencies = [ - "proc-macro2", - "quote", - "syn", -] - -[[package]] name = "tabwriter" version = "1.2.1" source = "registry+https://github.com/rust-lang/crates.io-index" @@ -1056,7 +998,7 @@ checksum = "5fab79082b556d768d6e21811869c761893f0450e1d550a67892b9bce303b7bb" dependencies = [ "boolinator", "lazy_static", - "proc-macro-error 1.0.4", + "proc-macro-error", "proc-macro2", "quote", "syn", diff --git a/tvix/Cargo.lock b/tvix/Cargo.lock index e86773cc1423..9c2e464a6da4 100644 --- a/tvix/Cargo.lock +++ b/tvix/Cargo.lock @@ -2081,9 +2081,9 @@ checksum = "a507befe795404456341dfab10cef66ead4c041f62b8b11bbb92bffe5d0953e0" [[package]] name = "smol_str" -version = "0.1.24" +version = "0.2.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "fad6c857cbab2627dcf01ec85a623ca4e7dcb5691cbaa3d7fb7653671f0d09c9" +checksum = "74212e6bbe9a4352329b2f68ba3130c15a3f26fe88ff22dbdc6cdd58fa85e99c" dependencies = [ "serde", ] diff --git a/tvix/Cargo.nix b/tvix/Cargo.nix index 3b744136cbcf..cf571a36b0d6 100644 --- a/tvix/Cargo.nix +++ b/tvix/Cargo.nix @@ -5952,9 +5952,9 @@ rec { }; "smol_str" = rec { crateName = "smol_str"; - version = "0.1.24"; + version = "0.2.0"; edition = "2018"; - sha256 = "1j891lgnflvnzgbs7fhwd6sxrrx47ii5mj0yy3f2f9mbrdbwimps"; + sha256 = "1779hpx5ipbcvkdj5zw8zqk3ynn160qvls1gkcr54hwsprmjw8bl"; authors = [ "Aleksey Kladov <aleksey.kladov@gmail.com>" ]; @@ -5977,9 +5977,9 @@ rec { "arbitrary" = [ "dep:arbitrary" ]; "default" = [ "std" ]; "serde" = [ "dep:serde" ]; - "std" = [ "serde/std" ]; + "std" = [ "serde?/std" ]; }; - resolvedDefaultFeatures = [ "default" "serde" "std" ]; + resolvedDefaultFeatures = [ "default" "std" ]; }; "socket2" = rec { crateName = "socket2"; diff --git a/tvix/cli/Cargo.toml b/tvix/cli/Cargo.toml index 7a427cb683dd..1dd59a2329f7 100644 --- a/tvix/cli/Cargo.toml +++ b/tvix/cli/Cargo.toml @@ -13,7 +13,7 @@ tvix-eval = { path = "../eval" } rustyline = "10.0.0" clap = { version = "4.0", features = ["derive", "env"] } dirs = "4.0.0" -smol_str = "0.1" +smol_str = "0.2.0" ssri = "7.0.0" data-encoding = "2.3.3" thiserror = "1.0.38" diff --git a/tvix/eval/Cargo.toml b/tvix/eval/Cargo.toml index e59249f1e70a..99c4fc1a1106 100644 --- a/tvix/eval/Cargo.toml +++ b/tvix/eval/Cargo.toml @@ -24,7 +24,7 @@ rnix = "0.11.0" rowan = "*" # pinned by rnix serde = { version = "1.0", features = [ "rc", "derive" ] } serde_json = "1.0" -smol_str = "0.1" +smol_str = "0.2.0" tabwriter = "1.2" test-strategy = { version = "0.2.1", optional = true } toml = "0.6.0" |