Prevent adding @crates// dependency entries for dependencies in the

workspace

This comes up if you, for example, have a vendored dependency which
you've modified to point at something in your workspace

Author: walter-zeromatter

rs/extensions.bzl

@@ -205,9 +205,11 @@ def _generate_hub_and_spokes(
 
     workspace_root = _normalize_path(cargo_metadata["workspace_root"])
     workspace_root_prefix = workspace_root + "/"
+    workspace_package = _label_directory(cargo_lock_path)
     workspace_member_keys = {}
     for package in cargo_metadata["packages"]:
-        workspace_member_keys[(package["name"], package["version"])] = True
+        package_dir = _normalize_path(package["manifest_path"]).removeprefix(workspace_root_prefix).removesuffix("/Cargo.toml")
+        workspace_member_keys[(package["name"], package["version"])] = "@@//" + paths.join(workspace_package, package_dir)
 
     dep_paths_by_name = {}
     for package in cargo_metadata["packages"]:

test/BUILD.bazel

@@ -171,6 +171,26 @@ 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 = """
+        if grep 'vendored_workspace_dep//:mylib' $(location :vendored_workspace_dep_itoa_deps); then
+            echo "FAIL: itoa should not have a hub dep on workspace member mylib"
+            exit 1
+        fi
+        grep '//vendored_workspace_dep/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 +325,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",

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

test/MODULE.bazel.lock

@@ -0,0 +1 @@
+package(default_visibility = ["//visibility:public"])

test/vendored_workspace_dep/BUILD.bazel

@@ -0,0 +1,8 @@
+[workspace]
+members = ["mylib", "app"]
+exclude = ["vendor/itoa"]
+resolver = "3"
+
+[workspace.dependencies]
+mylib = { path = "./mylib" }
+itoa = { path = "./vendor/itoa" }

test/vendored_workspace_dep/Cargo.lock

@@ -0,0 +1,7 @@
+[package]
+name = "vendored_workspace_dep_demo"
+version = "0.1.0"
+edition = "2024"
+
+[dependencies]
+itoa = { workspace = true }

test/vendored_workspace_dep/Cargo.toml

@@ -0,0 +1,5 @@
+fn main() {
+    let mut buffer = itoa::Buffer::new();
+    let formatted = buffer.format(42);
+    println!("vendored itoa says: {formatted}");
+}

test/vendored_workspace_dep/app/Cargo.toml

@@ -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",
+)