From 95547ce7c43122a6e5954c63d6210f20465d821c Mon Sep 17 00:00:00 2001 From: UebelAndre Date: Tue, 7 Jul 2026 07:15:43 -0700 Subject: [PATCH] Fix crate_universe deps interface --- cargo/3rdparty/crates/crates.bzl | 10 +-- crate_universe/3rdparty/crates/crates.bzl | 74 +++++++++---------- crate_universe/extensions.bzl | 8 +- crate_universe/private/generate_utils.bzl | 2 +- crate_universe/src/config.rs | 10 +-- crate_universe/src/lockfile.rs | 8 +- ...zel-lock_global_alias_annotation_none.json | 2 +- ...azel-lock_global_alias_annotation_opt.json | 2 +- ...el-lock_global_custom_annotation_none.json | 2 +- ...-lock_global_dbg_annotation_fastbuild.json | 2 +- ...azel-lock_global_opt_annotation_alias.json | 2 +- ...-bazel-lock_global_opt_annotation_dbg.json | 2 +- ...bazel-lock_global_opt_annotation_none.json | 2 +- .../cargo_aliases/cargo-bazel-lock.json | 2 +- .../cargo-bazel-lock.json | 2 +- .../cargo_workspace/cargo-bazel-lock.json | 2 +- .../cargo-bazel-lock.json | 2 +- .../ext_annotations/cargo-bazel-lock.json | 2 +- .../cxxbridge-cmd.cargo-bazel-lock.json | 2 +- .../multi_package/cargo-bazel-lock.json | 2 +- .../override_target/cargo-bazel-lock.json | 2 +- .../vendor/3rdparty/crates/crates.bzl | 6 +- .../vendor/remote_manifests/crates/crates.bzl | 8 +- .../vendor/remote_pkgs/crates/crates.bzl | 20 ++--- .../bazel/cargo/cargo-bazel-lock.json | 2 +- test/determinism/3rdparty/crates/crates.bzl | 20 ++--- test/rust_analyzer/3rdparty/crates/crates.bzl | 4 +- test/vscode/3rdparty/crates/crates.bzl | 4 +- 28 files changed, 103 insertions(+), 103 deletions(-) diff --git a/cargo/3rdparty/crates/crates.bzl b/cargo/3rdparty/crates/crates.bzl index 1e5d664998..c5c76fac56 100644 --- a/cargo/3rdparty/crates/crates.bzl +++ b/cargo/3rdparty/crates/crates.bzl @@ -320,15 +320,15 @@ _CRATE_EDITIONS = { _NORMAL_DEPENDENCIES = { "cargo/private/cargo_toml_info": { _COMMON_CONDITION: { - "cargo_toml": Label("//cargo_toml-0.22.3"), + "cargo_toml": Label("@rrc//cargo_toml-0.22.3"), }, }, "cargo/private/cargo_toml_variable_extractor": { _COMMON_CONDITION: { - "cargo-util-schemas": Label("//cargo-util-schemas-0.3.1"), - "pathdiff": Label("//pathdiff-0.1.0"), - "semver": Label("//semver-1.0.25"), - "toml": Label("//toml-0.8.20"), + "cargo-util-schemas": Label("@rrc//cargo-util-schemas-0.3.1"), + "pathdiff": Label("@rrc//pathdiff-0.1.0"), + "semver": Label("@rrc//semver-1.0.25"), + "toml": Label("@rrc//toml-0.8.20"), }, }, } diff --git a/crate_universe/3rdparty/crates/crates.bzl b/crate_universe/3rdparty/crates/crates.bzl index dc624d1fbc..7aa0d07338 100644 --- a/crate_universe/3rdparty/crates/crates.bzl +++ b/crate_universe/3rdparty/crates/crates.bzl @@ -321,49 +321,49 @@ _CRATE_EDITIONS = { _NORMAL_DEPENDENCIES = { "crate_universe": { _COMMON_CONDITION: { - "anyhow": Label("//anyhow-1.0.98"), - "camino": Label("//camino-1.1.9"), - "cargo-lock": Label("//cargo-lock-10.1.0"), - "cargo-platform": Label("//cargo-platform-0.1.9"), - "cargo_metadata": Label("//cargo_metadata-0.19.2"), - "cargo_toml": Label("//cargo_toml-0.22.3"), - "cfg-expr": Label("//cfg-expr-0.18.0"), - "clap": Label("//clap-4.5.37"), - "crates-index": Label("//crates-index-3.7.0"), - "glob": Label("//glob-0.3.2"), - "hex": Label("//hex-0.4.3"), - "itertools": Label("//itertools-0.14.0"), - "normpath": Label("//normpath-1.3.0"), - "once_cell": Label("//once_cell-1.21.3"), - "pathdiff": Label("//pathdiff-0.2.3"), - "regex": Label("//regex-1.11.1"), - "semver": Label("//semver-1.0.26"), - "serde": Label("//serde-1.0.219"), - "serde_json": Label("//serde_json-1.0.140"), - "serde_starlark": Label("//serde_starlark-0.1.17"), - "sha2": Label("//sha2-0.10.8"), - "spdx": Label("//spdx-0.10.8"), - "tempfile": Label("//tempfile-3.19.1"), - "tera": Label("//tera-1.20.0"), - "textwrap": Label("//textwrap-0.16.2"), - "toml": Label("//toml-0.9.5"), - "tracing": Label("//tracing-0.1.41"), - "tracing-subscriber": Label("//tracing-subscriber-0.3.19"), - "url": Label("//url-2.5.4"), - "walkdir": Label("//walkdir-2.5.0"), + "anyhow": Label("@cui//anyhow-1.0.98"), + "camino": Label("@cui//camino-1.1.9"), + "cargo-lock": Label("@cui//cargo-lock-10.1.0"), + "cargo-platform": Label("@cui//cargo-platform-0.1.9"), + "cargo_metadata": Label("@cui//cargo_metadata-0.19.2"), + "cargo_toml": Label("@cui//cargo_toml-0.22.3"), + "cfg-expr": Label("@cui//cfg-expr-0.18.0"), + "clap": Label("@cui//clap-4.5.37"), + "crates-index": Label("@cui//crates-index-3.7.0"), + "glob": Label("@cui//glob-0.3.2"), + "hex": Label("@cui//hex-0.4.3"), + "itertools": Label("@cui//itertools-0.14.0"), + "normpath": Label("@cui//normpath-1.3.0"), + "once_cell": Label("@cui//once_cell-1.21.3"), + "pathdiff": Label("@cui//pathdiff-0.2.3"), + "regex": Label("@cui//regex-1.11.1"), + "semver": Label("@cui//semver-1.0.26"), + "serde": Label("@cui//serde-1.0.219"), + "serde_json": Label("@cui//serde_json-1.0.140"), + "serde_starlark": Label("@cui//serde_starlark-0.1.17"), + "sha2": Label("@cui//sha2-0.10.8"), + "spdx": Label("@cui//spdx-0.10.8"), + "tempfile": Label("@cui//tempfile-3.19.1"), + "tera": Label("@cui//tera-1.20.0"), + "textwrap": Label("@cui//textwrap-0.16.2"), + "toml": Label("@cui//toml-0.9.5"), + "tracing": Label("@cui//tracing-0.1.41"), + "tracing-subscriber": Label("@cui//tracing-subscriber-0.3.19"), + "url": Label("@cui//url-2.5.4"), + "walkdir": Label("@cui//walkdir-2.5.0"), }, }, "crate_universe/tools/cross_installer": { _COMMON_CONDITION: { - "clap": Label("//clap-4.5.37"), + "clap": Label("@cui//clap-4.5.37"), }, }, "crate_universe/tools/urls_generator": { _COMMON_CONDITION: { - "clap": Label("//clap-4.5.37"), - "hex": Label("//hex-0.4.3"), - "serde_json": Label("//serde_json-1.0.140"), - "sha2": Label("//sha2-0.10.8"), + "clap": Label("@cui//clap-4.5.37"), + "hex": Label("@cui//hex-0.4.3"), + "serde_json": Label("@cui//serde_json-1.0.140"), + "sha2": Label("@cui//sha2-0.10.8"), }, }, } @@ -386,7 +386,7 @@ _NORMAL_ALIASES = { _NORMAL_DEV_DEPENDENCIES = { "crate_universe": { _COMMON_CONDITION: { - "maplit": Label("//maplit-1.0.2"), + "maplit": Label("@cui//maplit-1.0.2"), }, }, "crate_universe/tools/cross_installer": { @@ -409,7 +409,7 @@ _NORMAL_DEV_ALIASES = { _PROC_MACRO_DEPENDENCIES = { "crate_universe": { _COMMON_CONDITION: { - "indoc": Label("//indoc-2.0.6"), + "indoc": Label("@cui//indoc-2.0.6"), }, }, "crate_universe/tools/cross_installer": { diff --git a/crate_universe/extensions.bzl b/crate_universe/extensions.bzl index 56b59d65a1..c5b99a9321 100644 --- a/crate_universe/extensions.bzl +++ b/crate_universe/extensions.bzl @@ -1543,12 +1543,12 @@ can be found below where the supported keys for each template can be found in th doc = ( "The base template to use for crate aliases. The available format keys are " + "[`{repository}`, `{name}`, `{version}`, `{target}`]. Defaults to the per-alias " + - "subpackage layout (`//{name}-{version}`); set to `//:{name}-{version}` if " + - "you intentionally want `aliases()` / `all_crate_deps()` to point at the " + - "legacy root-package aliases (only valid while " + + "subpackage layout (`@{repository}//{name}-{version}`); set to " + + "`@{repository}//:{name}-{version}` to point `aliases()` / `all_crate_deps()` at " + + "the legacy root-package aliases (only valid while " + "`incompatible_no_root_alias_targets` is off)." ), - default = "//{name}-{version}", + default = "@{repository}//{name}-{version}", ), "crate_label_template": attr.string( doc = "The base template to use for crate labels. The available format keys are [`{repository}`, `{name}`, `{version}`, `{target}`].", diff --git a/crate_universe/private/generate_utils.bzl b/crate_universe/private/generate_utils.bzl index 587fe592e2..d504d9cffa 100644 --- a/crate_universe/private/generate_utils.bzl +++ b/crate_universe/private/generate_utils.bzl @@ -92,7 +92,7 @@ def get_generator(repository_ctx, host_triple): def render_config( build_file_template = "//:BUILD.{name}-{version}.bazel", crate_label_template = "@{repository}__{name}-{version}//:{target}", - crate_alias_template = "//{name}-{version}", + crate_alias_template = "@{repository}//{name}-{version}", crate_repository_template = "{repository}__{name}-{version}", crates_module_template = "//:{file}", default_alias_rule = "alias", diff --git a/crate_universe/src/config.rs b/crate_universe/src/config.rs index eeaa52f923..8a97ed46e3 100644 --- a/crate_universe/src/config.rs +++ b/crate_universe/src/config.rs @@ -179,11 +179,11 @@ fn default_crate_label_template() -> String { } fn default_crate_alias_template() -> String { - // Points `aliases()` / `all_crate_deps()` at the per-alias subpackage - // layout (e.g. `Label("@crate_index//clap-1.0.0")`). Subpackage `BUILD.bazel`s - // are always emitted, so this default works whether or not the user - // sets `incompatible_no_root_alias_targets`. - "//{name}-{version}".to_owned() + // The `@{repository}` prefix ensures labels resolve through the hub even + // when `defs.bzl` is loaded from a workspace path (vendor mode). + // Subpackage `BUILD.bazel`s are always emitted, so this default works + // whether or not the user sets `incompatible_no_root_alias_targets`. + "@{repository}//{name}-{version}".to_owned() } fn default_crate_repository_template() -> String { diff --git a/crate_universe/src/lockfile.rs b/crate_universe/src/lockfile.rs index 1c4e1b308d..730c5d8992 100644 --- a/crate_universe/src/lockfile.rs +++ b/crate_universe/src/lockfile.rs @@ -260,7 +260,7 @@ mod test { ); assert_eq!( - Digest("caafd4eaa60b599509522968ce17d6ba07b8118b767b7dddb00bef8d5ddba7fa".to_owned()), + Digest("8c404322a9233ae973beca7ab04300fc61d60380153a36d0e23e70ba2d42f39a".to_owned()), digest, ); } @@ -305,7 +305,7 @@ mod test { ); assert_eq!( - Digest("c395b0c5bed8470775b13399a6e8ec43af4abd4aa104ebc81297a286e449fc23".to_owned()), + Digest("028ff60b3022061bf3210c16774aff239282ddf2d15b35d2042ae371cfeb6779".to_owned()), digest, ); } @@ -336,7 +336,7 @@ mod test { ); assert_eq!( - Digest("3288cda3c2194f5ca7f1929b74bd13f36eb624e859d77b143d762c60631d700d".to_owned()), + Digest("7856b140b5609a1678609b07152908987245f78cf08cb0e7a500fef2d8be4b5d".to_owned()), digest, ); } @@ -385,7 +385,7 @@ mod test { ); assert_eq!( - Digest("ccc875599ade8873ba48496875d29f08772710651b9bf6d428a97f45a559aa2e".to_owned()), + Digest("764098259279ccd2dd6bf978bc82819464fe45da3eb0a03d8b796ac7913e8982".to_owned()), digest, ); } diff --git a/crate_universe/tests/integration/alias_rule/cargo-bazel-lock_global_alias_annotation_none.json b/crate_universe/tests/integration/alias_rule/cargo-bazel-lock_global_alias_annotation_none.json index 3ef174ca21..ce00a8bf4e 100644 --- a/crate_universe/tests/integration/alias_rule/cargo-bazel-lock_global_alias_annotation_none.json +++ b/crate_universe/tests/integration/alias_rule/cargo-bazel-lock_global_alias_annotation_none.json @@ -1,5 +1,5 @@ { - "checksum": "3e3fcf66309b79dd862d024b401189924392392563e6e2c26b86cb87e8629b09", + "checksum": "caf0d32c3973bf05ac05bc01869af0c6ea1f1a66b64eef97f69809fb3302ac9a", "crates": { "direct-cargo-bazel-deps 0.0.1": { "name": "direct-cargo-bazel-deps", diff --git a/crate_universe/tests/integration/alias_rule/cargo-bazel-lock_global_alias_annotation_opt.json b/crate_universe/tests/integration/alias_rule/cargo-bazel-lock_global_alias_annotation_opt.json index c7841b2772..24c4194188 100644 --- a/crate_universe/tests/integration/alias_rule/cargo-bazel-lock_global_alias_annotation_opt.json +++ b/crate_universe/tests/integration/alias_rule/cargo-bazel-lock_global_alias_annotation_opt.json @@ -1,5 +1,5 @@ { - "checksum": "18ba6d58a344cab03b2fb916caa02b4f668036f0a8ccbe15a3a37e715bdd827b", + "checksum": "789dd1b5dcd9ace81e1da959e7aae938c4dbfbe79b0f5dec0138e9f8af3a3613", "crates": { "direct-cargo-bazel-deps 0.0.1": { "name": "direct-cargo-bazel-deps", diff --git a/crate_universe/tests/integration/alias_rule/cargo-bazel-lock_global_custom_annotation_none.json b/crate_universe/tests/integration/alias_rule/cargo-bazel-lock_global_custom_annotation_none.json index aa92551128..139ed75071 100644 --- a/crate_universe/tests/integration/alias_rule/cargo-bazel-lock_global_custom_annotation_none.json +++ b/crate_universe/tests/integration/alias_rule/cargo-bazel-lock_global_custom_annotation_none.json @@ -1,5 +1,5 @@ { - "checksum": "63df7f6886a12d37ab62c14405c6b4f3ef8b0766a421dcbaa18b39eaa7639308", + "checksum": "0b361891360e079e6cae3bf19a448c3ce9610b3c0c6a775583cababf0c3ec3a2", "crates": { "direct-cargo-bazel-deps 0.0.1": { "name": "direct-cargo-bazel-deps", diff --git a/crate_universe/tests/integration/alias_rule/cargo-bazel-lock_global_dbg_annotation_fastbuild.json b/crate_universe/tests/integration/alias_rule/cargo-bazel-lock_global_dbg_annotation_fastbuild.json index 92af15e018..289255b382 100644 --- a/crate_universe/tests/integration/alias_rule/cargo-bazel-lock_global_dbg_annotation_fastbuild.json +++ b/crate_universe/tests/integration/alias_rule/cargo-bazel-lock_global_dbg_annotation_fastbuild.json @@ -1,5 +1,5 @@ { - "checksum": "85241b8d747b0ac60e47daf548eb0c4bfcffa246452a1db84a874c5f436f244d", + "checksum": "e0a54720de2330bc19265299b48149f593af6b9d57b434c107735d1eb04347bf", "crates": { "direct-cargo-bazel-deps 0.0.1": { "name": "direct-cargo-bazel-deps", diff --git a/crate_universe/tests/integration/alias_rule/cargo-bazel-lock_global_opt_annotation_alias.json b/crate_universe/tests/integration/alias_rule/cargo-bazel-lock_global_opt_annotation_alias.json index 937767131c..294c25ad52 100644 --- a/crate_universe/tests/integration/alias_rule/cargo-bazel-lock_global_opt_annotation_alias.json +++ b/crate_universe/tests/integration/alias_rule/cargo-bazel-lock_global_opt_annotation_alias.json @@ -1,5 +1,5 @@ { - "checksum": "705226d8a61b9d27f54bc30b1362ba4324e487943d7b7454098fbe45f39acb73", + "checksum": "607dbb132e07f7b38220707cc64265f86f6904c11322a04cefbca08cb20eab2b", "crates": { "direct-cargo-bazel-deps 0.0.1": { "name": "direct-cargo-bazel-deps", diff --git a/crate_universe/tests/integration/alias_rule/cargo-bazel-lock_global_opt_annotation_dbg.json b/crate_universe/tests/integration/alias_rule/cargo-bazel-lock_global_opt_annotation_dbg.json index 52df3a8cbe..85c6d96454 100644 --- a/crate_universe/tests/integration/alias_rule/cargo-bazel-lock_global_opt_annotation_dbg.json +++ b/crate_universe/tests/integration/alias_rule/cargo-bazel-lock_global_opt_annotation_dbg.json @@ -1,5 +1,5 @@ { - "checksum": "d5f1a19286ffb5f30c2027730b1892c9f6957d3c9ad40e1ed282555fc51d3526", + "checksum": "e62302fb34ace1f66c72e700d29bd1bf39d300b1213a33e600b92c69bf06e5cd", "crates": { "direct-cargo-bazel-deps 0.0.1": { "name": "direct-cargo-bazel-deps", diff --git a/crate_universe/tests/integration/alias_rule/cargo-bazel-lock_global_opt_annotation_none.json b/crate_universe/tests/integration/alias_rule/cargo-bazel-lock_global_opt_annotation_none.json index de9c949a2b..1cc629e545 100644 --- a/crate_universe/tests/integration/alias_rule/cargo-bazel-lock_global_opt_annotation_none.json +++ b/crate_universe/tests/integration/alias_rule/cargo-bazel-lock_global_opt_annotation_none.json @@ -1,5 +1,5 @@ { - "checksum": "79a06818fd9e39a391eb67fbaec4c505857146f72bfaa64b66cc9cba7b67ac3b", + "checksum": "09156089b63a503307e09a88789d555086f4817a0151fb163730636d9e49c147", "crates": { "direct-cargo-bazel-deps 0.0.1": { "name": "direct-cargo-bazel-deps", diff --git a/crate_universe/tests/integration/cargo_aliases/cargo-bazel-lock.json b/crate_universe/tests/integration/cargo_aliases/cargo-bazel-lock.json index 49a5557670..ec3e20041b 100644 --- a/crate_universe/tests/integration/cargo_aliases/cargo-bazel-lock.json +++ b/crate_universe/tests/integration/cargo_aliases/cargo-bazel-lock.json @@ -1,5 +1,5 @@ { - "checksum": "0e723880958059d0566ce8168ea93c314bd1c5d67efa8db55abe737b58f6c175", + "checksum": "660d7b24f89536a1c441f433b33b36309c9208db9062e5b5b1fcbf8a80608922", "crates": { "aho-corasick 0.7.20": { "name": "aho-corasick", diff --git a/crate_universe/tests/integration/cargo_conditional_deps/cargo-bazel-lock.json b/crate_universe/tests/integration/cargo_conditional_deps/cargo-bazel-lock.json index 8df40604bb..825980da09 100644 --- a/crate_universe/tests/integration/cargo_conditional_deps/cargo-bazel-lock.json +++ b/crate_universe/tests/integration/cargo_conditional_deps/cargo-bazel-lock.json @@ -1,5 +1,5 @@ { - "checksum": "b926f4e661a5958de7fa77ea71b4821cfe448b36f0cad6d0c2ef18f02963097e", + "checksum": "2a8a6f2f0cc13587d2021b6f7e826bb00f3e8a33d3b39deec23a957c02e0a6e5", "crates": { "autocfg 1.1.0": { "name": "autocfg", diff --git a/crate_universe/tests/integration/cargo_workspace/cargo-bazel-lock.json b/crate_universe/tests/integration/cargo_workspace/cargo-bazel-lock.json index 5f4ccf9ad2..1effbb9208 100644 --- a/crate_universe/tests/integration/cargo_workspace/cargo-bazel-lock.json +++ b/crate_universe/tests/integration/cargo_workspace/cargo-bazel-lock.json @@ -1,5 +1,5 @@ { - "checksum": "69b9a40b41bc61ce568799e7b3ca139b2a12cf1a42c2c2796bee84139d4af114", + "checksum": "7602ec5f6ea45c8c56b8458ce46515e9ad61c0ab8a6b301e3631d50f2624fec9", "crates": { "ansi_term 0.12.1": { "name": "ansi_term", diff --git a/crate_universe/tests/integration/complicated_dependencies/cargo-bazel-lock.json b/crate_universe/tests/integration/complicated_dependencies/cargo-bazel-lock.json index 07746460d0..8e62799544 100644 --- a/crate_universe/tests/integration/complicated_dependencies/cargo-bazel-lock.json +++ b/crate_universe/tests/integration/complicated_dependencies/cargo-bazel-lock.json @@ -1,5 +1,5 @@ { - "checksum": "eaeb37c4f69186c85546528cb895a75fb9a24272fd8bd4ad56eb473462a55c80", + "checksum": "949a4defe8318523fa3a1cc6d9d3477fd5f5bf2cf9ab6af7d9f05b7c883dffb6", "crates": { "bitflags 2.11.1": { "name": "bitflags", diff --git a/crate_universe/tests/integration/ext_annotations/cargo-bazel-lock.json b/crate_universe/tests/integration/ext_annotations/cargo-bazel-lock.json index 91febb4b0a..cb25826da4 100644 --- a/crate_universe/tests/integration/ext_annotations/cargo-bazel-lock.json +++ b/crate_universe/tests/integration/ext_annotations/cargo-bazel-lock.json @@ -1,5 +1,5 @@ { - "checksum": "676b31fe0b99f6a38059a9be5242e51924a62225884d768ff2bb7044c5bc5f9d", + "checksum": "4c3bcb26928cc106d15c5006702947df2e8433613ad20f5aff9891dcca7c6efc", "crates": { "cc 1.2.59": { "name": "cc", diff --git a/crate_universe/tests/integration/ext_annotations/cxxbridge-cmd.cargo-bazel-lock.json b/crate_universe/tests/integration/ext_annotations/cxxbridge-cmd.cargo-bazel-lock.json index 1fb1a0aea8..16df9d94fe 100644 --- a/crate_universe/tests/integration/ext_annotations/cxxbridge-cmd.cargo-bazel-lock.json +++ b/crate_universe/tests/integration/ext_annotations/cxxbridge-cmd.cargo-bazel-lock.json @@ -1,5 +1,5 @@ { - "checksum": "36ad94ac3e69b08f634b3efb6329313e021452196eeb86abf7a8bea292a39dbd", + "checksum": "1b73f563fb92d6d85a69101f112e15a249e0711e8540864e97b8dd5a8181a551", "crates": { "anstyle 1.0.1": { "name": "anstyle", diff --git a/crate_universe/tests/integration/multi_package/cargo-bazel-lock.json b/crate_universe/tests/integration/multi_package/cargo-bazel-lock.json index 33d2986cc7..4c7295dae1 100644 --- a/crate_universe/tests/integration/multi_package/cargo-bazel-lock.json +++ b/crate_universe/tests/integration/multi_package/cargo-bazel-lock.json @@ -1,5 +1,5 @@ { - "checksum": "2adc9be14f0715289ffeef3797dde88bfce2401b02855a4bd10e07fda9d2d4c5", + "checksum": "efe91fdfa80bc6ed16390ee8c69a4f7b7d1c05b70ca9ffb65694a7ad58497e9c", "crates": { "aho-corasick 0.7.20": { "name": "aho-corasick", diff --git a/crate_universe/tests/integration/override_target/cargo-bazel-lock.json b/crate_universe/tests/integration/override_target/cargo-bazel-lock.json index 3e63a57ab9..a2ea505494 100644 --- a/crate_universe/tests/integration/override_target/cargo-bazel-lock.json +++ b/crate_universe/tests/integration/override_target/cargo-bazel-lock.json @@ -1,5 +1,5 @@ { - "checksum": "27e8a62ec5c3802bbbe9cea0e6e5402b6adcdb34b2231252ec863b06c45ae27d", + "checksum": "be2f096cf5fa5222b25b9e657c2cc686cadef5e54a2d05577a9437a6269fd5d5", "crates": { "direct-cargo-bazel-deps 0.0.1": { "name": "direct-cargo-bazel-deps", diff --git a/crate_universe/tests/integration/vendor/3rdparty/crates/crates.bzl b/crate_universe/tests/integration/vendor/3rdparty/crates/crates.bzl index 8b7f13ce99..fafce8fcd9 100644 --- a/crate_universe/tests/integration/vendor/3rdparty/crates/crates.bzl +++ b/crate_universe/tests/integration/vendor/3rdparty/crates/crates.bzl @@ -319,8 +319,8 @@ _CRATE_EDITIONS = { _NORMAL_DEPENDENCIES = { "": { _COMMON_CONDITION: { - "clap": Label("//clap-3.1.5"), - "rand": Label("//rand-0.8.5"), + "clap": Label("@crates_vendor//clap-3.1.5"), + "rand": Label("@crates_vendor//rand-0.8.5"), }, }, } @@ -335,7 +335,7 @@ _NORMAL_ALIASES = { _NORMAL_DEV_DEPENDENCIES = { "": { _COMMON_CONDITION: { - "version-sync": Label("//version-sync-0.9.4"), + "version-sync": Label("@crates_vendor//version-sync-0.9.4"), }, }, } diff --git a/crate_universe/tests/integration/vendor/remote_manifests/crates/crates.bzl b/crate_universe/tests/integration/vendor/remote_manifests/crates/crates.bzl index 8ebb2b7013..c160cba7dc 100644 --- a/crate_universe/tests/integration/vendor/remote_manifests/crates/crates.bzl +++ b/crate_universe/tests/integration/vendor/remote_manifests/crates/crates.bzl @@ -319,8 +319,8 @@ _CRATE_EDITIONS = { _NORMAL_DEPENDENCIES = { "remote_manifests": { _COMMON_CONDITION: { - "serde_yaml": Label("//serde_yaml-0.9.34+deprecated"), - "tokio": Label("//tokio-1.52.3"), + "serde_yaml": Label("@cvm//serde_yaml-0.9.34+deprecated"), + "tokio": Label("@cvm//tokio-1.52.3"), }, }, } @@ -335,8 +335,8 @@ _NORMAL_ALIASES = { _NORMAL_DEV_DEPENDENCIES = { "remote_manifests": { _COMMON_CONDITION: { - "tempfile": Label("//tempfile-3.27.0"), - "tokio-test": Label("//tokio-test-0.4.5"), + "tempfile": Label("@cvm//tempfile-3.27.0"), + "tokio-test": Label("@cvm//tokio-test-0.4.5"), }, }, } diff --git a/crate_universe/tests/integration/vendor/remote_pkgs/crates/crates.bzl b/crate_universe/tests/integration/vendor/remote_pkgs/crates/crates.bzl index f064024282..8978ca5844 100644 --- a/crate_universe/tests/integration/vendor/remote_pkgs/crates/crates.bzl +++ b/crate_universe/tests/integration/vendor/remote_pkgs/crates/crates.bzl @@ -319,16 +319,16 @@ _CRATE_EDITIONS = { _NORMAL_DEPENDENCIES = { "": { _COMMON_CONDITION: { - "axum": Label("//axum-0.4.8"), - "hyper": Label("//hyper-0.14.32"), - "mime": Label("//mime-0.3.17"), - "serde_json": Label("//serde_json-1.0.135"), - "socket2": Label("//socket2-0.4.10"), - "tokio": Label("//tokio-1.43.0"), - "tower": Label("//tower-0.4.13"), - "tower-http": Label("//tower-http-0.2.5"), - "tracing": Label("//tracing-0.1.41"), - "tracing-subscriber": Label("//tracing-subscriber-0.3.19"), + "axum": Label("@crates_vendor_pkgs//axum-0.4.8"), + "hyper": Label("@crates_vendor_pkgs//hyper-0.14.32"), + "mime": Label("@crates_vendor_pkgs//mime-0.3.17"), + "serde_json": Label("@crates_vendor_pkgs//serde_json-1.0.135"), + "socket2": Label("@crates_vendor_pkgs//socket2-0.4.10"), + "tokio": Label("@crates_vendor_pkgs//tokio-1.43.0"), + "tower": Label("@crates_vendor_pkgs//tower-0.4.13"), + "tower-http": Label("@crates_vendor_pkgs//tower-http-0.2.5"), + "tracing": Label("@crates_vendor_pkgs//tracing-0.1.41"), + "tracing-subscriber": Label("@crates_vendor_pkgs//tracing-subscriber-0.3.19"), }, }, } diff --git a/examples/cross_compile_nix/bazel/cargo/cargo-bazel-lock.json b/examples/cross_compile_nix/bazel/cargo/cargo-bazel-lock.json index 2e2ac035a5..0d73ce2e6d 100644 --- a/examples/cross_compile_nix/bazel/cargo/cargo-bazel-lock.json +++ b/examples/cross_compile_nix/bazel/cargo/cargo-bazel-lock.json @@ -1,5 +1,5 @@ { - "checksum": "7bad7ab38af6d23263b7dfd8fa32a083c1f6e29c5868e2d7448dc398a12e406b", + "checksum": "af4107c5c165632bd157178894702ad0487ef0e1ce74ca165011bb2a82504d86", "crates": { "addr2line 0.21.0": { "name": "addr2line", diff --git a/test/determinism/3rdparty/crates/crates.bzl b/test/determinism/3rdparty/crates/crates.bzl index 85e88c2fb3..6ba1e410c1 100644 --- a/test/determinism/3rdparty/crates/crates.bzl +++ b/test/determinism/3rdparty/crates/crates.bzl @@ -319,16 +319,16 @@ _CRATE_EDITIONS = { _NORMAL_DEPENDENCIES = { "": { _COMMON_CONDITION: { - "anyhow": Label("//anyhow-1.0.100"), - "blake3": Label("//blake3-1.8.2"), - "clap": Label("//clap-4.5.50"), - "serde": Label("//serde-1.0.228"), - "serde_json": Label("//serde_json-1.0.145"), - "tempfile": Label("//tempfile-3.23.0"), - "tokio": Label("//tokio-1.48.0"), - "tracing": Label("//tracing-0.1.41"), - "tracing-subscriber": Label("//tracing-subscriber-0.3.20"), - "walkdir": Label("//walkdir-2.5.0"), + "anyhow": Label("@rrtd//anyhow-1.0.100"), + "blake3": Label("@rrtd//blake3-1.8.2"), + "clap": Label("@rrtd//clap-4.5.50"), + "serde": Label("@rrtd//serde-1.0.228"), + "serde_json": Label("@rrtd//serde_json-1.0.145"), + "tempfile": Label("@rrtd//tempfile-3.23.0"), + "tokio": Label("@rrtd//tokio-1.48.0"), + "tracing": Label("@rrtd//tracing-0.1.41"), + "tracing-subscriber": Label("@rrtd//tracing-subscriber-0.3.20"), + "walkdir": Label("@rrtd//walkdir-2.5.0"), }, }, } diff --git a/test/rust_analyzer/3rdparty/crates/crates.bzl b/test/rust_analyzer/3rdparty/crates/crates.bzl index 4152ca945b..fc8ecd0c73 100644 --- a/test/rust_analyzer/3rdparty/crates/crates.bzl +++ b/test/rust_analyzer/3rdparty/crates/crates.bzl @@ -319,8 +319,8 @@ _CRATE_EDITIONS = { _NORMAL_DEPENDENCIES = { "": { _COMMON_CONDITION: { - "serde": Label("//serde-1.0.228"), - "serde_json": Label("//serde_json-1.0.150"), + "serde": Label("@rtra//serde-1.0.228"), + "serde_json": Label("@rtra//serde_json-1.0.150"), }, }, } diff --git a/test/vscode/3rdparty/crates/crates.bzl b/test/vscode/3rdparty/crates/crates.bzl index 49de4331d8..abc38a0358 100644 --- a/test/vscode/3rdparty/crates/crates.bzl +++ b/test/vscode/3rdparty/crates/crates.bzl @@ -319,8 +319,8 @@ _CRATE_EDITIONS = { _NORMAL_DEPENDENCIES = { "": { _COMMON_CONDITION: { - "serde": Label("//serde-1.0.228"), - "serde_json": Label("//serde_json-1.0.150"), + "serde": Label("@rtvsc//serde-1.0.228"), + "serde_json": Label("@rtvsc//serde_json-1.0.150"), }, }, }