Extend relative path dep test to include Cargo workspace

Author: malt3

test/integration/external_relative_path_deps/MODULE.bazel

@@ -17,22 +17,31 @@ use_repo(rust, "rust_toolchains")
 
 register_toolchains("@rust_toolchains//:all")
 
-# Test: crate_universe with Cargo workspace where a member has a path dependency
-# that goes OUTSIDE the Cargo workspace root (but still inside the Bazel workspace).
+# Test: crate_universe with Cargo workspace where a member has path dependencies
+# that go OUTSIDE the Cargo workspace root (but still inside the Bazel workspace).
 #
 # Structure:
-#   external_crate/           <- Outside Cargo workspace
-#   cargo_workspace/          <- Cargo workspace root
-#     Cargo.toml              <- [workspace] members = ["member"]
+#   external_crate/           <- Outside Cargo workspace (standalone)
+#   external_crate_b/         <- Outside Cargo workspace (standalone)
+#   external_workspace/       <- Separate Cargo workspace
+#     ext_ws_crate/           <- Member of external_workspace
+#   cargo_workspace/          <- Primary Cargo workspace
+#     Cargo.toml              <- [workspace] with [workspace.dependencies] for external_crate + ext_ws_crate
 #     member/
-#       Cargo.toml            <- external_crate = { path = "../../external_crate" }
+#       Cargo.toml            <- external_crate via workspace = true,
+#                                external_crate_b via direct path dep,
+#                                ext_ws_crate via workspace = true
 #
-# This should work but currently fails because crate_universe doesn't copy
-# the external path dependency into the temp splicing directory.
+# Tests three code paths: workspace-inherited external path deps, direct
+# external path deps declared inline in a member, and external path deps
+# from a crate that belongs to a different Cargo workspace.
 crate = use_extension("@rules_rust//crate_universe:extensions.bzl", "crate")
 crate.from_cargo(
     name = "crates",
     cargo_lockfile = "//cargo_workspace:Cargo.lock",
-    manifests = ["//cargo_workspace:Cargo.toml"],
+    manifests = [
+        "//cargo_workspace:Cargo.toml",
+        "//:external_workspace/ext_ws_crate/Cargo.toml",
+    ],
 )
 use_repo(crate, "crates")

test/integration/external_relative_path_deps/MODULE.bazel.lock

@@ -1,3 +1,7 @@
 [workspace]
 members = ["member"]
 resolver = "2"
+
+[workspace.dependencies]
+external_crate = { path = "../external_crate" }
+ext_ws_crate = { path = "../external_workspace/ext_ws_crate" }

test/integration/external_relative_path_deps/cargo_workspace/Cargo.lock

@@ -4,9 +4,12 @@ rust_library(
     name = "member",
     srcs = ["src/lib.rs"],
     deps = [
-        # The external_crate dependency should be resolved by crate_universe
-        # even though it's located outside the Cargo workspace via path = "../../external_crate"
+        # Workspace dep: declared in [workspace.dependencies] with a path outside the workspace.
         "@crates//:external_crate",
+        # Direct dep: declared inline with a path outside the workspace.
+        "@crates//:external_crate_b",
+        # Workspace dep from a different Cargo workspace.
+        "@crates//:ext_ws_crate",
     ],
 )
 

test/integration/external_relative_path_deps/cargo_workspace/Cargo.toml

@@ -6,6 +6,9 @@ edition = "2021"
 [lib]
 
 [dependencies]
-# This path dependency goes OUTSIDE the Cargo workspace root.
-# This is the scenario from issue #3089.
-external_crate = { path = "../../external_crate" }
+# Inherited from [workspace.dependencies]. Path goes outside the workspace.
+external_crate.workspace = true
+# Direct path dep that also goes outside the workspace.
+external_crate_b = { path = "../../external_crate_b" }
+# Inherited from [workspace.dependencies]. Path goes to a crate in a different Cargo workspace.
+ext_ws_crate.workspace = true

test/integration/external_relative_path_deps/cargo_workspace/member/BUILD.bazel

