From 3a7e4031b2c85f4eb3be5991b82252ca78f8ef10 Mon Sep 17 00:00:00 2001 From: David Tolnay Date: Tue, 31 Oct 2023 06:55:14 -0700 Subject: [PATCH 1/3] Support artifact dependencies in crate.spec --- crate_universe/private/crate.bzl | 33 ++++++++++++++++++++++---------- 1 file changed, 23 insertions(+), 10 deletions(-) diff --git a/crate_universe/private/crate.bzl b/crate_universe/private/crate.bzl index 15596c7b9e..f35385fd9e 100644 --- a/crate_universe/private/crate.bzl +++ b/crate_universe/private/crate.bzl @@ -18,6 +18,8 @@ def _workspace_member(version, sha256 = None): def _spec( package = None, version = None, + artifact = None, + lib = None, default_features = True, features = [], git = None, @@ -33,6 +35,8 @@ def _spec( Args: package (str, optional): The explicit name of the package (used when attempting to alias a crate). version (str, optional): The exact version of the crate. Cannot be used with `git`. + artifact (str, optional): Set to "bin" to pull in a binary crate as an artifact dependency. + lib (bool, optional): If using `artifact = "bin"`, additionally setting `lib = True` declares a dependency on both the package's library and binary, as opposed to just the binary. default_features (bool, optional): Maps to the `default-features` flag. features (list, optional): A list of features to use for the crate git (str, optional): The Git url to use for the crate. Cannot be used with `version`. @@ -43,16 +47,25 @@ def _spec( Returns: string: A json encoded string of all inputs """ - return json.encode(struct( - package = package, - default_features = default_features, - features = features, - version = version, - git = git, - branch = branch, - tag = tag, - rev = rev, - )) + return json.encode({ + k: v + for k, v in { + "package": package, + "version": version, + "artifact": artifact, + "lib": lib, + "default_features": default_features, + "features": features, + "git": git, + "branch": branch, + "tag": tag, + "rev": rev, + }.items() + # The `cargo_toml` crate parses unstable fields to a flattened + # BTreeMap and toml::Value does not support null, + # so we must omit null values. + if v != None + }) def _assert_absolute(label): """Ensure a given label is an absolute label From 17a70449d9f94ba98abf4d6fadb6867cfbc6d17c Mon Sep 17 00:00:00 2001 From: David Tolnay Date: Tue, 31 Oct 2023 07:57:57 -0700 Subject: [PATCH 2/3] Support -Zbindeps regardless of rustc version --- crate_universe/src/metadata.rs | 21 ++++----------------- 1 file changed, 4 insertions(+), 17 deletions(-) diff --git a/crate_universe/src/metadata.rs b/crate_universe/src/metadata.rs index 233ce59359..c7ce0544ca 100644 --- a/crate_universe/src/metadata.rs +++ b/crate_universe/src/metadata.rs @@ -75,10 +75,7 @@ impl MetadataGenerator for Generator { cargo_lock::Lockfile::load(lock_path)? }; - let mut other_options = vec!["--locked".to_owned()]; - if self.cargo_bin.is_nightly()? { - other_options.push("-Zbindeps".to_owned()); - } + let other_options = vec!["--locked".to_owned(), "-Zbindeps".to_owned()]; let metadata = self .cargo_bin @@ -86,6 +83,7 @@ impl MetadataGenerator for Generator { .current_dir(manifest_dir) .manifest_path(manifest_path.as_ref()) .other_options(other_options) + .env("RUSTC_BOOTSTRAP", "1") // for -Zbindeps .exec()?; Ok((metadata, lockfile)) @@ -113,9 +111,8 @@ impl Cargo { pub fn command(&self) -> Result { let mut command = Command::new(&self.path); command.envs(self.env()?); - if self.is_nightly()? { - command.arg("-Zbindeps"); - } + command.arg("-Zbindeps"); + command.env("RUSTC_BOOTSTRAP", "1"); // for -Zbindeps Ok(command) } @@ -140,16 +137,6 @@ impl Cargo { Ok(full_version.clone().unwrap()) } - pub fn is_nightly(&self) -> Result { - let full_version = self.full_version()?; - let version_str = full_version.split(' ').nth(1); - if let Some(version_str) = version_str { - let version = Version::parse(version_str).context("Failed to parse cargo version")?; - return Ok(version.pre.as_str() == "nightly"); - } - bail!("Couldn't parse cargo version"); - } - pub fn use_sparse_registries_for_crates_io(&self) -> Result { let full_version = self.full_version()?; let version_str = full_version.split(' ').nth(1); From 43b101e6b3e679b333c2622d7615233edf344624 Mon Sep 17 00:00:00 2001 From: David Tolnay Date: Tue, 31 Oct 2023 06:47:12 -0700 Subject: [PATCH 3/3] Convert cxxbridge-cmd dependency to bindep --- examples/crate_universe/WORKSPACE.bazel | 54 +- .../crate_universe/using_cxx/Cargo.Bazel.lock | 108 +++ .../using_cxx/cargo-bazel-lock.json | 623 +++++++++++- .../using_cxx/cxxbridge-cmd.Cargo.Bazel.lock | 891 ------------------ .../using_cxx/cxxbridge-cmd.Cargo.lock | 143 --- .../using_cxx/rust_cxx_bridge.bzl | 2 +- 6 files changed, 739 insertions(+), 1082 deletions(-) delete mode 100644 examples/crate_universe/using_cxx/cxxbridge-cmd.Cargo.Bazel.lock delete mode 100644 examples/crate_universe/using_cxx/cxxbridge-cmd.Cargo.lock diff --git a/examples/crate_universe/WORKSPACE.bazel b/examples/crate_universe/WORKSPACE.bazel index b96d6a3525..c235fb4dc9 100644 --- a/examples/crate_universe/WORKSPACE.bazel +++ b/examples/crate_universe/WORKSPACE.bazel @@ -299,6 +299,12 @@ no_cargo_crate_repositories() crates_repository( name = "using_cxx", + annotations = { + # FIXME: this annotation shouldn't be needed when using `artifact = "bin"` + "cxxbridge-cmd": [crate.annotation( + gen_binaries = ["cxxbridge"], + )], + }, cargo_lockfile = "//using_cxx:Cargo.Bazel.lock", # `generator` is not necessary in official releases. # See load satement for `cargo_bazel_bootstrap`. @@ -308,6 +314,10 @@ crates_repository( "cxx": crate.spec( version = "1.0.109", ), + "cxxbridge-cmd": crate.spec( + artifact = "bin", + version = "1.0.109", + ), }, splicing_config = splicing_config( resolver_version = "2", @@ -321,50 +331,6 @@ load( using_cxx_crate_repositories() -# The codegen tool needed by cxx. -http_archive( - name = "cxxbridge-cmd", - build_file_content = """ -load("@rules_rust//rust:defs.bzl", "rust_binary") -load("@cxxbridge_cmd_deps//:defs.bzl", "aliases", "all_crate_deps") - -rust_binary( - name = "cxxbridge-cmd", - srcs = glob(["src/**/*.rs"]), - aliases = aliases(), - data = [ - "src/gen/include/cxx.h", - ], - edition = "2021", - visibility = ["//visibility:public"], - deps = all_crate_deps( - normal = True, - ), -) - """, - sha256 = "d93600487d429c8bf013ee96719af4e62e809ac57fc4cac24f17cf58e4526009", - strip_prefix = "cxxbridge-cmd-1.0.109", - type = "tar.gz", - urls = ["https://crates.io/api/v1/crates/cxxbridge-cmd/1.0.109/download"], -) - -crates_repository( - name = "cxxbridge_cmd_deps", - cargo_lockfile = "//using_cxx:cxxbridge-cmd.Cargo.lock", - # `generator` is not necessary in official releases. - # See load satement for `cargo_bazel_bootstrap`. - generator = "@cargo_bazel_bootstrap//:cargo-bazel", - lockfile = "//using_cxx:cxxbridge-cmd.Cargo.Bazel.lock", - manifests = ["@cxxbridge-cmd//:Cargo.toml"], - splicing_config = splicing_config( - resolver_version = "2", - ), -) - -load("@cxxbridge_cmd_deps//:defs.bzl", cxxbridge_cmd_deps = "crate_repositories") - -cxxbridge_cmd_deps() - ############################################################################### # V E N D O R E X T E R N A L ############################################################################### diff --git a/examples/crate_universe/using_cxx/Cargo.Bazel.lock b/examples/crate_universe/using_cxx/Cargo.Bazel.lock index a630cdd53c..ab096f0c46 100644 --- a/examples/crate_universe/using_cxx/Cargo.Bazel.lock +++ b/examples/crate_universe/using_cxx/Cargo.Bazel.lock @@ -2,6 +2,12 @@ # It is not intended for manual editing. version = 3 +[[package]] +name = "anstyle" +version = "1.0.4" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "7079075b41f533b8c61d2a4d073c4676e1f8b249ff94a393b0595db304e0dd87" + [[package]] name = "cc" version = "1.0.82" @@ -11,6 +17,42 @@ dependencies = [ "libc", ] +[[package]] +name = "clap" +version = "4.4.7" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "ac495e00dcec98c83465d5ad66c5c4fabd652fd6686e7c6269b117e729a6f17b" +dependencies = [ + "clap_builder", +] + +[[package]] +name = "clap_builder" +version = "4.4.7" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "c77ed9a32a62e6ca27175d00d29d05ca32e396ea1eb5fb01d8256b669cec7663" +dependencies = [ + "anstyle", + "clap_lex", + "strsim", +] + +[[package]] +name = "clap_lex" +version = "0.6.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "702fc72eb24e5a1e48ce58027a675bc24edd52096d5397d4aea7c6dd9eca0bd1" + +[[package]] +name = "codespan-reporting" +version = "0.11.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "3538270d33cc669650c4b093848450d380def10c331d38c768e34cac80576e6e" +dependencies = [ + "termcolor", + "unicode-width", +] + [[package]] name = "cxx" version = "1.0.109" @@ -23,6 +65,19 @@ dependencies = [ "link-cplusplus", ] +[[package]] +name = "cxxbridge-cmd" +version = "1.0.110" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "dc5db43c367778010dff55b602f71eccff712b8edf54a3f08687bd1c7cbad6df" +dependencies = [ + "clap", + "codespan-reporting", + "proc-macro2", + "quote", + "syn", +] + [[package]] name = "cxxbridge-flags" version = "1.0.109" @@ -45,6 +100,7 @@ name = "direct-cargo-bazel-deps" version = "0.0.1" dependencies = [ "cxx", + "cxxbridge-cmd", ] [[package]] @@ -80,6 +136,12 @@ dependencies = [ "proc-macro2", ] +[[package]] +name = "strsim" +version = "0.10.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "73473c0e59e6d5812c5dfe2a064a6444949f089e20eec9a2e5506596494e4623" + [[package]] name = "syn" version = "2.0.28" @@ -91,8 +153,54 @@ dependencies = [ "unicode-ident", ] +[[package]] +name = "termcolor" +version = "1.3.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "6093bad37da69aab9d123a8091e4be0aa4a03e4d601ec641c327398315f62b64" +dependencies = [ + "winapi-util", +] + [[package]] name = "unicode-ident" version = "1.0.11" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "301abaae475aa91687eb82514b328ab47a211a533026cb25fc3e519b86adfc3c" + +[[package]] +name = "unicode-width" +version = "0.1.11" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "e51733f11c9c4f72aa0c160008246859e340b00807569a0da0e7a1079b27ba85" + +[[package]] +name = "winapi" +version = "0.3.9" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "5c839a674fcd7a98952e593242ea400abe93992746761e38641405d28b00f419" +dependencies = [ + "winapi-i686-pc-windows-gnu", + "winapi-x86_64-pc-windows-gnu", +] + +[[package]] +name = "winapi-i686-pc-windows-gnu" +version = "0.4.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "ac3b87c63620426dd9b991e5ce0329eff545bccbbb34f3be09ff6fb6ab51b7b6" + +[[package]] +name = "winapi-util" +version = "0.1.6" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "f29e6f9198ba0d26b4c9f07dbe6f9ed633e1f3d5b8b414090084349e46a52596" +dependencies = [ + "winapi", +] + +[[package]] +name = "winapi-x86_64-pc-windows-gnu" +version = "0.4.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "712e227841d057c1ee1cd2fb22fa7e5a5461ae8e48fa2ca79ec42cfc1931183f" diff --git a/examples/crate_universe/using_cxx/cargo-bazel-lock.json b/examples/crate_universe/using_cxx/cargo-bazel-lock.json index 83dfb4ad3c..69dc20f97e 100644 --- a/examples/crate_universe/using_cxx/cargo-bazel-lock.json +++ b/examples/crate_universe/using_cxx/cargo-bazel-lock.json @@ -1,6 +1,43 @@ { - "checksum": "71f166de405c74377a40b5f7d9494231e9a6137c44cf3f97bc6369c753ff00dc", + "checksum": "560bec296b4210270e7dee08b37d238fdf176c8f184abd18b57115c01c90d5dd", "crates": { + "anstyle 1.0.4": { + "name": "anstyle", + "version": "1.0.4", + "repository": { + "Http": { + "url": "https://crates.io/api/v1/crates/anstyle/1.0.4/download", + "sha256": "7079075b41f533b8c61d2a4d073c4676e1f8b249ff94a393b0595db304e0dd87" + } + }, + "targets": [ + { + "Library": { + "crate_name": "anstyle", + "crate_root": "src/lib.rs", + "srcs": [ + "**/*.rs" + ] + } + } + ], + "library_target_name": "anstyle", + "common_attrs": { + "compile_data_glob": [ + "**" + ], + "crate_features": { + "common": [ + "default", + "std" + ], + "selects": {} + }, + "edition": "2021", + "version": "1.0.4" + }, + "license": "MIT OR Apache-2.0" + }, "cc 1.0.82": { "name": "cc", "version": "1.0.82", @@ -42,6 +79,185 @@ }, "license": "MIT OR Apache-2.0" }, + "clap 4.4.7": { + "name": "clap", + "version": "4.4.7", + "repository": { + "Http": { + "url": "https://crates.io/api/v1/crates/clap/4.4.7/download", + "sha256": "ac495e00dcec98c83465d5ad66c5c4fabd652fd6686e7c6269b117e729a6f17b" + } + }, + "targets": [ + { + "Library": { + "crate_name": "clap", + "crate_root": "src/lib.rs", + "srcs": [ + "**/*.rs" + ] + } + } + ], + "library_target_name": "clap", + "common_attrs": { + "compile_data_glob": [ + "**" + ], + "crate_features": { + "common": [ + "error-context", + "help", + "std", + "suggestions", + "usage" + ], + "selects": {} + }, + "deps": { + "common": [ + { + "id": "clap_builder 4.4.7", + "target": "clap_builder" + } + ], + "selects": {} + }, + "edition": "2021", + "version": "4.4.7" + }, + "license": "MIT OR Apache-2.0" + }, + "clap_builder 4.4.7": { + "name": "clap_builder", + "version": "4.4.7", + "repository": { + "Http": { + "url": "https://crates.io/api/v1/crates/clap_builder/4.4.7/download", + "sha256": "c77ed9a32a62e6ca27175d00d29d05ca32e396ea1eb5fb01d8256b669cec7663" + } + }, + "targets": [ + { + "Library": { + "crate_name": "clap_builder", + "crate_root": "src/lib.rs", + "srcs": [ + "**/*.rs" + ] + } + } + ], + "library_target_name": "clap_builder", + "common_attrs": { + "compile_data_glob": [ + "**" + ], + "crate_features": { + "common": [ + "error-context", + "help", + "std", + "suggestions", + "usage" + ], + "selects": {} + }, + "deps": { + "common": [ + { + "id": "anstyle 1.0.4", + "target": "anstyle" + }, + { + "id": "clap_lex 0.6.0", + "target": "clap_lex" + }, + { + "id": "strsim 0.10.0", + "target": "strsim" + } + ], + "selects": {} + }, + "edition": "2021", + "version": "4.4.7" + }, + "license": "MIT OR Apache-2.0" + }, + "clap_lex 0.6.0": { + "name": "clap_lex", + "version": "0.6.0", + "repository": { + "Http": { + "url": "https://crates.io/api/v1/crates/clap_lex/0.6.0/download", + "sha256": "702fc72eb24e5a1e48ce58027a675bc24edd52096d5397d4aea7c6dd9eca0bd1" + } + }, + "targets": [ + { + "Library": { + "crate_name": "clap_lex", + "crate_root": "src/lib.rs", + "srcs": [ + "**/*.rs" + ] + } + } + ], + "library_target_name": "clap_lex", + "common_attrs": { + "compile_data_glob": [ + "**" + ], + "edition": "2021", + "version": "0.6.0" + }, + "license": "MIT OR Apache-2.0" + }, + "codespan-reporting 0.11.1": { + "name": "codespan-reporting", + "version": "0.11.1", + "repository": { + "Http": { + "url": "https://crates.io/api/v1/crates/codespan-reporting/0.11.1/download", + "sha256": "3538270d33cc669650c4b093848450d380def10c331d38c768e34cac80576e6e" + } + }, + "targets": [ + { + "Library": { + "crate_name": "codespan_reporting", + "crate_root": "src/lib.rs", + "srcs": [ + "**/*.rs" + ] + } + } + ], + "library_target_name": "codespan_reporting", + "common_attrs": { + "compile_data_glob": [ + "**" + ], + "deps": { + "common": [ + { + "id": "termcolor 1.3.0", + "target": "termcolor" + }, + { + "id": "unicode-width 0.1.11", + "target": "unicode_width" + } + ], + "selects": {} + }, + "edition": "2018", + "version": "0.11.1" + }, + "license": "Apache-2.0" + }, "cxx 1.0.109": { "name": "cxx", "version": "1.0.109", @@ -108,6 +324,61 @@ "cxx_cc": "cxx_cc" } }, + "cxxbridge-cmd 1.0.110": { + "name": "cxxbridge-cmd", + "version": "1.0.110", + "repository": { + "Http": { + "url": "https://crates.io/api/v1/crates/cxxbridge-cmd/1.0.110/download", + "sha256": "dc5db43c367778010dff55b602f71eccff712b8edf54a3f08687bd1c7cbad6df" + } + }, + "targets": [ + { + "Binary": { + "crate_name": "cxxbridge", + "crate_root": "src/main.rs", + "srcs": [ + "**/*.rs" + ] + } + } + ], + "library_target_name": null, + "common_attrs": { + "compile_data_glob": [ + "**" + ], + "deps": { + "common": [ + { + "id": "clap 4.4.7", + "target": "clap" + }, + { + "id": "codespan-reporting 0.11.1", + "target": "codespan_reporting" + }, + { + "id": "proc-macro2 1.0.66", + "target": "proc_macro2" + }, + { + "id": "quote 1.0.32", + "target": "quote" + }, + { + "id": "syn 2.0.28", + "target": "syn" + } + ], + "selects": {} + }, + "edition": "2021", + "version": "1.0.110" + }, + "license": "MIT OR Apache-2.0" + }, "cxxbridge-flags 1.0.109": { "name": "cxxbridge-flags", "version": "1.0.109", @@ -391,7 +662,8 @@ "crate_features": { "common": [ "default", - "proc-macro" + "proc-macro", + "span-locations" ], "selects": {} }, @@ -464,6 +736,36 @@ }, "license": "MIT OR Apache-2.0" }, + "strsim 0.10.0": { + "name": "strsim", + "version": "0.10.0", + "repository": { + "Http": { + "url": "https://crates.io/api/v1/crates/strsim/0.10.0/download", + "sha256": "73473c0e59e6d5812c5dfe2a064a6444949f089e20eec9a2e5506596494e4623" + } + }, + "targets": [ + { + "Library": { + "crate_name": "strsim", + "crate_root": "src/lib.rs", + "srcs": [ + "**/*.rs" + ] + } + } + ], + "library_target_name": "strsim", + "common_attrs": { + "compile_data_glob": [ + "**" + ], + "edition": "2015", + "version": "0.10.0" + }, + "license": "MIT" + }, "syn 2.0.28": { "name": "syn", "version": "2.0.28", @@ -524,6 +826,47 @@ }, "license": "MIT OR Apache-2.0" }, + "termcolor 1.3.0": { + "name": "termcolor", + "version": "1.3.0", + "repository": { + "Http": { + "url": "https://crates.io/api/v1/crates/termcolor/1.3.0/download", + "sha256": "6093bad37da69aab9d123a8091e4be0aa4a03e4d601ec641c327398315f62b64" + } + }, + "targets": [ + { + "Library": { + "crate_name": "termcolor", + "crate_root": "src/lib.rs", + "srcs": [ + "**/*.rs" + ] + } + } + ], + "library_target_name": "termcolor", + "common_attrs": { + "compile_data_glob": [ + "**" + ], + "deps": { + "common": [], + "selects": { + "cfg(windows)": [ + { + "id": "winapi-util 0.1.6", + "target": "winapi_util" + } + ] + } + }, + "edition": "2018", + "version": "1.3.0" + }, + "license": "Unlicense OR MIT" + }, "unicode-ident 1.0.11": { "name": "unicode-ident", "version": "1.0.11", @@ -553,9 +896,276 @@ "version": "1.0.11" }, "license": "(MIT OR Apache-2.0) AND Unicode-DFS-2016" + }, + "unicode-width 0.1.11": { + "name": "unicode-width", + "version": "0.1.11", + "repository": { + "Http": { + "url": "https://crates.io/api/v1/crates/unicode-width/0.1.11/download", + "sha256": "e51733f11c9c4f72aa0c160008246859e340b00807569a0da0e7a1079b27ba85" + } + }, + "targets": [ + { + "Library": { + "crate_name": "unicode_width", + "crate_root": "src/lib.rs", + "srcs": [ + "**/*.rs" + ] + } + } + ], + "library_target_name": "unicode_width", + "common_attrs": { + "compile_data_glob": [ + "**" + ], + "crate_features": { + "common": [ + "default" + ], + "selects": {} + }, + "edition": "2015", + "version": "0.1.11" + }, + "license": "MIT/Apache-2.0" + }, + "winapi 0.3.9": { + "name": "winapi", + "version": "0.3.9", + "repository": { + "Http": { + "url": "https://crates.io/api/v1/crates/winapi/0.3.9/download", + "sha256": "5c839a674fcd7a98952e593242ea400abe93992746761e38641405d28b00f419" + } + }, + "targets": [ + { + "Library": { + "crate_name": "winapi", + "crate_root": "src/lib.rs", + "srcs": [ + "**/*.rs" + ] + } + }, + { + "BuildScript": { + "crate_name": "build_script_build", + "crate_root": "build.rs", + "srcs": [ + "**/*.rs" + ] + } + } + ], + "library_target_name": "winapi", + "common_attrs": { + "compile_data_glob": [ + "**" + ], + "crate_features": { + "common": [ + "consoleapi", + "errhandlingapi", + "fileapi", + "minwindef", + "processenv", + "std", + "sysinfoapi", + "winbase", + "wincon", + "winerror", + "winnt" + ], + "selects": {} + }, + "deps": { + "common": [ + { + "id": "winapi 0.3.9", + "target": "build_script_build" + } + ], + "selects": { + "i686-pc-windows-gnu": [ + { + "id": "winapi-i686-pc-windows-gnu 0.4.0", + "target": "winapi_i686_pc_windows_gnu" + } + ], + "x86_64-pc-windows-gnu": [ + { + "id": "winapi-x86_64-pc-windows-gnu 0.4.0", + "target": "winapi_x86_64_pc_windows_gnu" + } + ] + } + }, + "edition": "2015", + "version": "0.3.9" + }, + "build_script_attrs": { + "data_glob": [ + "**" + ] + }, + "license": "MIT/Apache-2.0" + }, + "winapi-i686-pc-windows-gnu 0.4.0": { + "name": "winapi-i686-pc-windows-gnu", + "version": "0.4.0", + "repository": { + "Http": { + "url": "https://crates.io/api/v1/crates/winapi-i686-pc-windows-gnu/0.4.0/download", + "sha256": "ac3b87c63620426dd9b991e5ce0329eff545bccbbb34f3be09ff6fb6ab51b7b6" + } + }, + "targets": [ + { + "Library": { + "crate_name": "winapi_i686_pc_windows_gnu", + "crate_root": "src/lib.rs", + "srcs": [ + "**/*.rs" + ] + } + }, + { + "BuildScript": { + "crate_name": "build_script_build", + "crate_root": "build.rs", + "srcs": [ + "**/*.rs" + ] + } + } + ], + "library_target_name": "winapi_i686_pc_windows_gnu", + "common_attrs": { + "compile_data_glob": [ + "**" + ], + "deps": { + "common": [ + { + "id": "winapi-i686-pc-windows-gnu 0.4.0", + "target": "build_script_build" + } + ], + "selects": {} + }, + "edition": "2015", + "version": "0.4.0" + }, + "build_script_attrs": { + "data_glob": [ + "**" + ] + }, + "license": "MIT/Apache-2.0" + }, + "winapi-util 0.1.6": { + "name": "winapi-util", + "version": "0.1.6", + "repository": { + "Http": { + "url": "https://crates.io/api/v1/crates/winapi-util/0.1.6/download", + "sha256": "f29e6f9198ba0d26b4c9f07dbe6f9ed633e1f3d5b8b414090084349e46a52596" + } + }, + "targets": [ + { + "Library": { + "crate_name": "winapi_util", + "crate_root": "src/lib.rs", + "srcs": [ + "**/*.rs" + ] + } + } + ], + "library_target_name": "winapi_util", + "common_attrs": { + "compile_data_glob": [ + "**" + ], + "deps": { + "common": [], + "selects": { + "cfg(windows)": [ + { + "id": "winapi 0.3.9", + "target": "winapi" + } + ] + } + }, + "edition": "2021", + "version": "0.1.6" + }, + "license": "Unlicense/MIT" + }, + "winapi-x86_64-pc-windows-gnu 0.4.0": { + "name": "winapi-x86_64-pc-windows-gnu", + "version": "0.4.0", + "repository": { + "Http": { + "url": "https://crates.io/api/v1/crates/winapi-x86_64-pc-windows-gnu/0.4.0/download", + "sha256": "712e227841d057c1ee1cd2fb22fa7e5a5461ae8e48fa2ca79ec42cfc1931183f" + } + }, + "targets": [ + { + "Library": { + "crate_name": "winapi_x86_64_pc_windows_gnu", + "crate_root": "src/lib.rs", + "srcs": [ + "**/*.rs" + ] + } + }, + { + "BuildScript": { + "crate_name": "build_script_build", + "crate_root": "build.rs", + "srcs": [ + "**/*.rs" + ] + } + } + ], + "library_target_name": "winapi_x86_64_pc_windows_gnu", + "common_attrs": { + "compile_data_glob": [ + "**" + ], + "deps": { + "common": [ + { + "id": "winapi-x86_64-pc-windows-gnu 0.4.0", + "target": "build_script_build" + } + ], + "selects": {} + }, + "edition": "2015", + "version": "0.4.0" + }, + "build_script_attrs": { + "data_glob": [ + "**" + ] + }, + "license": "MIT/Apache-2.0" } }, - "binary_crates": [], + "binary_crates": [ + "cxxbridge-cmd 1.0.110" + ], "workspace_members": { "direct-cargo-bazel-deps 0.0.1": "" }, @@ -613,12 +1223,18 @@ "x86_64-unknown-freebsd", "x86_64-unknown-linux-gnu" ], + "cfg(windows)": [ + "aarch64-pc-windows-msvc", + "i686-pc-windows-msvc", + "x86_64-pc-windows-msvc" + ], "i686-apple-darwin": [ "i686-apple-darwin" ], "i686-linux-android": [ "i686-linux-android" ], + "i686-pc-windows-gnu": [], "i686-pc-windows-msvc": [ "i686-pc-windows-msvc" ], @@ -664,6 +1280,7 @@ "x86_64-linux-android": [ "x86_64-linux-android" ], + "x86_64-pc-windows-gnu": [], "x86_64-pc-windows-msvc": [ "x86_64-pc-windows-msvc" ], diff --git a/examples/crate_universe/using_cxx/cxxbridge-cmd.Cargo.Bazel.lock b/examples/crate_universe/using_cxx/cxxbridge-cmd.Cargo.Bazel.lock deleted file mode 100644 index b534cc54a0..0000000000 --- a/examples/crate_universe/using_cxx/cxxbridge-cmd.Cargo.Bazel.lock +++ /dev/null @@ -1,891 +0,0 @@ -{ - "checksum": "25bdd583eed6ec00fc621b2303086dc902bed60668ab39c3779eafaf8d63d598", - "crates": { - "anstyle 1.0.1": { - "name": "anstyle", - "version": "1.0.1", - "repository": { - "Http": { - "url": "https://crates.io/api/v1/crates/anstyle/1.0.1/download", - "sha256": "3a30da5c5f2d5e72842e00bcb57657162cdabef0931f40e2deb9b4140440cecd" - } - }, - "targets": [ - { - "Library": { - "crate_name": "anstyle", - "crate_root": "src/lib.rs", - "srcs": [ - "**/*.rs" - ] - } - } - ], - "library_target_name": "anstyle", - "common_attrs": { - "compile_data_glob": [ - "**" - ], - "crate_features": { - "common": [ - "default", - "std" - ], - "selects": {} - }, - "edition": "2021", - "version": "1.0.1" - }, - "license": "MIT OR Apache-2.0" - }, - "clap 4.3.21": { - "name": "clap", - "version": "4.3.21", - "repository": { - "Http": { - "url": "https://crates.io/api/v1/crates/clap/4.3.21/download", - "sha256": "c27cdf28c0f604ba3f512b0c9a409f8de8513e4816705deb0498b627e7c3a3fd" - } - }, - "targets": [ - { - "Library": { - "crate_name": "clap", - "crate_root": "src/lib.rs", - "srcs": [ - "**/*.rs" - ] - } - } - ], - "library_target_name": "clap", - "common_attrs": { - "compile_data_glob": [ - "**" - ], - "crate_features": { - "common": [ - "error-context", - "help", - "std", - "suggestions", - "usage" - ], - "selects": {} - }, - "deps": { - "common": [ - { - "id": "clap_builder 4.3.21", - "target": "clap_builder" - } - ], - "selects": {} - }, - "edition": "2021", - "version": "4.3.21" - }, - "license": "MIT OR Apache-2.0" - }, - "clap_builder 4.3.21": { - "name": "clap_builder", - "version": "4.3.21", - "repository": { - "Http": { - "url": "https://crates.io/api/v1/crates/clap_builder/4.3.21/download", - "sha256": "08a9f1ab5e9f01a9b81f202e8562eb9a10de70abf9eaeac1be465c28b75aa4aa" - } - }, - "targets": [ - { - "Library": { - "crate_name": "clap_builder", - "crate_root": "src/lib.rs", - "srcs": [ - "**/*.rs" - ] - } - } - ], - "library_target_name": "clap_builder", - "common_attrs": { - "compile_data_glob": [ - "**" - ], - "crate_features": { - "common": [ - "error-context", - "help", - "std", - "suggestions", - "usage" - ], - "selects": {} - }, - "deps": { - "common": [ - { - "id": "anstyle 1.0.1", - "target": "anstyle" - }, - { - "id": "clap_lex 0.5.0", - "target": "clap_lex" - }, - { - "id": "strsim 0.10.0", - "target": "strsim" - } - ], - "selects": {} - }, - "edition": "2021", - "version": "4.3.21" - }, - "license": "MIT OR Apache-2.0" - }, - "clap_lex 0.5.0": { - "name": "clap_lex", - "version": "0.5.0", - "repository": { - "Http": { - "url": "https://crates.io/api/v1/crates/clap_lex/0.5.0/download", - "sha256": "2da6da31387c7e4ef160ffab6d5e7f00c42626fe39aea70a7b0f1773f7dd6c1b" - } - }, - "targets": [ - { - "Library": { - "crate_name": "clap_lex", - "crate_root": "src/lib.rs", - "srcs": [ - "**/*.rs" - ] - } - } - ], - "library_target_name": "clap_lex", - "common_attrs": { - "compile_data_glob": [ - "**" - ], - "edition": "2021", - "version": "0.5.0" - }, - "license": "MIT OR Apache-2.0" - }, - "codespan-reporting 0.11.1": { - "name": "codespan-reporting", - "version": "0.11.1", - "repository": { - "Http": { - "url": "https://crates.io/api/v1/crates/codespan-reporting/0.11.1/download", - "sha256": "3538270d33cc669650c4b093848450d380def10c331d38c768e34cac80576e6e" - } - }, - "targets": [ - { - "Library": { - "crate_name": "codespan_reporting", - "crate_root": "src/lib.rs", - "srcs": [ - "**/*.rs" - ] - } - } - ], - "library_target_name": "codespan_reporting", - "common_attrs": { - "compile_data_glob": [ - "**" - ], - "deps": { - "common": [ - { - "id": "termcolor 1.2.0", - "target": "termcolor" - }, - { - "id": "unicode-width 0.1.10", - "target": "unicode_width" - } - ], - "selects": {} - }, - "edition": "2018", - "version": "0.11.1" - }, - "license": "Apache-2.0" - }, - "cxxbridge-cmd 1.0.109": { - "name": "cxxbridge-cmd", - "version": "1.0.109", - "repository": null, - "targets": [], - "library_target_name": null, - "common_attrs": { - "compile_data_glob": [ - "**" - ], - "deps": { - "common": [ - { - "id": "clap 4.3.21", - "target": "clap" - }, - { - "id": "codespan-reporting 0.11.1", - "target": "codespan_reporting" - }, - { - "id": "proc-macro2 1.0.66", - "target": "proc_macro2" - }, - { - "id": "quote 1.0.32", - "target": "quote" - }, - { - "id": "syn 2.0.28", - "target": "syn" - } - ], - "selects": {} - }, - "edition": "2021", - "version": "1.0.109" - }, - "license": "MIT OR Apache-2.0" - }, - "proc-macro2 1.0.66": { - "name": "proc-macro2", - "version": "1.0.66", - "repository": { - "Http": { - "url": "https://crates.io/api/v1/crates/proc-macro2/1.0.66/download", - "sha256": "18fb31db3f9bddb2ea821cde30a9f70117e3f119938b5ee630b7403aa6e2ead9" - } - }, - "targets": [ - { - "Library": { - "crate_name": "proc_macro2", - "crate_root": "src/lib.rs", - "srcs": [ - "**/*.rs" - ] - } - }, - { - "BuildScript": { - "crate_name": "build_script_build", - "crate_root": "build.rs", - "srcs": [ - "**/*.rs" - ] - } - } - ], - "library_target_name": "proc_macro2", - "common_attrs": { - "compile_data_glob": [ - "**" - ], - "crate_features": { - "common": [ - "span-locations" - ], - "selects": {} - }, - "deps": { - "common": [ - { - "id": "proc-macro2 1.0.66", - "target": "build_script_build" - }, - { - "id": "unicode-ident 1.0.11", - "target": "unicode_ident" - } - ], - "selects": {} - }, - "edition": "2021", - "version": "1.0.66" - }, - "build_script_attrs": { - "data_glob": [ - "**" - ] - }, - "license": "MIT OR Apache-2.0" - }, - "quote 1.0.32": { - "name": "quote", - "version": "1.0.32", - "repository": { - "Http": { - "url": "https://crates.io/api/v1/crates/quote/1.0.32/download", - "sha256": "50f3b39ccfb720540debaa0164757101c08ecb8d326b15358ce76a62c7e85965" - } - }, - "targets": [ - { - "Library": { - "crate_name": "quote", - "crate_root": "src/lib.rs", - "srcs": [ - "**/*.rs" - ] - } - } - ], - "library_target_name": "quote", - "common_attrs": { - "compile_data_glob": [ - "**" - ], - "deps": { - "common": [ - { - "id": "proc-macro2 1.0.66", - "target": "proc_macro2" - } - ], - "selects": {} - }, - "edition": "2018", - "version": "1.0.32" - }, - "license": "MIT OR Apache-2.0" - }, - "strsim 0.10.0": { - "name": "strsim", - "version": "0.10.0", - "repository": { - "Http": { - "url": "https://crates.io/api/v1/crates/strsim/0.10.0/download", - "sha256": "73473c0e59e6d5812c5dfe2a064a6444949f089e20eec9a2e5506596494e4623" - } - }, - "targets": [ - { - "Library": { - "crate_name": "strsim", - "crate_root": "src/lib.rs", - "srcs": [ - "**/*.rs" - ] - } - } - ], - "library_target_name": "strsim", - "common_attrs": { - "compile_data_glob": [ - "**" - ], - "edition": "2015", - "version": "0.10.0" - }, - "license": "MIT" - }, - "syn 2.0.28": { - "name": "syn", - "version": "2.0.28", - "repository": { - "Http": { - "url": "https://crates.io/api/v1/crates/syn/2.0.28/download", - "sha256": "04361975b3f5e348b2189d8dc55bc942f278b2d482a6a0365de5bdd62d351567" - } - }, - "targets": [ - { - "Library": { - "crate_name": "syn", - "crate_root": "src/lib.rs", - "srcs": [ - "**/*.rs" - ] - } - } - ], - "library_target_name": "syn", - "common_attrs": { - "compile_data_glob": [ - "**" - ], - "crate_features": { - "common": [ - "clone-impls", - "full", - "parsing", - "printing", - "quote" - ], - "selects": {} - }, - "deps": { - "common": [ - { - "id": "proc-macro2 1.0.66", - "target": "proc_macro2" - }, - { - "id": "quote 1.0.32", - "target": "quote" - }, - { - "id": "unicode-ident 1.0.11", - "target": "unicode_ident" - } - ], - "selects": {} - }, - "edition": "2021", - "version": "2.0.28" - }, - "license": "MIT OR Apache-2.0" - }, - "termcolor 1.2.0": { - "name": "termcolor", - "version": "1.2.0", - "repository": { - "Http": { - "url": "https://crates.io/api/v1/crates/termcolor/1.2.0/download", - "sha256": "be55cf8942feac5c765c2c993422806843c9a9a45d4d5c407ad6dd2ea95eb9b6" - } - }, - "targets": [ - { - "Library": { - "crate_name": "termcolor", - "crate_root": "src/lib.rs", - "srcs": [ - "**/*.rs" - ] - } - } - ], - "library_target_name": "termcolor", - "common_attrs": { - "compile_data_glob": [ - "**" - ], - "deps": { - "common": [], - "selects": { - "cfg(windows)": [ - { - "id": "winapi-util 0.1.5", - "target": "winapi_util" - } - ] - } - }, - "edition": "2018", - "version": "1.2.0" - }, - "license": "Unlicense OR MIT" - }, - "unicode-ident 1.0.11": { - "name": "unicode-ident", - "version": "1.0.11", - "repository": { - "Http": { - "url": "https://crates.io/api/v1/crates/unicode-ident/1.0.11/download", - "sha256": "301abaae475aa91687eb82514b328ab47a211a533026cb25fc3e519b86adfc3c" - } - }, - "targets": [ - { - "Library": { - "crate_name": "unicode_ident", - "crate_root": "src/lib.rs", - "srcs": [ - "**/*.rs" - ] - } - } - ], - "library_target_name": "unicode_ident", - "common_attrs": { - "compile_data_glob": [ - "**" - ], - "edition": "2018", - "version": "1.0.11" - }, - "license": "(MIT OR Apache-2.0) AND Unicode-DFS-2016" - }, - "unicode-width 0.1.10": { - "name": "unicode-width", - "version": "0.1.10", - "repository": { - "Http": { - "url": "https://crates.io/api/v1/crates/unicode-width/0.1.10/download", - "sha256": "c0edd1e5b14653f783770bce4a4dabb4a5108a5370a5f5d8cfe8710c361f6c8b" - } - }, - "targets": [ - { - "Library": { - "crate_name": "unicode_width", - "crate_root": "src/lib.rs", - "srcs": [ - "**/*.rs" - ] - } - } - ], - "library_target_name": "unicode_width", - "common_attrs": { - "compile_data_glob": [ - "**" - ], - "crate_features": { - "common": [ - "default" - ], - "selects": {} - }, - "edition": "2015", - "version": "0.1.10" - }, - "license": "MIT/Apache-2.0" - }, - "winapi 0.3.9": { - "name": "winapi", - "version": "0.3.9", - "repository": { - "Http": { - "url": "https://crates.io/api/v1/crates/winapi/0.3.9/download", - "sha256": "5c839a674fcd7a98952e593242ea400abe93992746761e38641405d28b00f419" - } - }, - "targets": [ - { - "Library": { - "crate_name": "winapi", - "crate_root": "src/lib.rs", - "srcs": [ - "**/*.rs" - ] - } - }, - { - "BuildScript": { - "crate_name": "build_script_build", - "crate_root": "build.rs", - "srcs": [ - "**/*.rs" - ] - } - } - ], - "library_target_name": "winapi", - "common_attrs": { - "compile_data_glob": [ - "**" - ], - "crate_features": { - "common": [ - "consoleapi", - "errhandlingapi", - "fileapi", - "minwindef", - "processenv", - "std", - "winbase", - "wincon", - "winerror", - "winnt" - ], - "selects": {} - }, - "deps": { - "common": [ - { - "id": "winapi 0.3.9", - "target": "build_script_build" - } - ], - "selects": { - "i686-pc-windows-gnu": [ - { - "id": "winapi-i686-pc-windows-gnu 0.4.0", - "target": "winapi_i686_pc_windows_gnu" - } - ], - "x86_64-pc-windows-gnu": [ - { - "id": "winapi-x86_64-pc-windows-gnu 0.4.0", - "target": "winapi_x86_64_pc_windows_gnu" - } - ] - } - }, - "edition": "2015", - "version": "0.3.9" - }, - "build_script_attrs": { - "data_glob": [ - "**" - ] - }, - "license": "MIT/Apache-2.0" - }, - "winapi-i686-pc-windows-gnu 0.4.0": { - "name": "winapi-i686-pc-windows-gnu", - "version": "0.4.0", - "repository": { - "Http": { - "url": "https://crates.io/api/v1/crates/winapi-i686-pc-windows-gnu/0.4.0/download", - "sha256": "ac3b87c63620426dd9b991e5ce0329eff545bccbbb34f3be09ff6fb6ab51b7b6" - } - }, - "targets": [ - { - "Library": { - "crate_name": "winapi_i686_pc_windows_gnu", - "crate_root": "src/lib.rs", - "srcs": [ - "**/*.rs" - ] - } - }, - { - "BuildScript": { - "crate_name": "build_script_build", - "crate_root": "build.rs", - "srcs": [ - "**/*.rs" - ] - } - } - ], - "library_target_name": "winapi_i686_pc_windows_gnu", - "common_attrs": { - "compile_data_glob": [ - "**" - ], - "deps": { - "common": [ - { - "id": "winapi-i686-pc-windows-gnu 0.4.0", - "target": "build_script_build" - } - ], - "selects": {} - }, - "edition": "2015", - "version": "0.4.0" - }, - "build_script_attrs": { - "data_glob": [ - "**" - ] - }, - "license": "MIT/Apache-2.0" - }, - "winapi-util 0.1.5": { - "name": "winapi-util", - "version": "0.1.5", - "repository": { - "Http": { - "url": "https://crates.io/api/v1/crates/winapi-util/0.1.5/download", - "sha256": "70ec6ce85bb158151cae5e5c87f95a8e97d2c0c4b001223f33a334e3ce5de178" - } - }, - "targets": [ - { - "Library": { - "crate_name": "winapi_util", - "crate_root": "src/lib.rs", - "srcs": [ - "**/*.rs" - ] - } - } - ], - "library_target_name": "winapi_util", - "common_attrs": { - "compile_data_glob": [ - "**" - ], - "deps": { - "common": [], - "selects": { - "cfg(windows)": [ - { - "id": "winapi 0.3.9", - "target": "winapi" - } - ] - } - }, - "edition": "2018", - "version": "0.1.5" - }, - "license": "Unlicense/MIT" - }, - "winapi-x86_64-pc-windows-gnu 0.4.0": { - "name": "winapi-x86_64-pc-windows-gnu", - "version": "0.4.0", - "repository": { - "Http": { - "url": "https://crates.io/api/v1/crates/winapi-x86_64-pc-windows-gnu/0.4.0/download", - "sha256": "712e227841d057c1ee1cd2fb22fa7e5a5461ae8e48fa2ca79ec42cfc1931183f" - } - }, - "targets": [ - { - "Library": { - "crate_name": "winapi_x86_64_pc_windows_gnu", - "crate_root": "src/lib.rs", - "srcs": [ - "**/*.rs" - ] - } - }, - { - "BuildScript": { - "crate_name": "build_script_build", - "crate_root": "build.rs", - "srcs": [ - "**/*.rs" - ] - } - } - ], - "library_target_name": "winapi_x86_64_pc_windows_gnu", - "common_attrs": { - "compile_data_glob": [ - "**" - ], - "deps": { - "common": [ - { - "id": "winapi-x86_64-pc-windows-gnu 0.4.0", - "target": "build_script_build" - } - ], - "selects": {} - }, - "edition": "2015", - "version": "0.4.0" - }, - "build_script_attrs": { - "data_glob": [ - "**" - ] - }, - "license": "MIT/Apache-2.0" - } - }, - "binary_crates": [], - "workspace_members": { - "cxxbridge-cmd 1.0.109": "" - }, - "conditions": { - "aarch64-apple-darwin": [ - "aarch64-apple-darwin" - ], - "aarch64-apple-ios": [ - "aarch64-apple-ios" - ], - "aarch64-apple-ios-sim": [ - "aarch64-apple-ios-sim" - ], - "aarch64-fuchsia": [ - "aarch64-fuchsia" - ], - "aarch64-linux-android": [ - "aarch64-linux-android" - ], - "aarch64-pc-windows-msvc": [ - "aarch64-pc-windows-msvc" - ], - "aarch64-unknown-linux-gnu": [ - "aarch64-unknown-linux-gnu" - ], - "arm-unknown-linux-gnueabi": [ - "arm-unknown-linux-gnueabi" - ], - "armv7-linux-androideabi": [ - "armv7-linux-androideabi" - ], - "armv7-unknown-linux-gnueabi": [ - "armv7-unknown-linux-gnueabi" - ], - "cfg(windows)": [ - "aarch64-pc-windows-msvc", - "i686-pc-windows-msvc", - "x86_64-pc-windows-msvc" - ], - "i686-apple-darwin": [ - "i686-apple-darwin" - ], - "i686-linux-android": [ - "i686-linux-android" - ], - "i686-pc-windows-gnu": [], - "i686-pc-windows-msvc": [ - "i686-pc-windows-msvc" - ], - "i686-unknown-freebsd": [ - "i686-unknown-freebsd" - ], - "i686-unknown-linux-gnu": [ - "i686-unknown-linux-gnu" - ], - "powerpc-unknown-linux-gnu": [ - "powerpc-unknown-linux-gnu" - ], - "riscv32imc-unknown-none-elf": [ - "riscv32imc-unknown-none-elf" - ], - "riscv64gc-unknown-none-elf": [ - "riscv64gc-unknown-none-elf" - ], - "s390x-unknown-linux-gnu": [ - "s390x-unknown-linux-gnu" - ], - "thumbv7em-none-eabi": [ - "thumbv7em-none-eabi" - ], - "thumbv8m.main-none-eabi": [ - "thumbv8m.main-none-eabi" - ], - "wasm32-unknown-unknown": [ - "wasm32-unknown-unknown" - ], - "wasm32-wasi": [ - "wasm32-wasi" - ], - "x86_64-apple-darwin": [ - "x86_64-apple-darwin" - ], - "x86_64-apple-ios": [ - "x86_64-apple-ios" - ], - "x86_64-fuchsia": [ - "x86_64-fuchsia" - ], - "x86_64-linux-android": [ - "x86_64-linux-android" - ], - "x86_64-pc-windows-gnu": [], - "x86_64-pc-windows-msvc": [ - "x86_64-pc-windows-msvc" - ], - "x86_64-unknown-freebsd": [ - "x86_64-unknown-freebsd" - ], - "x86_64-unknown-linux-gnu": [ - "x86_64-unknown-linux-gnu" - ], - "x86_64-unknown-none": [ - "x86_64-unknown-none" - ] - } -} diff --git a/examples/crate_universe/using_cxx/cxxbridge-cmd.Cargo.lock b/examples/crate_universe/using_cxx/cxxbridge-cmd.Cargo.lock deleted file mode 100644 index 72f7b6dfda..0000000000 --- a/examples/crate_universe/using_cxx/cxxbridge-cmd.Cargo.lock +++ /dev/null @@ -1,143 +0,0 @@ -# This file is automatically @generated by Cargo. -# It is not intended for manual editing. -version = 3 - -[[package]] -name = "anstyle" -version = "1.0.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "3a30da5c5f2d5e72842e00bcb57657162cdabef0931f40e2deb9b4140440cecd" - -[[package]] -name = "clap" -version = "4.3.21" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c27cdf28c0f604ba3f512b0c9a409f8de8513e4816705deb0498b627e7c3a3fd" -dependencies = [ - "clap_builder", -] - -[[package]] -name = "clap_builder" -version = "4.3.21" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "08a9f1ab5e9f01a9b81f202e8562eb9a10de70abf9eaeac1be465c28b75aa4aa" -dependencies = [ - "anstyle", - "clap_lex", - "strsim", -] - -[[package]] -name = "clap_lex" -version = "0.5.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "2da6da31387c7e4ef160ffab6d5e7f00c42626fe39aea70a7b0f1773f7dd6c1b" - -[[package]] -name = "codespan-reporting" -version = "0.11.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "3538270d33cc669650c4b093848450d380def10c331d38c768e34cac80576e6e" -dependencies = [ - "termcolor", - "unicode-width", -] - -[[package]] -name = "cxxbridge-cmd" -version = "1.0.109" -dependencies = [ - "clap", - "codespan-reporting", - "proc-macro2", - "quote", - "syn", -] - -[[package]] -name = "proc-macro2" -version = "1.0.66" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "18fb31db3f9bddb2ea821cde30a9f70117e3f119938b5ee630b7403aa6e2ead9" -dependencies = [ - "unicode-ident", -] - -[[package]] -name = "quote" -version = "1.0.32" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "50f3b39ccfb720540debaa0164757101c08ecb8d326b15358ce76a62c7e85965" -dependencies = [ - "proc-macro2", -] - -[[package]] -name = "strsim" -version = "0.10.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "73473c0e59e6d5812c5dfe2a064a6444949f089e20eec9a2e5506596494e4623" - -[[package]] -name = "syn" -version = "2.0.28" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "04361975b3f5e348b2189d8dc55bc942f278b2d482a6a0365de5bdd62d351567" -dependencies = [ - "proc-macro2", - "quote", - "unicode-ident", -] - -[[package]] -name = "termcolor" -version = "1.2.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "be55cf8942feac5c765c2c993422806843c9a9a45d4d5c407ad6dd2ea95eb9b6" -dependencies = [ - "winapi-util", -] - -[[package]] -name = "unicode-ident" -version = "1.0.11" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "301abaae475aa91687eb82514b328ab47a211a533026cb25fc3e519b86adfc3c" - -[[package]] -name = "unicode-width" -version = "0.1.10" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c0edd1e5b14653f783770bce4a4dabb4a5108a5370a5f5d8cfe8710c361f6c8b" - -[[package]] -name = "winapi" -version = "0.3.9" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "5c839a674fcd7a98952e593242ea400abe93992746761e38641405d28b00f419" -dependencies = [ - "winapi-i686-pc-windows-gnu", - "winapi-x86_64-pc-windows-gnu", -] - -[[package]] -name = "winapi-i686-pc-windows-gnu" -version = "0.4.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ac3b87c63620426dd9b991e5ce0329eff545bccbbb34f3be09ff6fb6ab51b7b6" - -[[package]] -name = "winapi-util" -version = "0.1.5" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "70ec6ce85bb158151cae5e5c87f95a8e97d2c0c4b001223f33a334e3ce5de178" -dependencies = [ - "winapi", -] - -[[package]] -name = "winapi-x86_64-pc-windows-gnu" -version = "0.4.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "712e227841d057c1ee1cd2fb22fa7e5a5461ae8e48fa2ca79ec42cfc1931183f" diff --git a/examples/crate_universe/using_cxx/rust_cxx_bridge.bzl b/examples/crate_universe/using_cxx/rust_cxx_bridge.bzl index d5b4971005..7a1c0308ee 100644 --- a/examples/crate_universe/using_cxx/rust_cxx_bridge.bzl +++ b/examples/crate_universe/using_cxx/rust_cxx_bridge.bzl @@ -34,7 +34,7 @@ def rust_cxx_bridge(name, src, deps = []): "-o", "$(location %s.cc)" % src, ], - tool = "@cxxbridge-cmd//:cxxbridge-cmd", + tool = "@using_cxx//:cxxbridge-cmd__cxxbridge", ) cc_library(