From d57e6d1b82328b37ded632883ea675c0da9c45cc Mon Sep 17 00:00:00 2001 From: Ricardo Delfin Date: Wed, 26 Oct 2022 19:30:13 +0000 Subject: [PATCH] [Crate Universe] Add support for package overrides --- crate_universe/private/crate.bzl | 4 + crate_universe/src/config.rs | 5 + crate_universe/src/context/crate_context.rs | 11 + crate_universe/src/lockfile.rs | 2 +- crate_universe/src/utils/starlark/select.rs | 25 ++ docs/crate_universe.md | 5 +- .../cargo_aliases/Cargo.Bazel.lock | 24 +- .../cargo_aliases/cargo-bazel-lock.json | 76 ++--- .../crate_universe/cargo_local/Cargo.lock | 12 +- .../cargo_workspace/Cargo.Bazel.lock | 4 +- .../cargo_workspace/cargo-bazel-lock.json | 14 +- .../multi_package/Cargo.Bazel.lock | 77 +++-- .../multi_package/cargo-bazel-lock.json | 310 ++++++++++-------- .../no_cargo_manifests/Cargo.Bazel.lock | 24 +- .../no_cargo_manifests/cargo-bazel-lock.json | 110 +++---- 15 files changed, 402 insertions(+), 301 deletions(-) diff --git a/crate_universe/private/crate.bzl b/crate_universe/private/crate.bzl index caa9091fd5..8e019aba93 100644 --- a/crate_universe/private/crate.bzl +++ b/crate_universe/private/crate.bzl @@ -78,6 +78,7 @@ def _annotation( data = None, data_glob = None, deps = None, + dep_overrides = None, gen_build_script = None, patch_args = None, patch_tool = None, @@ -114,6 +115,8 @@ def _annotation( data (list, optional): A list of labels to add to a crate's `rust_library::data` attribute. data_glob (list, optional): A list of glob patterns to add to a crate's `rust_library::data` attribute. deps (list, optional): A list of labels to add to a crate's `rust_library::deps` attribute. + dep_overrides (dict, optional): A dictionary of of crate names that should be replaced with a Bazel dependency + in the `rust_library::deps` attribute. gen_build_script (bool, optional): An authorative flag to determine whether or not to produce `cargo_build_script` targets for the current crate. patch_args (list, optional): The `patch_args` attribute of a Bazel repository rule. See @@ -159,6 +162,7 @@ def _annotation( data = data, data_glob = data_glob, deps = deps, + dep_overrides = dep_overrides, gen_build_script = gen_build_script, patch_args = patch_args, patch_tool = patch_tool, diff --git a/crate_universe/src/config.rs b/crate_universe/src/config.rs index 44e4966184..283f7ba209 100644 --- a/crate_universe/src/config.rs +++ b/crate_universe/src/config.rs @@ -150,6 +150,10 @@ pub struct CrateAnnotations { /// [deps](https://bazelbuild.github.io/rules_rust/defs.html#rust_library-deps) attribute. pub deps: Option>, + /// A dictionary of of crate names that should be replaced with a Bazel dependency in the + /// [deps](https://bazelbuild.github.io/rules_rust/defs.html#rust_library-deps) attribute. + pub dep_overrides: Option>, + /// Additional data to pass to /// [proc_macro_deps](https://bazelbuild.github.io/rules_rust/defs.html#rust_library-proc_macro_deps) attribute. pub proc_macro_deps: Option>, @@ -293,6 +297,7 @@ impl Add for CrateAnnotations { let output = CrateAnnotations { gen_build_script, deps: joined_extra_member!(self.deps, rhs.deps, BTreeSet::new, BTreeSet::extend), + dep_overrides: joined_extra_member!(self.dep_overrides, rhs.dep_overrides, BTreeMap::new, BTreeMap::extend), proc_macro_deps: joined_extra_member!(self.proc_macro_deps, rhs.proc_macro_deps, BTreeSet::new, BTreeSet::extend), crate_features: joined_extra_member!(self.crate_features, rhs.crate_features, BTreeSet::new, BTreeSet::extend), data: joined_extra_member!(self.data, rhs.data, BTreeSet::new, BTreeSet::extend), diff --git a/crate_universe/src/context/crate_context.rs b/crate_universe/src/context/crate_context.rs index 2ba0c443a8..fead4e501b 100644 --- a/crate_universe/src/context/crate_context.rs +++ b/crate_universe/src/context/crate_context.rs @@ -396,6 +396,17 @@ impl CrateContext { } } + // Dependency overrides + if let Some(dep_overrides) = &crate_extra.dep_overrides { + for (crate_name, new_dep) in dep_overrides { + let dep_filter = |dep: &CrateDependency| &dep.id.name == crate_name; + if self.common_attrs.deps.any_matches(dep_filter) { + self.common_attrs.deps.remove_if(dep_filter); + self.common_attrs.extra_deps.insert(new_dep.clone()); + } + } + } + // Compile data glob if let Some(extra) = &crate_extra.compile_data_glob { self.common_attrs.compile_data_glob.extend(extra.clone()); diff --git a/crate_universe/src/lockfile.rs b/crate_universe/src/lockfile.rs index 26bdc9f237..dfcaaa6432 100644 --- a/crate_universe/src/lockfile.rs +++ b/crate_universe/src/lockfile.rs @@ -253,7 +253,7 @@ mod test { assert_eq!( digest, - Digest("33dbf61e3b2aabacadaf7ff0c9862af25703cb851436efcbdf8552735be844ba".to_owned()) + Digest("4593a4859b4f52115068f9f583a5f1977e7bc645e004297c7274e158a3215706".to_owned()) ); } diff --git a/crate_universe/src/utils/starlark/select.rs b/crate_universe/src/utils/starlark/select.rs index 7d46cf0fc0..4d50da44be 100644 --- a/crate_universe/src/utils/starlark/select.rs +++ b/crate_universe/src/utils/starlark/select.rs @@ -54,6 +54,31 @@ impl SelectList { }; } + pub fn any_matches(&mut self, mut match_fn: F) -> bool + where + F: FnMut(&T) -> bool, + { + self.common.iter().any(&mut match_fn) + || self + .selects + .iter() + .any(|(_, set)| set.iter().any(&mut match_fn)) + } + + pub fn remove_if(&mut self, mut filter: F) + where + F: FnMut(&T) -> bool, + { + for (_cfg, set) in self.selects.iter_mut() { + if set.iter().any(&mut filter) { + set.retain(|item| !filter(item)); + } + } + if self.common.iter().any(&mut filter) { + self.common.retain(|item| !filter(item)); + } + } + // TODO: This should probably be added to the [Select] trait pub fn get_iter<'a>(&'a self, config: Option<&String>) -> Option> { match config { diff --git a/docs/crate_universe.md b/docs/crate_universe.md index ccdb70cc2e..ecc0f40221 100644 --- a/docs/crate_universe.md +++ b/docs/crate_universe.md @@ -504,8 +504,8 @@ crate.annotation(version, build_script_tools, build_script_data_glob, build_script_deps, build_script_env, build_script_proc_macro_deps, build_script_rustc_env, build_script_toolchains, compile_data, compile_data_glob, crate_features, data, data_glob, deps, - gen_build_script, patch_args, patch_tool, patches, proc_macro_deps, rustc_env, - rustc_env_files, rustc_flags, shallow_since) + dep_overrides, gen_build_script, patch_args, patch_tool, patches, proc_macro_deps, + rustc_env, rustc_env_files, rustc_flags, shallow_since) A collection of extra attributes and settings for a particular crate @@ -532,6 +532,7 @@ A collection of extra attributes and settings for a particular crate | data | A list of labels to add to a crate's rust_library::data attribute. | None | | data_glob | A list of glob patterns to add to a crate's rust_library::data attribute. | None | | deps | A list of labels to add to a crate's rust_library::deps attribute. | None | +| dep_overrides | A dictionary of of crate names that should be replaced with a Bazel dependency in the rust_library::deps attribute. | None | | gen_build_script | An authorative flag to determine whether or not to produce cargo_build_script targets for the current crate. | None | | patch_args | The patch_args attribute of a Bazel repository rule. See [http_archive.patch_args](https://docs.bazel.build/versions/main/repo/http.html#http_archive-patch_args) | None | | patch_tool | The patch_tool attribute of a Bazel repository rule. See [http_archive.patch_tool](https://docs.bazel.build/versions/main/repo/http.html#http_archive-patch_tool) | None | diff --git a/examples/crate_universe/cargo_aliases/Cargo.Bazel.lock b/examples/crate_universe/cargo_aliases/Cargo.Bazel.lock index bf17abfee7..67590c959b 100644 --- a/examples/crate_universe/cargo_aliases/Cargo.Bazel.lock +++ b/examples/crate_universe/cargo_aliases/Cargo.Bazel.lock @@ -103,9 +103,9 @@ dependencies = [ [[package]] name = "env_logger" -version = "0.9.1" +version = "0.9.3" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c90bf5f19754d10198ccb95b70664fc925bd1fc090a0fd9a6ebc54acc8cd6272" +checksum = "a12e6657c4c97ebab115a42dcee77225f7f482cdd841cf7088c657a42e9e00e7" dependencies = [ "atty", "humantime", @@ -154,9 +154,9 @@ checksum = "9a3a5bfb195931eeb336b2a7b4d761daec841b97f947d34394601737a7bba5e4" [[package]] name = "indexmap" -version = "1.9.1" +version = "1.9.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "10a35a97730320ffe8e2d410b5d3b69279b98d2c14bdb8b70ea89ecf7888d41e" +checksum = "1885e79c1fc4b10f0e172c475f458b7f7b93061064d98c3293e98c5ba0c8b399" dependencies = [ "autocfg", "hashbrown", @@ -219,15 +219,15 @@ checksum = "86f0b0d4bf799edbc74508c1e8bf170ff5f41238e5f8225603ca7caaae2b7860" [[package]] name = "os_str_bytes" -version = "6.3.1" +version = "6.4.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "3baf96e39c5359d2eb0dd6ccb42c62b91d9678aa68160d261b9e0ccbf9e9dea9" +checksum = "9b7820b9daea5457c9f21c69448905d723fbd21136ccf521748f23fd49e723ee" [[package]] name = "ppv-lite86" -version = "0.2.16" +version = "0.2.17" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "eb9f9e6e233e5c4a35559a617bf40a4ec447db2e84c20b55a6f83167b7e57872" +checksum = "5b40af805b3121feab8a3c29f04d8ad262fa8e0561883e7653e024ae4479e6de" [[package]] name = "proc-macro-error" @@ -303,9 +303,9 @@ dependencies = [ [[package]] name = "regex" -version = "1.6.0" +version = "1.7.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "4c4eb3267174b8c6c2f654116623910a0fef09c4753f8dd83db29c48a0df988b" +checksum = "e076559ef8e241f2ae3479e36f97bd5741c0330689e217ad51ce2c76808b868a" dependencies = [ "aho-corasick", "memchr", @@ -314,9 +314,9 @@ dependencies = [ [[package]] name = "regex-syntax" -version = "0.6.27" +version = "0.6.28" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a3f87b73ce11b1619a3c6332f45341e0047173771e8b8b73f87bfeefb7b56244" +checksum = "456c603be3e8d448b072f410900c09faf164fbce2d480456f50eea6e25f9c848" [[package]] name = "strsim" diff --git a/examples/crate_universe/cargo_aliases/cargo-bazel-lock.json b/examples/crate_universe/cargo_aliases/cargo-bazel-lock.json index c20b65f1fa..90270d3e97 100644 --- a/examples/crate_universe/cargo_aliases/cargo-bazel-lock.json +++ b/examples/crate_universe/cargo_aliases/cargo-bazel-lock.json @@ -1,5 +1,5 @@ { - "checksum": "657eb42e7a063a0c160ced09e38869d7700007650766dad11c7ad071d764c363", + "checksum": "cf763fb5125c4935052709e6cd338a071860493e893858c619c24aae9f1102d2", "crates": { "aho-corasick 0.7.19": { "name": "aho-corasick", @@ -100,7 +100,7 @@ "deps_dev": { "common": [ { - "id": "env_logger 0.9.1", + "id": "env_logger 0.9.3", "target": "env_logger" } ], @@ -336,7 +336,7 @@ "target": "clap_lex" }, { - "id": "indexmap 1.9.1", + "id": "indexmap 1.9.2", "target": "indexmap" }, { @@ -464,7 +464,7 @@ "deps": { "common": [ { - "id": "os_str_bytes 6.3.1", + "id": "os_str_bytes 6.4.1", "target": "os_str_bytes" } ], @@ -521,13 +521,13 @@ }, "license": "Apache-2.0 OR MIT" }, - "env_logger 0.9.1": { + "env_logger 0.9.3": { "name": "env_logger", - "version": "0.9.1", + "version": "0.9.3", "repository": { "Http": { - "url": "https://crates.io/api/v1/crates/env_logger/0.9.1/download", - "sha256": "c90bf5f19754d10198ccb95b70664fc925bd1fc090a0fd9a6ebc54acc8cd6272" + "url": "https://crates.io/api/v1/crates/env_logger/0.9.3/download", + "sha256": "a12e6657c4c97ebab115a42dcee77225f7f482cdd841cf7088c657a42e9e00e7" } }, "targets": [ @@ -571,7 +571,7 @@ "target": "log" }, { - "id": "regex 1.6.0", + "id": "regex 1.7.0", "target": "regex" }, { @@ -582,7 +582,7 @@ "selects": {} }, "edition": "2018", - "version": "0.9.1" + "version": "0.9.3" }, "license": "MIT OR Apache-2.0" }, @@ -794,13 +794,13 @@ }, "license": "MIT/Apache-2.0" }, - "indexmap 1.9.1": { + "indexmap 1.9.2": { "name": "indexmap", - "version": "1.9.1", + "version": "1.9.2", "repository": { "Http": { - "url": "https://crates.io/api/v1/crates/indexmap/1.9.1/download", - "sha256": "10a35a97730320ffe8e2d410b5d3b69279b98d2c14bdb8b70ea89ecf7888d41e" + "url": "https://crates.io/api/v1/crates/indexmap/1.9.2/download", + "sha256": "1885e79c1fc4b10f0e172c475f458b7f7b93061064d98c3293e98c5ba0c8b399" } }, "targets": [ @@ -844,14 +844,14 @@ "target": "hashbrown" }, { - "id": "indexmap 1.9.1", + "id": "indexmap 1.9.2", "target": "build_script_build" } ], "selects": {} }, "edition": "2021", - "version": "1.9.1" + "version": "1.9.2" }, "build_script_attrs": { "data_glob": [ @@ -1313,13 +1313,13 @@ }, "license": "MIT OR Apache-2.0" }, - "os_str_bytes 6.3.1": { + "os_str_bytes 6.4.1": { "name": "os_str_bytes", - "version": "6.3.1", + "version": "6.4.1", "repository": { "Http": { - "url": "https://crates.io/api/v1/crates/os_str_bytes/6.3.1/download", - "sha256": "3baf96e39c5359d2eb0dd6ccb42c62b91d9678aa68160d261b9e0ccbf9e9dea9" + "url": "https://crates.io/api/v1/crates/os_str_bytes/6.4.1/download", + "sha256": "9b7820b9daea5457c9f21c69448905d723fbd21136ccf521748f23fd49e723ee" } }, "targets": [ @@ -1345,17 +1345,17 @@ "raw_os_str" ], "edition": "2021", - "version": "6.3.1" + "version": "6.4.1" }, "license": "MIT OR Apache-2.0" }, - "ppv-lite86 0.2.16": { + "ppv-lite86 0.2.17": { "name": "ppv-lite86", - "version": "0.2.16", + "version": "0.2.17", "repository": { "Http": { - "url": "https://crates.io/api/v1/crates/ppv-lite86/0.2.16/download", - "sha256": "eb9f9e6e233e5c4a35559a617bf40a4ec447db2e84c20b55a6f83167b7e57872" + "url": "https://crates.io/api/v1/crates/ppv-lite86/0.2.17/download", + "sha256": "5b40af805b3121feab8a3c29f04d8ad262fa8e0561883e7653e024ae4479e6de" } }, "targets": [ @@ -1382,7 +1382,7 @@ "std" ], "edition": "2018", - "version": "0.2.16" + "version": "0.2.17" }, "license": "MIT/Apache-2.0" }, @@ -1786,7 +1786,7 @@ "deps": { "common": [ { - "id": "ppv-lite86 0.2.16", + "id": "ppv-lite86 0.2.17", "target": "ppv_lite86" }, { @@ -1848,13 +1848,13 @@ }, "license": "MIT OR Apache-2.0" }, - "regex 1.6.0": { + "regex 1.7.0": { "name": "regex", - "version": "1.6.0", + "version": "1.7.0", "repository": { "Http": { - "url": "https://crates.io/api/v1/crates/regex/1.6.0/download", - "sha256": "4c4eb3267174b8c6c2f654116623910a0fef09c4753f8dd83db29c48a0df988b" + "url": "https://crates.io/api/v1/crates/regex/1.7.0/download", + "sha256": "e076559ef8e241f2ae3479e36f97bd5741c0330689e217ad51ce2c76808b868a" } }, "targets": [ @@ -1897,24 +1897,24 @@ "target": "memchr" }, { - "id": "regex-syntax 0.6.27", + "id": "regex-syntax 0.6.28", "target": "regex_syntax" } ], "selects": {} }, "edition": "2018", - "version": "1.6.0" + "version": "1.7.0" }, "license": "MIT OR Apache-2.0" }, - "regex-syntax 0.6.27": { + "regex-syntax 0.6.28": { "name": "regex-syntax", - "version": "0.6.27", + "version": "0.6.28", "repository": { "Http": { - "url": "https://crates.io/api/v1/crates/regex-syntax/0.6.27/download", - "sha256": "a3f87b73ce11b1619a3c6332f45341e0047173771e8b8b73f87bfeefb7b56244" + "url": "https://crates.io/api/v1/crates/regex-syntax/0.6.28/download", + "sha256": "456c603be3e8d448b072f410900c09faf164fbce2d480456f50eea6e25f9c848" } }, "targets": [ @@ -1937,7 +1937,7 @@ "**" ], "edition": "2018", - "version": "0.6.27" + "version": "0.6.28" }, "license": "MIT OR Apache-2.0" }, diff --git a/examples/crate_universe/cargo_local/Cargo.lock b/examples/crate_universe/cargo_local/Cargo.lock index 3a13f0a920..ccbc37c198 100644 --- a/examples/crate_universe/cargo_local/Cargo.lock +++ b/examples/crate_universe/cargo_local/Cargo.lock @@ -37,9 +37,9 @@ checksum = "bef38d45163c2f1dde094a7dfd33ccf595c92905c8f8f4fdc18d06fb1037718a" [[package]] name = "bytes" -version = "1.2.1" +version = "1.3.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ec8a7b6a70fde80372154c65702f00a0f56f3e1c36abbc6c440484be248856db" +checksum = "dfb24e866b15a1af2a1b663f10c6b6b8f397a84aadb828f12e5b289ec23a3a3c" [[package]] name = "cargo_local" @@ -134,9 +134,9 @@ dependencies = [ [[package]] name = "num_cpus" -version = "1.13.1" +version = "1.14.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "19e64526ebdee182341572e50e9ad03965aa510cd94427a4549448f285e957a1" +checksum = "f6058e64324c71e02bc2b150e4f3bc8286db6c83092132ffa3f6b1eab0f9def5" dependencies = [ "hermit-abi", "libc", @@ -265,9 +265,9 @@ dependencies = [ [[package]] name = "tokio" -version = "1.21.2" +version = "1.22.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a9e03c497dc955702ba729190dc4aac6f2a0ce97f913e5b1b5912fc5039d9099" +checksum = "d76ce4a75fb488c605c54bf610f221cea8b0dafb53333c1a67e8ee199dcd2ae3" dependencies = [ "autocfg", "bytes", diff --git a/examples/crate_universe/cargo_workspace/Cargo.Bazel.lock b/examples/crate_universe/cargo_workspace/Cargo.Bazel.lock index 52aa93797f..17ef7d6b80 100644 --- a/examples/crate_universe/cargo_workspace/Cargo.Bazel.lock +++ b/examples/crate_universe/cargo_workspace/Cargo.Bazel.lock @@ -96,9 +96,9 @@ dependencies = [ [[package]] name = "ppv-lite86" -version = "0.2.16" +version = "0.2.17" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "eb9f9e6e233e5c4a35559a617bf40a4ec447db2e84c20b55a6f83167b7e57872" +checksum = "5b40af805b3121feab8a3c29f04d8ad262fa8e0561883e7653e024ae4479e6de" [[package]] name = "printer" diff --git a/examples/crate_universe/cargo_workspace/cargo-bazel-lock.json b/examples/crate_universe/cargo_workspace/cargo-bazel-lock.json index a868ba6663..998d45f522 100644 --- a/examples/crate_universe/cargo_workspace/cargo-bazel-lock.json +++ b/examples/crate_universe/cargo_workspace/cargo-bazel-lock.json @@ -1,5 +1,5 @@ { - "checksum": "3762cea04eb877877a083b0178bf2ae62f3cbd968eef00c1053ff1a8a6a19db8", + "checksum": "3d1db84e0973ba3fc4a684221efcddd9614821769be791928a815c03b0efc319", "crates": { "ansi_term 0.12.1": { "name": "ansi_term", @@ -518,13 +518,13 @@ }, "license": null }, - "ppv-lite86 0.2.16": { + "ppv-lite86 0.2.17": { "name": "ppv-lite86", - "version": "0.2.16", + "version": "0.2.17", "repository": { "Http": { - "url": "https://crates.io/api/v1/crates/ppv-lite86/0.2.16/download", - "sha256": "eb9f9e6e233e5c4a35559a617bf40a4ec447db2e84c20b55a6f83167b7e57872" + "url": "https://crates.io/api/v1/crates/ppv-lite86/0.2.17/download", + "sha256": "5b40af805b3121feab8a3c29f04d8ad262fa8e0561883e7653e024ae4479e6de" } }, "targets": [ @@ -551,7 +551,7 @@ "std" ], "edition": "2018", - "version": "0.2.16" + "version": "0.2.17" }, "license": "MIT/Apache-2.0" }, @@ -700,7 +700,7 @@ "deps": { "common": [ { - "id": "ppv-lite86 0.2.16", + "id": "ppv-lite86 0.2.17", "target": "ppv_lite86" }, { diff --git a/examples/crate_universe/multi_package/Cargo.Bazel.lock b/examples/crate_universe/multi_package/Cargo.Bazel.lock index fc570bb574..7e96b249e3 100644 --- a/examples/crate_universe/multi_package/Cargo.Bazel.lock +++ b/examples/crate_universe/multi_package/Cargo.Bazel.lock @@ -42,22 +42,22 @@ version = "1.7.1" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "e14485364214912d3b19cc3435dde4df66065127f05fa0d75c712f36f12c2f28" dependencies = [ - "concurrent-queue", + "concurrent-queue 1.2.4 (registry+https://github.com/rust-lang/crates.io-index)", "event-listener", "futures-core", ] [[package]] name = "async-executor" -version = "1.4.1" +version = "1.5.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "871f9bb5e0a22eeb7e8cf16641feb87c9dc67032ccf8ff49e772eb9941d3a965" +checksum = "17adb73da160dfb475c183343c8cccd80721ea5a605d3eb57125f0a7b7a92d0b" dependencies = [ + "async-lock", "async-task", - "concurrent-queue", + "concurrent-queue 2.0.0 (registry+https://github.com/rust-lang/crates.io-index)", "fastrand", "futures-lite", - "once_cell", "slab", ] @@ -84,7 +84,7 @@ checksum = "e8121296a9f05be7f34aa4196b1747243b3b62e048bb7906f644f3fbfc490cf7" dependencies = [ "async-lock", "autocfg", - "concurrent-queue", + "concurrent-queue 1.2.4 (registry+https://github.com/rust-lang/crates.io-index)", "futures-lite", "libc", "log", @@ -269,9 +269,9 @@ checksum = "572f695136211188308f16ad2ca5c851a712c464060ae6974944458eb83880ba" [[package]] name = "bytes" -version = "1.2.1" +version = "1.3.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ec8a7b6a70fde80372154c65702f00a0f56f3e1c36abbc6c440484be248856db" +checksum = "dfb24e866b15a1af2a1b663f10c6b6b8f397a84aadb828f12e5b289ec23a3a3c" [[package]] name = "cache-padded" @@ -287,9 +287,9 @@ checksum = "a2698f953def977c68f935bb0dfa959375ad4638570e969e2f1e9f433cbf1af6" [[package]] name = "cc" -version = "1.0.74" +version = "1.0.77" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "581f5dba903aac52ea3feb5ec4810848460ee833876f1f9b0fdeab1f19091574" +checksum = "e9f73505338f7d905b19d18738976aae232eb46b8efc15554ffc56deb5d9ebe4" [[package]] name = "cfg-if" @@ -306,6 +306,15 @@ dependencies = [ "cache-padded", ] +[[package]] +name = "concurrent-queue" +version = "2.0.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "bd7bef69dc86e3c610e4e7aed41035e2a7ed12e72dd7530f61327a6579a4390b" +dependencies = [ + "crossbeam-utils", +] + [[package]] name = "core-foundation" version = "0.9.3" @@ -324,9 +333,9 @@ checksum = "5827cebf4670468b8772dd191856768aedcb1b0278a04f989f7766351917b9dc" [[package]] name = "crossbeam-utils" -version = "0.8.12" +version = "0.8.13" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "edbafec5fa1f196ca66527c1b12c2ec4745ca14b50f1ad8f9f6f720b55d11fac" +checksum = "422f23e724af1240ec469ea1e834d87a4b59ce2efe2c6a96256b0c47e2fd86aa" dependencies = [ "cfg-if", ] @@ -364,9 +373,9 @@ dependencies = [ [[package]] name = "curl-sys" -version = "0.4.58+curl-7.86.0" +version = "0.4.59+curl-7.86.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "430e2ecf0c5f4445334472cf8f9611a6eea404b4135ca5500f38a97a128c913e" +checksum = "6cfce34829f448b08f55b7db6d0009e23e2e86a34e8c2b366269bf5799b4a407" dependencies = [ "cc", "libc", @@ -701,9 +710,9 @@ dependencies = [ [[package]] name = "hyper" -version = "0.14.22" +version = "0.14.23" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "abfba89e19b959ca163c7752ba59d737c1ceea53a5d31a149c805446fc958064" +checksum = "034711faac9d2166cb1baf1a2fb0b60b1f277f8492fd72176c17f3515e1abd3c" dependencies = [ "bytes", "futures-channel", @@ -748,9 +757,9 @@ dependencies = [ [[package]] name = "indexmap" -version = "1.9.1" +version = "1.9.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "10a35a97730320ffe8e2d410b5d3b69279b98d2c14bdb8b70ea89ecf7888d41e" +checksum = "1885e79c1fc4b10f0e172c475f458b7f7b93061064d98c3293e98c5ba0c8b399" dependencies = [ "autocfg", "hashbrown", @@ -767,9 +776,9 @@ dependencies = [ [[package]] name = "ipnet" -version = "2.5.0" +version = "2.5.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "879d54834c8c76457ef4293a689b2a8c59b076067ad77b15efafbb05f92a592b" +checksum = "f88c5561171189e69df9d98bcf18fd5f9558300f7ea7b801eb8a0fd748bd8745" [[package]] name = "isahc" @@ -984,9 +993,9 @@ checksum = "e4a24736216ec316047a1fc4252e27dabb04218aa4a3f37c6e7ddbf1f9782b54" [[package]] name = "num_cpus" -version = "1.13.1" +version = "1.14.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "19e64526ebdee182341572e50e9ad03965aa510cd94427a4549448f285e957a1" +checksum = "f6058e64324c71e02bc2b150e4f3bc8286db6c83092132ffa3f6b1eab0f9def5" dependencies = [ "hermit-abi", "libc", @@ -1231,9 +1240,9 @@ dependencies = [ [[package]] name = "regex" -version = "1.6.0" +version = "1.7.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "4c4eb3267174b8c6c2f654116623910a0fef09c4753f8dd83db29c48a0df988b" +checksum = "e076559ef8e241f2ae3479e36f97bd5741c0330689e217ad51ce2c76808b868a" dependencies = [ "aho-corasick", "memchr", @@ -1242,9 +1251,9 @@ dependencies = [ [[package]] name = "regex-syntax" -version = "0.6.27" +version = "0.6.28" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a3f87b73ce11b1619a3c6332f45341e0047173771e8b8b73f87bfeefb7b56244" +checksum = "456c603be3e8d448b072f410900c09faf164fbce2d480456f50eea6e25f9c848" [[package]] name = "remove_dir_all" @@ -1257,9 +1266,9 @@ dependencies = [ [[package]] name = "reqwest" -version = "0.11.12" +version = "0.11.13" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "431949c384f4e2ae07605ccaa56d1d9d2ecdb5cadd4f9577ccfab29f2e5149fc" +checksum = "68cc60575865c7831548863cc02356512e3f1dc2f3f82cb837d7fc4cc8f3c97c" dependencies = [ "base64", "bytes", @@ -1365,9 +1374,9 @@ dependencies = [ [[package]] name = "serde_json" -version = "1.0.87" +version = "1.0.88" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "6ce777b7b150d76b9cf60d28b55f5847135a003f7d7350c6be7a773508ce7d45" +checksum = "8e8b3801309262e8184d9687fb697586833e939767aea0dda89f5a8e650e8bd7" dependencies = [ "itoa", "ryu", @@ -1417,9 +1426,9 @@ dependencies = [ [[package]] name = "similar" -version = "2.2.0" +version = "2.2.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "62ac7f900db32bf3fd12e0117dd3dc4da74bc52ebaac97f39668446d89694803" +checksum = "420acb44afdae038210c99e69aae24109f32f15500aa708e81d46c9f29d55fcf" [[package]] name = "siphasher" @@ -1558,9 +1567,9 @@ checksum = "cda74da7e1a664f795bb1f8a87ec406fb89a02522cf6e50620d016add6dbbf5c" [[package]] name = "tokio" -version = "1.21.2" +version = "1.22.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a9e03c497dc955702ba729190dc4aac6f2a0ce97f913e5b1b5912fc5039d9099" +checksum = "d76ce4a75fb488c605c54bf610f221cea8b0dafb53333c1a67e8ee199dcd2ae3" dependencies = [ "autocfg", "bytes", diff --git a/examples/crate_universe/multi_package/cargo-bazel-lock.json b/examples/crate_universe/multi_package/cargo-bazel-lock.json index 40d10b9eb4..3b114e9b38 100644 --- a/examples/crate_universe/multi_package/cargo-bazel-lock.json +++ b/examples/crate_universe/multi_package/cargo-bazel-lock.json @@ -1,5 +1,5 @@ { - "checksum": "95d0af5fc7ce9b5d2328bc9f730e04a7dcdee4328a2ee9541389292014db3c38", + "checksum": "1c3ba0a204db8d4d071d01d0aaa6a3fac8b61742d9d53c40726262ef2ca35350", "crates": { "aho-corasick 0.7.19": { "name": "aho-corasick", @@ -187,7 +187,7 @@ "target": "serde" }, { - "id": "serde_json 1.0.87", + "id": "serde_json 1.0.88", "target": "serde_json" } ], @@ -248,13 +248,13 @@ }, "license": "Apache-2.0 OR MIT" }, - "async-executor 1.4.1": { + "async-executor 1.5.0": { "name": "async-executor", - "version": "1.4.1", + "version": "1.5.0", "repository": { "Http": { - "url": "https://crates.io/api/v1/crates/async-executor/1.4.1/download", - "sha256": "871f9bb5e0a22eeb7e8cf16641feb87c9dc67032ccf8ff49e772eb9941d3a965" + "url": "https://crates.io/api/v1/crates/async-executor/1.5.0/download", + "sha256": "17adb73da160dfb475c183343c8cccd80721ea5a605d3eb57125f0a7b7a92d0b" } }, "targets": [ @@ -278,12 +278,16 @@ ], "deps": { "common": [ + { + "id": "async-lock 2.6.0", + "target": "async_lock" + }, { "id": "async-task 4.3.0", "target": "async_task" }, { - "id": "concurrent-queue 1.2.4", + "id": "concurrent-queue 2.0.0", "target": "concurrent_queue" }, { @@ -294,10 +298,6 @@ "id": "futures-lite 1.12.0", "target": "futures_lite" }, - { - "id": "once_cell 1.16.0", - "target": "once_cell" - }, { "id": "slab 0.4.7", "target": "slab" @@ -306,7 +306,7 @@ "selects": {} }, "edition": "2018", - "version": "1.4.1" + "version": "1.5.0" }, "license": "Apache-2.0 OR MIT" }, @@ -349,7 +349,7 @@ "target": "async_channel" }, { - "id": "async-executor 1.4.1", + "id": "async-executor 1.5.0", "target": "async_executor" }, { @@ -758,7 +758,7 @@ "target": "async_lock" }, { - "id": "crossbeam-utils 0.8.12", + "id": "crossbeam-utils 0.8.13", "target": "crossbeam_utils" }, { @@ -1156,7 +1156,7 @@ "target": "lalrpop_util" }, { - "id": "regex 1.6.0", + "id": "regex 1.7.0", "target": "regex" } ], @@ -1432,13 +1432,13 @@ }, "license": "MIT/Apache-2.0" }, - "bytes 1.2.1": { + "bytes 1.3.0": { "name": "bytes", - "version": "1.2.1", + "version": "1.3.0", "repository": { "Http": { - "url": "https://crates.io/api/v1/crates/bytes/1.2.1/download", - "sha256": "ec8a7b6a70fde80372154c65702f00a0f56f3e1c36abbc6c440484be248856db" + "url": "https://crates.io/api/v1/crates/bytes/1.3.0/download", + "sha256": "dfb24e866b15a1af2a1b663f10c6b6b8f397a84aadb828f12e5b289ec23a3a3c" } }, "targets": [ @@ -1465,7 +1465,7 @@ "std" ], "edition": "2018", - "version": "1.2.1" + "version": "1.3.0" }, "license": "MIT" }, @@ -1535,13 +1535,13 @@ }, "license": "MIT" }, - "cc 1.0.74": { + "cc 1.0.77": { "name": "cc", - "version": "1.0.74", + "version": "1.0.77", "repository": { "Http": { - "url": "https://crates.io/api/v1/crates/cc/1.0.74/download", - "sha256": "581f5dba903aac52ea3feb5ec4810848460ee833876f1f9b0fdeab1f19091574" + "url": "https://crates.io/api/v1/crates/cc/1.0.77/download", + "sha256": "e9f73505338f7d905b19d18738976aae232eb46b8efc15554ffc56deb5d9ebe4" } }, "targets": [ @@ -1576,7 +1576,7 @@ "**" ], "edition": "2018", - "version": "1.0.74" + "version": "1.0.77" }, "license": "MIT OR Apache-2.0" }, @@ -1655,6 +1655,52 @@ }, "license": "Apache-2.0 OR MIT" }, + "concurrent-queue 2.0.0": { + "name": "concurrent-queue", + "version": "2.0.0", + "repository": { + "Http": { + "url": "https://crates.io/api/v1/crates/concurrent-queue/2.0.0/download", + "sha256": "bd7bef69dc86e3c610e4e7aed41035e2a7ed12e72dd7530f61327a6579a4390b" + } + }, + "targets": [ + { + "Library": { + "crate_name": "concurrent_queue", + "crate_root": "src/lib.rs", + "srcs": { + "include": [ + "**/*.rs" + ], + "exclude": [] + } + } + } + ], + "library_target_name": "concurrent_queue", + "common_attrs": { + "compile_data_glob": [ + "**" + ], + "crate_features": [ + "default", + "std" + ], + "deps": { + "common": [ + { + "id": "crossbeam-utils 0.8.13", + "target": "crossbeam_utils" + } + ], + "selects": {} + }, + "edition": "2018", + "version": "2.0.0" + }, + "license": "Apache-2.0 OR MIT" + }, "core-foundation 0.9.3": { "name": "core-foundation", "version": "0.9.3", @@ -1760,13 +1806,13 @@ }, "license": "MIT / Apache-2.0" }, - "crossbeam-utils 0.8.12": { + "crossbeam-utils 0.8.13": { "name": "crossbeam-utils", - "version": "0.8.12", + "version": "0.8.13", "repository": { "Http": { - "url": "https://crates.io/api/v1/crates/crossbeam-utils/0.8.12/download", - "sha256": "edbafec5fa1f196ca66527c1b12c2ec4745ca14b50f1ad8f9f6f720b55d11fac" + "url": "https://crates.io/api/v1/crates/crossbeam-utils/0.8.13/download", + "sha256": "422f23e724af1240ec469ea1e834d87a4b59ce2efe2c6a96256b0c47e2fd86aa" } }, "targets": [ @@ -1811,14 +1857,14 @@ "target": "cfg_if" }, { - "id": "crossbeam-utils 0.8.12", + "id": "crossbeam-utils 0.8.13", "target": "build_script_build" } ], "selects": {} }, "edition": "2018", - "version": "0.8.12" + "version": "0.8.13" }, "build_script_attrs": { "data_glob": [ @@ -1991,7 +2037,7 @@ "target": "build_script_build" }, { - "id": "curl-sys 0.4.58+curl-7.86.0", + "id": "curl-sys 0.4.59+curl-7.86.0", "target": "curl_sys" }, { @@ -2036,7 +2082,7 @@ "deps": { "common": [ { - "id": "curl-sys 0.4.58+curl-7.86.0", + "id": "curl-sys 0.4.59+curl-7.86.0", "target": "curl_sys" } ], @@ -2045,13 +2091,13 @@ }, "license": "MIT" }, - "curl-sys 0.4.58+curl-7.86.0": { + "curl-sys 0.4.59+curl-7.86.0": { "name": "curl-sys", - "version": "0.4.58+curl-7.86.0", + "version": "0.4.59+curl-7.86.0", "repository": { "Http": { - "url": "https://crates.io/api/v1/crates/curl-sys/0.4.58+curl-7.86.0/download", - "sha256": "430e2ecf0c5f4445334472cf8f9611a6eea404b4135ca5500f38a97a128c913e" + "url": "https://crates.io/api/v1/crates/curl-sys/0.4.59+curl-7.86.0/download", + "sha256": "6cfce34829f448b08f55b7db6d0009e23e2e86a34e8c2b366269bf5799b4a407" } }, "targets": [ @@ -2116,7 +2162,7 @@ "@libssh2" ], "edition": "2018", - "version": "0.4.58+curl-7.86.0" + "version": "0.4.59+curl-7.86.0" }, "license": "MIT" }, @@ -3435,7 +3481,7 @@ "deps": { "common": [ { - "id": "bytes 1.2.1", + "id": "bytes 1.3.0", "target": "bytes" }, { @@ -3459,7 +3505,7 @@ "target": "http" }, { - "id": "indexmap 1.9.1", + "id": "indexmap 1.9.2", "target": "indexmap" }, { @@ -3467,7 +3513,7 @@ "target": "slab" }, { - "id": "tokio 1.21.2", + "id": "tokio 1.22.0", "target": "tokio" }, { @@ -3631,7 +3677,7 @@ "deps": { "common": [ { - "id": "bytes 1.2.1", + "id": "bytes 1.3.0", "target": "bytes" }, { @@ -3681,7 +3727,7 @@ "deps": { "common": [ { - "id": "bytes 1.2.1", + "id": "bytes 1.3.0", "target": "bytes" }, { @@ -3860,7 +3906,7 @@ "target": "basic_cookies" }, { - "id": "crossbeam-utils 0.8.12", + "id": "crossbeam-utils 0.8.13", "target": "crossbeam_utils" }, { @@ -3872,7 +3918,7 @@ "target": "futures_util" }, { - "id": "hyper 0.14.22", + "id": "hyper 0.14.23", "target": "hyper" }, { @@ -3892,7 +3938,7 @@ "target": "log" }, { - "id": "regex 1.6.0", + "id": "regex 1.7.0", "target": "regex" }, { @@ -3900,7 +3946,7 @@ "target": "serde" }, { - "id": "serde_json 1.0.87", + "id": "serde_json 1.0.88", "target": "serde_json" }, { @@ -3908,11 +3954,11 @@ "target": "serde_regex" }, { - "id": "similar 2.2.0", + "id": "similar 2.2.1", "target": "similar" }, { - "id": "tokio 1.21.2", + "id": "tokio 1.22.0", "target": "tokio" }, { @@ -3936,13 +3982,13 @@ }, "license": "MIT" }, - "hyper 0.14.22": { + "hyper 0.14.23": { "name": "hyper", - "version": "0.14.22", + "version": "0.14.23", "repository": { "Http": { - "url": "https://crates.io/api/v1/crates/hyper/0.14.22/download", - "sha256": "abfba89e19b959ca163c7752ba59d737c1ceea53a5d31a149c805446fc958064" + "url": "https://crates.io/api/v1/crates/hyper/0.14.23/download", + "sha256": "034711faac9d2166cb1baf1a2fb0b60b1f277f8492fd72176c17f3515e1abd3c" } }, "targets": [ @@ -3978,7 +4024,7 @@ "deps": { "common": [ { - "id": "bytes 1.2.1", + "id": "bytes 1.3.0", "target": "bytes" }, { @@ -4026,7 +4072,7 @@ "target": "socket2" }, { - "id": "tokio 1.21.2", + "id": "tokio 1.22.0", "target": "tokio" }, { @@ -4045,7 +4091,7 @@ "selects": {} }, "edition": "2018", - "version": "0.14.22" + "version": "0.14.23" }, "license": "MIT" }, @@ -4080,11 +4126,11 @@ "deps": { "common": [ { - "id": "bytes 1.2.1", + "id": "bytes 1.3.0", "target": "bytes" }, { - "id": "hyper 0.14.22", + "id": "hyper 0.14.23", "target": "hyper" }, { @@ -4092,7 +4138,7 @@ "target": "native_tls" }, { - "id": "tokio 1.21.2", + "id": "tokio 1.22.0", "target": "tokio" }, { @@ -4153,13 +4199,13 @@ }, "license": "MIT OR Apache-2.0" }, - "indexmap 1.9.1": { + "indexmap 1.9.2": { "name": "indexmap", - "version": "1.9.1", + "version": "1.9.2", "repository": { "Http": { - "url": "https://crates.io/api/v1/crates/indexmap/1.9.1/download", - "sha256": "10a35a97730320ffe8e2d410b5d3b69279b98d2c14bdb8b70ea89ecf7888d41e" + "url": "https://crates.io/api/v1/crates/indexmap/1.9.2/download", + "sha256": "1885e79c1fc4b10f0e172c475f458b7f7b93061064d98c3293e98c5ba0c8b399" } }, "targets": [ @@ -4203,14 +4249,14 @@ "target": "hashbrown" }, { - "id": "indexmap 1.9.1", + "id": "indexmap 1.9.2", "target": "build_script_build" } ], "selects": {} }, "edition": "2021", - "version": "1.9.1" + "version": "1.9.2" }, "build_script_attrs": { "data_glob": [ @@ -4270,13 +4316,13 @@ }, "license": "BSD-3-Clause" }, - "ipnet 2.5.0": { + "ipnet 2.5.1": { "name": "ipnet", - "version": "2.5.0", + "version": "2.5.1", "repository": { "Http": { - "url": "https://crates.io/api/v1/crates/ipnet/2.5.0/download", - "sha256": "879d54834c8c76457ef4293a689b2a8c59b076067ad77b15efafbb05f92a592b" + "url": "https://crates.io/api/v1/crates/ipnet/2.5.1/download", + "sha256": "f88c5561171189e69df9d98bcf18fd5f9558300f7ea7b801eb8a0fd748bd8745" } }, "targets": [ @@ -4302,7 +4348,7 @@ "default" ], "edition": "2018", - "version": "2.5.0" + "version": "2.5.1" }, "license": "MIT OR Apache-2.0" }, @@ -4365,7 +4411,7 @@ "target": "castaway" }, { - "id": "crossbeam-utils 0.8.12", + "id": "crossbeam-utils 0.8.13", "target": "crossbeam_utils" }, { @@ -4373,7 +4419,7 @@ "target": "curl" }, { - "id": "curl-sys 0.4.58+curl-7.86.0", + "id": "curl-sys 0.4.59+curl-7.86.0", "target": "curl_sys" }, { @@ -4699,11 +4745,11 @@ "target": "pico_args" }, { - "id": "regex 1.6.0", + "id": "regex 1.7.0", "target": "regex" }, { - "id": "regex-syntax 0.6.27", + "id": "regex-syntax 0.6.28", "target": "regex_syntax" }, { @@ -4767,7 +4813,7 @@ "deps": { "common": [ { - "id": "regex 1.6.0", + "id": "regex 1.7.0", "target": "regex" } ], @@ -4974,7 +5020,7 @@ "deps": { "common": [ { - "id": "cc 1.0.74", + "id": "cc 1.0.77", "target": "cc" } ], @@ -5050,7 +5096,7 @@ "deps": { "common": [ { - "id": "cc 1.0.74", + "id": "cc 1.0.77", "target": "cc" }, { @@ -5574,13 +5620,13 @@ }, "license": "MIT" }, - "num_cpus 1.13.1": { + "num_cpus 1.14.0": { "name": "num_cpus", - "version": "1.13.1", + "version": "1.14.0", "repository": { "Http": { - "url": "https://crates.io/api/v1/crates/num_cpus/1.13.1/download", - "sha256": "19e64526ebdee182341572e50e9ad03965aa510cd94427a4549448f285e957a1" + "url": "https://crates.io/api/v1/crates/num_cpus/1.14.0/download", + "sha256": "f6058e64324c71e02bc2b150e4f3bc8286db6c83092132ffa3f6b1eab0f9def5" } }, "targets": [ @@ -5620,7 +5666,7 @@ } }, "edition": "2015", - "version": "1.13.1" + "version": "1.14.0" }, "license": "MIT OR Apache-2.0" }, @@ -5969,7 +6015,7 @@ "target": "autocfg" }, { - "id": "cc 1.0.74", + "id": "cc 1.0.77", "target": "cc" }, { @@ -6237,7 +6283,7 @@ "target": "fixedbitset" }, { - "id": "indexmap 1.9.1", + "id": "indexmap 1.9.2", "target": "indexmap" } ], @@ -6548,7 +6594,7 @@ "target": "anyhow" }, { - "id": "reqwest 0.11.12", + "id": "reqwest 0.11.13", "target": "reqwest" } ], @@ -7007,13 +7053,13 @@ }, "license": "MIT" }, - "regex 1.6.0": { + "regex 1.7.0": { "name": "regex", - "version": "1.6.0", + "version": "1.7.0", "repository": { "Http": { - "url": "https://crates.io/api/v1/crates/regex/1.6.0/download", - "sha256": "4c4eb3267174b8c6c2f654116623910a0fef09c4753f8dd83db29c48a0df988b" + "url": "https://crates.io/api/v1/crates/regex/1.7.0/download", + "sha256": "e076559ef8e241f2ae3479e36f97bd5741c0330689e217ad51ce2c76808b868a" } }, "targets": [ @@ -7065,24 +7111,24 @@ "target": "memchr" }, { - "id": "regex-syntax 0.6.27", + "id": "regex-syntax 0.6.28", "target": "regex_syntax" } ], "selects": {} }, "edition": "2018", - "version": "1.6.0" + "version": "1.7.0" }, "license": "MIT OR Apache-2.0" }, - "regex-syntax 0.6.27": { + "regex-syntax 0.6.28": { "name": "regex-syntax", - "version": "0.6.27", + "version": "0.6.28", "repository": { "Http": { - "url": "https://crates.io/api/v1/crates/regex-syntax/0.6.27/download", - "sha256": "a3f87b73ce11b1619a3c6332f45341e0047173771e8b8b73f87bfeefb7b56244" + "url": "https://crates.io/api/v1/crates/regex-syntax/0.6.28/download", + "sha256": "456c603be3e8d448b072f410900c09faf164fbce2d480456f50eea6e25f9c848" } }, "targets": [ @@ -7116,7 +7162,7 @@ "unicode-segment" ], "edition": "2018", - "version": "0.6.27" + "version": "0.6.28" }, "license": "MIT OR Apache-2.0" }, @@ -7164,13 +7210,13 @@ }, "license": "MIT/Apache-2.0" }, - "reqwest 0.11.12": { + "reqwest 0.11.13": { "name": "reqwest", - "version": "0.11.12", + "version": "0.11.13", "repository": { "Http": { - "url": "https://crates.io/api/v1/crates/reqwest/0.11.12/download", - "sha256": "431949c384f4e2ae07605ccaa56d1d9d2ecdb5cadd4f9577ccfab29f2e5149fc" + "url": "https://crates.io/api/v1/crates/reqwest/0.11.13/download", + "sha256": "68cc60575865c7831548863cc02356512e3f1dc2f3f82cb837d7fc4cc8f3c97c" } }, "targets": [ @@ -7210,7 +7256,7 @@ "target": "base64" }, { - "id": "bytes 1.2.1", + "id": "bytes 1.3.0", "target": "bytes" }, { @@ -7222,7 +7268,7 @@ "target": "serde" }, { - "id": "serde_json 1.0.87", + "id": "serde_json 1.0.88", "target": "serde_json" }, { @@ -7261,7 +7307,7 @@ "target": "http_body" }, { - "id": "hyper 0.14.22", + "id": "hyper 0.14.23", "target": "hyper" }, { @@ -7269,7 +7315,7 @@ "target": "hyper_tls" }, { - "id": "ipnet 2.5.0", + "id": "ipnet 2.5.1", "target": "ipnet" }, { @@ -7298,7 +7344,7 @@ "target": "pin_project_lite" }, { - "id": "tokio 1.21.2", + "id": "tokio 1.22.0", "target": "tokio" }, { @@ -7312,7 +7358,7 @@ "target": "js_sys" }, { - "id": "serde_json 1.0.87", + "id": "serde_json 1.0.88", "target": "serde_json" }, { @@ -7337,7 +7383,7 @@ } }, "edition": "2018", - "version": "0.11.12" + "version": "0.11.13" }, "license": "MIT/Apache-2.0" }, @@ -7772,13 +7818,13 @@ }, "license": "MIT OR Apache-2.0" }, - "serde_json 1.0.87": { + "serde_json 1.0.88": { "name": "serde_json", - "version": "1.0.87", + "version": "1.0.88", "repository": { "Http": { - "url": "https://crates.io/api/v1/crates/serde_json/1.0.87/download", - "sha256": "6ce777b7b150d76b9cf60d28b55f5847135a003f7d7350c6be7a773508ce7d45" + "url": "https://crates.io/api/v1/crates/serde_json/1.0.88/download", + "sha256": "8e8b3801309262e8184d9687fb697586833e939767aea0dda89f5a8e650e8bd7" } }, "targets": [ @@ -7831,14 +7877,14 @@ "target": "serde" }, { - "id": "serde_json 1.0.87", + "id": "serde_json 1.0.88", "target": "build_script_build" } ], "selects": {} }, "edition": "2018", - "version": "1.0.87" + "version": "1.0.88" }, "build_script_attrs": { "data_glob": [ @@ -7878,7 +7924,7 @@ "deps": { "common": [ { - "id": "regex 1.6.0", + "id": "regex 1.7.0", "target": "regex" }, { @@ -8060,13 +8106,13 @@ }, "license": "Apache-2.0/MIT" }, - "similar 2.2.0": { + "similar 2.2.1": { "name": "similar", - "version": "2.2.0", + "version": "2.2.1", "repository": { "Http": { - "url": "https://crates.io/api/v1/crates/similar/2.2.0/download", - "sha256": "62ac7f900db32bf3fd12e0117dd3dc4da74bc52ebaac97f39668446d89694803" + "url": "https://crates.io/api/v1/crates/similar/2.2.1/download", + "sha256": "420acb44afdae038210c99e69aae24109f32f15500aa708e81d46c9f29d55fcf" } }, "targets": [ @@ -8093,7 +8139,7 @@ "text" ], "edition": "2018", - "version": "2.2.0" + "version": "2.2.1" }, "license": "Apache-2.0" }, @@ -8881,13 +8927,13 @@ }, "license": "MIT OR Apache-2.0 OR Zlib" }, - "tokio 1.21.2": { + "tokio 1.22.0": { "name": "tokio", - "version": "1.21.2", + "version": "1.22.0", "repository": { "Http": { - "url": "https://crates.io/api/v1/crates/tokio/1.21.2/download", - "sha256": "a9e03c497dc955702ba729190dc4aac6f2a0ce97f913e5b1b5912fc5039d9099" + "url": "https://crates.io/api/v1/crates/tokio/1.22.0/download", + "sha256": "d76ce4a75fb488c605c54bf610f221cea8b0dafb53333c1a67e8ee199dcd2ae3" } }, "targets": [ @@ -8944,7 +8990,7 @@ "deps": { "common": [ { - "id": "bytes 1.2.1", + "id": "bytes 1.3.0", "target": "bytes" }, { @@ -8956,7 +9002,7 @@ "target": "mio" }, { - "id": "num_cpus 1.13.1", + "id": "num_cpus 1.14.0", "target": "num_cpus" }, { @@ -8964,7 +9010,7 @@ "target": "pin_project_lite" }, { - "id": "tokio 1.21.2", + "id": "tokio 1.22.0", "target": "build_script_build" } ], @@ -9003,7 +9049,7 @@ ], "selects": {} }, - "version": "1.21.2" + "version": "1.22.0" }, "build_script_attrs": { "data_glob": [ @@ -9106,7 +9152,7 @@ "target": "native_tls" }, { - "id": "tokio 1.21.2", + "id": "tokio 1.22.0", "target": "tokio" } ], @@ -9153,7 +9199,7 @@ "deps": { "common": [ { - "id": "bytes 1.2.1", + "id": "bytes 1.3.0", "target": "bytes" }, { @@ -9169,7 +9215,7 @@ "target": "pin_project_lite" }, { - "id": "tokio 1.21.2", + "id": "tokio 1.22.0", "target": "tokio" }, { @@ -10490,7 +10536,7 @@ "deps": { "common": [ { - "id": "cc 1.0.74", + "id": "cc 1.0.77", "target": "cc" } ], @@ -11729,7 +11775,7 @@ } }, "binary_crates": [ - "cc 1.0.74", + "cc 1.0.77", "httpmock 0.6.6", "lalrpop 0.19.8" ], diff --git a/examples/crate_universe/no_cargo_manifests/Cargo.Bazel.lock b/examples/crate_universe/no_cargo_manifests/Cargo.Bazel.lock index 5dd252aa0d..e6b332544b 100644 --- a/examples/crate_universe/no_cargo_manifests/Cargo.Bazel.lock +++ b/examples/crate_universe/no_cargo_manifests/Cargo.Bazel.lock @@ -71,9 +71,9 @@ checksum = "bef38d45163c2f1dde094a7dfd33ccf595c92905c8f8f4fdc18d06fb1037718a" [[package]] name = "bytes" -version = "1.2.1" +version = "1.3.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ec8a7b6a70fde80372154c65702f00a0f56f3e1c36abbc6c440484be248856db" +checksum = "dfb24e866b15a1af2a1b663f10c6b6b8f397a84aadb828f12e5b289ec23a3a3c" [[package]] name = "cfg-if" @@ -227,9 +227,9 @@ checksum = "c4a1e36c821dbe04574f602848a19f742f4fb3c98d40449f11bcad18d6b17421" [[package]] name = "hyper" -version = "0.14.22" +version = "0.14.23" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "abfba89e19b959ca163c7752ba59d737c1ceea53a5d31a149c805446fc958064" +checksum = "034711faac9d2166cb1baf1a2fb0b60b1f277f8492fd72176c17f3515e1abd3c" dependencies = [ "bytes", "futures-channel", @@ -251,9 +251,9 @@ dependencies = [ [[package]] name = "indexmap" -version = "1.9.1" +version = "1.9.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "10a35a97730320ffe8e2d410b5d3b69279b98d2c14bdb8b70ea89ecf7888d41e" +checksum = "1885e79c1fc4b10f0e172c475f458b7f7b93061064d98c3293e98c5ba0c8b399" dependencies = [ "autocfg", "hashbrown", @@ -338,9 +338,9 @@ dependencies = [ [[package]] name = "num_cpus" -version = "1.13.1" +version = "1.14.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "19e64526ebdee182341572e50e9ad03965aa510cd94427a4549448f285e957a1" +checksum = "f6058e64324c71e02bc2b150e4f3bc8286db6c83092132ffa3f6b1eab0f9def5" dependencies = [ "hermit-abi", "libc", @@ -466,9 +466,9 @@ checksum = "d193d69bae983fc11a79df82342761dfbf28a99fc8d203dca4c3c1b590948965" [[package]] name = "serde_json" -version = "1.0.87" +version = "1.0.88" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "6ce777b7b150d76b9cf60d28b55f5847135a003f7d7350c6be7a773508ce7d45" +checksum = "8e8b3801309262e8184d9687fb697586833e939767aea0dda89f5a8e650e8bd7" dependencies = [ "itoa", "ryu", @@ -558,9 +558,9 @@ dependencies = [ [[package]] name = "tokio" -version = "1.21.2" +version = "1.22.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a9e03c497dc955702ba729190dc4aac6f2a0ce97f913e5b1b5912fc5039d9099" +checksum = "d76ce4a75fb488c605c54bf610f221cea8b0dafb53333c1a67e8ee199dcd2ae3" dependencies = [ "autocfg", "bytes", diff --git a/examples/crate_universe/no_cargo_manifests/cargo-bazel-lock.json b/examples/crate_universe/no_cargo_manifests/cargo-bazel-lock.json index ec8a39f654..c54c020e3f 100644 --- a/examples/crate_universe/no_cargo_manifests/cargo-bazel-lock.json +++ b/examples/crate_universe/no_cargo_manifests/cargo-bazel-lock.json @@ -1,5 +1,5 @@ { - "checksum": "6c2b03b0b4568e3abd95163a81f017e45a1b96623289cca2cc62b05f3f31e626", + "checksum": "d1dc87ed084227802423bca155d8dab74b92c3a477d85997874fe8f0dd970a01", "crates": { "async-trait 0.1.58": { "name": "async-trait", @@ -152,7 +152,7 @@ "target": "bitflags" }, { - "id": "bytes 1.2.1", + "id": "bytes 1.3.0", "target": "bytes" }, { @@ -168,7 +168,7 @@ "target": "http_body" }, { - "id": "hyper 0.14.22", + "id": "hyper 0.14.23", "target": "hyper" }, { @@ -196,7 +196,7 @@ "target": "serde" }, { - "id": "serde_json 1.0.87", + "id": "serde_json 1.0.88", "target": "serde_json" }, { @@ -208,7 +208,7 @@ "target": "sync_wrapper" }, { - "id": "tokio 1.21.2", + "id": "tokio 1.22.0", "target": "tokio" }, { @@ -275,7 +275,7 @@ "deps": { "common": [ { - "id": "bytes 1.2.1", + "id": "bytes 1.3.0", "target": "bytes" }, { @@ -347,13 +347,13 @@ }, "license": "MIT/Apache-2.0" }, - "bytes 1.2.1": { + "bytes 1.3.0": { "name": "bytes", - "version": "1.2.1", + "version": "1.3.0", "repository": { "Http": { - "url": "https://crates.io/api/v1/crates/bytes/1.2.1/download", - "sha256": "ec8a7b6a70fde80372154c65702f00a0f56f3e1c36abbc6c440484be248856db" + "url": "https://crates.io/api/v1/crates/bytes/1.3.0/download", + "sha256": "dfb24e866b15a1af2a1b663f10c6b6b8f397a84aadb828f12e5b289ec23a3a3c" } }, "targets": [ @@ -380,7 +380,7 @@ "std" ], "edition": "2018", - "version": "1.2.1" + "version": "1.3.0" }, "license": "MIT" }, @@ -447,7 +447,7 @@ "target": "axum" }, { - "id": "hyper 0.14.22", + "id": "hyper 0.14.23", "target": "hyper" }, { @@ -455,7 +455,7 @@ "target": "mime" }, { - "id": "serde_json 1.0.87", + "id": "serde_json 1.0.88", "target": "serde_json" }, { @@ -463,7 +463,7 @@ "target": "socket2" }, { - "id": "tokio 1.21.2", + "id": "tokio 1.22.0", "target": "tokio" }, { @@ -910,7 +910,7 @@ "deps": { "common": [ { - "id": "bytes 1.2.1", + "id": "bytes 1.3.0", "target": "bytes" }, { @@ -934,7 +934,7 @@ "target": "http" }, { - "id": "indexmap 1.9.1", + "id": "indexmap 1.9.2", "target": "indexmap" }, { @@ -942,7 +942,7 @@ "target": "slab" }, { - "id": "tokio 1.21.2", + "id": "tokio 1.22.0", "target": "tokio" }, { @@ -1073,7 +1073,7 @@ "deps": { "common": [ { - "id": "bytes 1.2.1", + "id": "bytes 1.3.0", "target": "bytes" }, { @@ -1123,7 +1123,7 @@ "deps": { "common": [ { - "id": "bytes 1.2.1", + "id": "bytes 1.3.0", "target": "bytes" }, { @@ -1271,13 +1271,13 @@ }, "license": "MIT/Apache-2.0" }, - "hyper 0.14.22": { + "hyper 0.14.23": { "name": "hyper", - "version": "0.14.22", + "version": "0.14.23", "repository": { "Http": { - "url": "https://crates.io/api/v1/crates/hyper/0.14.22/download", - "sha256": "abfba89e19b959ca163c7752ba59d737c1ceea53a5d31a149c805446fc958064" + "url": "https://crates.io/api/v1/crates/hyper/0.14.23/download", + "sha256": "034711faac9d2166cb1baf1a2fb0b60b1f277f8492fd72176c17f3515e1abd3c" } }, "targets": [ @@ -1315,7 +1315,7 @@ "deps": { "common": [ { - "id": "bytes 1.2.1", + "id": "bytes 1.3.0", "target": "bytes" }, { @@ -1363,7 +1363,7 @@ "target": "socket2" }, { - "id": "tokio 1.21.2", + "id": "tokio 1.22.0", "target": "tokio" }, { @@ -1382,17 +1382,17 @@ "selects": {} }, "edition": "2018", - "version": "0.14.22" + "version": "0.14.23" }, "license": "MIT" }, - "indexmap 1.9.1": { + "indexmap 1.9.2": { "name": "indexmap", - "version": "1.9.1", + "version": "1.9.2", "repository": { "Http": { - "url": "https://crates.io/api/v1/crates/indexmap/1.9.1/download", - "sha256": "10a35a97730320ffe8e2d410b5d3b69279b98d2c14bdb8b70ea89ecf7888d41e" + "url": "https://crates.io/api/v1/crates/indexmap/1.9.2/download", + "sha256": "1885e79c1fc4b10f0e172c475f458b7f7b93061064d98c3293e98c5ba0c8b399" } }, "targets": [ @@ -1436,14 +1436,14 @@ "target": "hashbrown" }, { - "id": "indexmap 1.9.1", + "id": "indexmap 1.9.2", "target": "build_script_build" } ], "selects": {} }, "edition": "2021", - "version": "1.9.1" + "version": "1.9.2" }, "build_script_attrs": { "data_glob": [ @@ -1980,13 +1980,13 @@ }, "license": "MIT" }, - "num_cpus 1.13.1": { + "num_cpus 1.14.0": { "name": "num_cpus", - "version": "1.13.1", + "version": "1.14.0", "repository": { "Http": { - "url": "https://crates.io/api/v1/crates/num_cpus/1.13.1/download", - "sha256": "19e64526ebdee182341572e50e9ad03965aa510cd94427a4549448f285e957a1" + "url": "https://crates.io/api/v1/crates/num_cpus/1.14.0/download", + "sha256": "f6058e64324c71e02bc2b150e4f3bc8286db6c83092132ffa3f6b1eab0f9def5" } }, "targets": [ @@ -2026,7 +2026,7 @@ } }, "edition": "2015", - "version": "1.13.1" + "version": "1.14.0" }, "license": "MIT OR Apache-2.0" }, @@ -2737,13 +2737,13 @@ }, "license": "MIT OR Apache-2.0" }, - "serde_json 1.0.87": { + "serde_json 1.0.88": { "name": "serde_json", - "version": "1.0.87", + "version": "1.0.88", "repository": { "Http": { - "url": "https://crates.io/api/v1/crates/serde_json/1.0.87/download", - "sha256": "6ce777b7b150d76b9cf60d28b55f5847135a003f7d7350c6be7a773508ce7d45" + "url": "https://crates.io/api/v1/crates/serde_json/1.0.88/download", + "sha256": "8e8b3801309262e8184d9687fb697586833e939767aea0dda89f5a8e650e8bd7" } }, "targets": [ @@ -2797,14 +2797,14 @@ "target": "serde" }, { - "id": "serde_json 1.0.87", + "id": "serde_json 1.0.88", "target": "build_script_build" } ], "selects": {} }, "edition": "2018", - "version": "1.0.87" + "version": "1.0.88" }, "build_script_attrs": { "data_glob": [ @@ -3268,13 +3268,13 @@ }, "license": "Apache-2.0/MIT" }, - "tokio 1.21.2": { + "tokio 1.22.0": { "name": "tokio", - "version": "1.21.2", + "version": "1.22.0", "repository": { "Http": { - "url": "https://crates.io/api/v1/crates/tokio/1.21.2/download", - "sha256": "a9e03c497dc955702ba729190dc4aac6f2a0ce97f913e5b1b5912fc5039d9099" + "url": "https://crates.io/api/v1/crates/tokio/1.22.0/download", + "sha256": "d76ce4a75fb488c605c54bf610f221cea8b0dafb53333c1a67e8ee199dcd2ae3" } }, "targets": [ @@ -3336,7 +3336,7 @@ "deps": { "common": [ { - "id": "bytes 1.2.1", + "id": "bytes 1.3.0", "target": "bytes" }, { @@ -3348,7 +3348,7 @@ "target": "mio" }, { - "id": "num_cpus 1.13.1", + "id": "num_cpus 1.14.0", "target": "num_cpus" }, { @@ -3360,7 +3360,7 @@ "target": "pin_project_lite" }, { - "id": "tokio 1.21.2", + "id": "tokio 1.22.0", "target": "build_script_build" } ], @@ -3399,7 +3399,7 @@ ], "selects": {} }, - "version": "1.21.2" + "version": "1.22.0" }, "build_script_attrs": { "data_glob": [ @@ -3503,7 +3503,7 @@ "deps": { "common": [ { - "id": "bytes 1.2.1", + "id": "bytes 1.3.0", "target": "bytes" }, { @@ -3519,7 +3519,7 @@ "target": "pin_project_lite" }, { - "id": "tokio 1.21.2", + "id": "tokio 1.22.0", "target": "tokio" }, { @@ -3596,7 +3596,7 @@ "target": "pin_project_lite" }, { - "id": "tokio 1.21.2", + "id": "tokio 1.22.0", "target": "tokio" }, { @@ -3666,7 +3666,7 @@ "target": "bitflags" }, { - "id": "bytes 1.2.1", + "id": "bytes 1.3.0", "target": "bytes" }, {