Fix crate_universe deps interface

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"),
         },
     },
 }

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}`].",

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",

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 {

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,
         );
     }

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",

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",

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",

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",

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",

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",

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",

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",