@@ -1,6 +1,34 @@
-use external_crate;
-
-/// Re-exports the greeting from external_crate.
+/// Re-exports the greeting from external_crate (workspace dep).
 pub fn say_hello() -> &'static str {
     external_crate::greet()
 }
+
+/// Re-exports the greeting from external_crate_b (direct dep).
+pub fn say_hello_b() -> &'static str {
+    external_crate_b::greet()
+}
+
+/// Re-exports the greeting from ext_ws_crate (belongs to a different Cargo workspace).
+pub fn say_hello_ext_ws() -> &'static str {
+    ext_ws_crate::greet()
+}
+
+#[cfg(test)]
+mod tests {
+    use super::*;
+
+    #[test]
+    fn test_workspace_dep() {
+        assert_eq!(say_hello(), "Hello from external_crate!");
+    }
+
+    #[test]
+    fn test_direct_dep() {
+        assert_eq!(say_hello_b(), "Hello from external_crate_b!");
+    }
+
+    #[test]
+    fn test_ext_workspace_dep() {
+        assert_eq!(say_hello_ext_ws(), "Hello from ext_ws_crate!");
+    }
+}

test/integration/external_relative_path_deps/cargo_workspace/member/Cargo.toml

@@ -0,0 +1,67 @@
+###############################################################################
+# @generated
+# DO NOT MODIFY: This file is auto-generated by a crate_universe tool. To 
+# regenerate this file, run the following:
+#
+#     bazel mod show_repo 'external_relative_path_deps_test'
+###############################################################################
+
+load("@rules_rust//cargo:defs.bzl", "cargo_toml_env_vars")
+
+load("@rules_rust//rust:defs.bzl", "rust_library")
+
+# buildifier: disable=bzl-visibility
+load("@rules_rust//crate_universe/private:selects.bzl", "selects")
+
+package(default_visibility = ["//visibility:public"])
+
+cargo_toml_env_vars(
+    name = "cargo_toml_env_vars",
+    src = "Cargo.toml",
+)
+
+rust_library(
+    name = "external_crate_b",
+    compile_data = glob(
+        allow_empty = True,
+        include = ["**"],
+        exclude = [
+            "**/* *",
+            ".tmp_git_root/**/*",
+            "BUILD",
+            "BUILD.bazel",
+            "WORKSPACE",
+            "WORKSPACE.bazel",
+        ],
+    ),
+    crate_root = "src/lib.rs",
+    edition = "2021",
+    rustc_env_files = [
+        ":cargo_toml_env_vars",
+    ],
+    rustc_flags = [
+        "--cap-lints=allow",
+    ],
+    srcs = glob(
+        allow_empty = True,
+        include = ["**/*.rs"],
+    ),
+    tags = [
+        "cargo-bazel",
+        "crate-name=external_crate_b",
+        "manual",
+        "noclippy",
+        "norustfmt",
+    ],
+    target_compatible_with = select({
+        "@rules_rust//rust/platform:aarch64-apple-darwin": [],
+        "@rules_rust//rust/platform:aarch64-unknown-linux-gnu": [],
+        "@rules_rust//rust/platform:wasm32-unknown-unknown": [],
+        "@rules_rust//rust/platform:wasm32-wasip1": [],
+        "@rules_rust//rust/platform:x86_64-pc-windows-msvc": [],
+        "@rules_rust//rust/platform:x86_64-unknown-linux-gnu": [],
+        "@rules_rust//rust/platform:x86_64-unknown-nixos-gnu": [],
+        "//conditions:default": ["@platforms//:incompatible"],
+    }),
+    version = "0.1.0",
+)

test/integration/external_relative_path_deps/cargo_workspace/member/src/lib.rs

@@ -0,0 +1,6 @@
+[package]
+name = "external_crate_b"
+version = "0.1.0"
+edition = "2021"
+
+[lib]

test/integration/external_relative_path_deps/external_crate_b/BUILD.bazel

@@ -0,0 +1,4 @@
+/// Returns a greeting from external_crate_b.
+pub fn greet() -> &'static str {
+    "Hello from external_crate_b!"
+}