Alias workspace members from crate hubs

dzbarsky · dzbarsky · commit ab41f6e71692 · 2026-05-11T21:52:16.000-04:00
diff --git a/rs/extensions.bzl b/rs/extensions.bzl
@@ -15,6 +15,7 @@ load(
     "split_lockfile_packages",
     "workspace_dep_data",
     _fq_crate = "fq_crate",
+    _manifest_package_dir = "manifest_package_dir",
     _normalize_path = "normalize_path",
     _select = "select_items",
 )
@@ -416,6 +417,8 @@ crate.annotation(
         _fq_crate(package["name"], package["version"]): package
         for package in packages
     }
+    repo_root = _normalize_path(cargo_metadata["workspace_root"])
+    workspace_package = _label_directory(cargo_lock_path)
 
     hub_contents = []
     for name, versions in versions_by_name.items():
@@ -478,6 +481,19 @@ alias(
                     default_version = default_version,
                 ))
 
+    for package in cargo_metadata["packages"]:
+        package_dir = _manifest_package_dir(package["manifest_path"], repo_root)
+        bazel_package = paths.join(workspace_package, package_dir) if package_dir else workspace_package
+        hub_contents.append("""
+alias(
+    name = "{name}-{version}",
+    actual = "@@//{bazel_package}",
+)""".format(
+            name = package["name"],
+            version = package["version"],
+            bazel_package = bazel_package,
+        ))
+
     workspace_deps, conditional_workspace_deps = render_select(
         [],
         workspace_dep_labels_by_triple,
@@ -577,8 +593,6 @@ RESOLVED_PLATFORMS = select({{
 
     _date(mctx, "done")
 
-    repo_root = _normalize_path(cargo_metadata["workspace_root"])
-    workspace_package = _label_directory(cargo_lock_path)
     data_bzl_contents = render_dep_data(workspace_dep_data(
         cargo_metadata = cargo_metadata,
         feature_resolutions_by_fq_crate = feature_resolutions_by_fq_crate,
diff --git a/test/BUILD.bazel b/test/BUILD.bazel
@@ -171,6 +171,23 @@ genquery(
     scope = ["@workspace_member_annotation_features//:dep_leaf-0.1.0"],
 )
 
+genquery(
+    name = "vendored_workspace_dep_itoa_deps",
+    expression = "deps(@vendored_workspace_dep//:itoa-1.0.11)",
+    scope = ["@vendored_workspace_dep//:itoa-1.0.11"],
+)
+
+genrule(
+    name = "verify_vendored_workspace_dep",
+    srcs = [":vendored_workspace_dep_itoa_deps"],
+    outs = ["verify_vendored_workspace_dep.txt"],
+    cmd = """
+        grep 'vendored_workspace_dep//:mylib-0.1.0' $(location :vendored_workspace_dep_itoa_deps)
+        grep '//vendored_workspace_dep/mylib:mylib' $(location :vendored_workspace_dep_itoa_deps)
+        echo ok > $@
+    """,
+)
+
 verify_alias(
     name = "verify_workspace_hyphen_dep_aliases",
     aliases = workspace_hyphen_dep_aliases_aliases(package_name = "workspace_hyphen_dep_aliases/consumer"),
@@ -305,6 +322,7 @@ filegroup(
         ":verify_workspace_default_features_subfeature_present",
         ":verify_workspace_hyphen_dep_aliases",
         ":verify_workspace_member_annotation_features",
+        ":verify_vendored_workspace_dep",
         ":verify_workspace_renamed_path_dep_aliases",
         "//prost:echo_rust_proto",
         "//self_dev_dependency/mycrate",
diff --git a/test/MODULE.bazel b/test/MODULE.bazel
@@ -148,6 +148,7 @@ TESTS = [
     "target_workspace_dep_feature",
     "vendored_crate_override",
     "workspace_default_features",
+    "vendored_workspace_dep",
     "workspace_member_annotation_features",
     "workspace_git_dep",
     "workspace_path_dependency",
diff --git a/test/MODULE.bazel.lock b/test/MODULE.bazel.lock
diff --git a/test/vendored_workspace_dep/BUILD.bazel b/test/vendored_workspace_dep/BUILD.bazel
@@ -0,0 +1 @@
+package(default_visibility = ["//visibility:public"])
diff --git a/test/vendored_workspace_dep/Cargo.lock b/test/vendored_workspace_dep/Cargo.lock
diff --git a/test/vendored_workspace_dep/Cargo.toml b/test/vendored_workspace_dep/Cargo.toml
@@ -0,0 +1,8 @@
+[workspace]
+members = ["mylib", "app"]
+exclude = ["vendor/itoa"]
+resolver = "3"
+
+[workspace.dependencies]
+mylib = { path = "./mylib" }
+itoa = { path = "./vendor/itoa" }
diff --git a/test/vendored_workspace_dep/app/Cargo.toml b/test/vendored_workspace_dep/app/Cargo.toml
@@ -0,0 +1,7 @@
+[package]
+name = "vendored_workspace_dep_demo"
+version = "0.1.0"
+edition = "2024"
+
+[dependencies]
+itoa = { workspace = true }
diff --git a/test/vendored_workspace_dep/app/src/main.rs b/test/vendored_workspace_dep/app/src/main.rs
@@ -0,0 +1,5 @@
+fn main() {
+    let mut buffer = itoa::Buffer::new();
+    let formatted = buffer.format(42);
+    println!("vendored itoa says: {formatted}");
+}
diff --git a/test/vendored_workspace_dep/mylib/BUILD.bazel b/test/vendored_workspace_dep/mylib/BUILD.bazel
@@ -0,0 +1,9 @@
+load("@rules_rs//rs:rust_library.bzl", "rust_library")
+
+package(default_visibility = ["//visibility:public"])
+
+rust_library(
+    name = "mylib",
+    srcs = ["src/lib.rs"],
+    edition = "2024",
+)
diff --git a/test/vendored_workspace_dep/mylib/Cargo.toml b/test/vendored_workspace_dep/mylib/Cargo.toml
@@ -0,0 +1,4 @@
+[package]
+name = "mylib"
+version = "0.1.0"
+edition = "2024"
diff --git a/test/vendored_workspace_dep/mylib/src/lib.rs b/test/vendored_workspace_dep/mylib/src/lib.rs
@@ -0,0 +1,3 @@
+pub fn hello() -> &'static str {
+    "hello from mylib"
+}
diff --git a/test/vendored_workspace_dep/vendor/itoa/Cargo.toml b/test/vendored_workspace_dep/vendor/itoa/Cargo.toml
@@ -0,0 +1,46 @@
+# THIS FILE IS AUTOMATICALLY GENERATED BY CARGO
+#
+# When uploading crates to the registry Cargo will automatically
+# "normalize" Cargo.toml files for maximal compatibility
+# with all versions of Cargo and also rewrite `path` dependencies
+# to registry (e.g., crates.io) dependencies.
+#
+# If you are reading this file be aware that the original Cargo.toml
+# will likely look very different (and much more reasonable).
+# See Cargo.toml.orig for the original contents.
+
+[package]
+edition = "2018"
+rust-version = "1.36"
+name = "itoa"
+version = "1.0.11"
+authors = ["David Tolnay <dtolnay@gmail.com>"]
+exclude = [
+    "performance.png",
+    "chart/**",
+]
+description = "Fast integer primitive to string conversion"
+documentation = "https://docs.rs/itoa"
+readme = "README.md"
+keywords = ["integer"]
+categories = [
+    "value-formatting",
+    "no-std",
+    "no-std::no-alloc",
+]
+license = "MIT OR Apache-2.0"
+repository = "https://github.com/dtolnay/itoa"
+
+[package.metadata.docs.rs]
+rustdoc-args = ["--generate-link-to-definition"]
+targets = ["x86_64-unknown-linux-gnu"]
+
+[lib]
+doc-scrape-examples = false
+
+[dependencies]
+mylib = { path = "../../mylib" }
+
+[dependencies.no-panic]
+version = "0.1"
+optional = true
diff --git a/test/vendored_workspace_dep/vendor/itoa/src/lib.rs b/test/vendored_workspace_dep/vendor/itoa/src/lib.rs
diff --git a/test/vendored_workspace_dep/vendor/itoa/src/udiv128.rs b/test/vendored_workspace_dep/vendor/itoa/src/udiv128.rs

Original file line number	Diff line number	Diff line change
`@@ -0,0 +1 @@`
	`1`	`+package(default_visibility = ["//visibility:public"])`