Merge branch 'main' into wasi-p2-support-pr

Author: avrabe

.bazelci/presubmit.yml

@@ -809,18 +809,17 @@ tasks:
       - "@rules_rust//tools/rust_analyzer:gen_rust_project"
     test_targets:
       - "//..."
-  # TODO: https://github.com/bazelbuild/rules_rust/issues/2878
-  # windows_bzlmod_bcr:
-  #   name: bzlmod BCR presubmit
-  #   platform: windows
-  #   working_directory: examples/hello_world
-  #   test_flags: *bzlmod_flags
-  #   run_targets:
-  #     - "//third-party-in-workspace:vendor"
-  #   build_targets:
-  #     - "@rules_rust//tools/rust_analyzer:gen_rust_project"
-  #   test_targets:
-  #     - "//..."
+  windows_bzlmod_bcr:
+    name: bzlmod BCR presubmit
+    platform: windows
+    working_directory: examples/hello_world
+    test_flags: *bzlmod_flags
+    run_targets:
+      - "//third-party-in-workspace:vendor"
+    build_targets:
+      - "@rules_rust//tools/rust_analyzer:gen_rust_project"
+    test_targets:
+      - "//..."
   example_sys_linux:
     platform: ubuntu2204
     working_directory: examples/sys

crate_universe/extensions.bzl

@@ -6,7 +6,7 @@ This doc describes using crate_universe with bzlmod.
 
 If you're using a WORKSPACE file, please see [the WORKSPACE equivalent of this doc](crate_universe_workspace.html).
 
-There are some examples of using crate_universe with bzlmod in the [example folder](https://github.com/bazelbuild/rules_rust/examples/bzlmod).
+There are some examples of using crate_universe with bzlmod in the [example folder](https://github.com/bazelbuild/rules_rust/tree/main/examples).
 
 # Table of Contents
 
@@ -638,6 +638,7 @@ def _generate_hub_and_spokes(
             config_path = config_file,
             output_dir = tag_path.get_child("splicing-output"),
             debug_workspace_dir = tag_path.get_child("splicing-workspace"),
+            repository_name = cfg.name,
         )
 
         # If a cargo lockfile was not provided, use the splicing lockfile.
@@ -1360,7 +1361,7 @@ Environment Variables:
 | `CARGO_BAZEL_GENERATOR_SHA256` | The sha256 checksum of the file located at `CARGO_BAZEL_GENERATOR_URL` |
 | `CARGO_BAZEL_GENERATOR_URL` | The URL of a cargo-bazel binary. This variable takes precedence over attributes and can use `file://` for local paths |
 | `CARGO_BAZEL_ISOLATED` | An authoritative flag as to whether or not the `CARGO_HOME` environment variable should be isolated from the host configuration |
-| `CARGO_BAZEL_REPIN` | An indicator that the dependencies represented by the rule should be regenerated. `REPIN` may also be used. See [Repinning / Updating Dependencies](#repinning--updating-dependencies) for more details. |
+| `CARGO_BAZEL_REPIN` | An indicator that the dependencies represented by the rule should be regenerated. `REPIN` may also be used. See [Repinning / Updating Dependencies](crate_universe_workspace.html#repinning--updating-dependencies) for more details. |
 | `CARGO_BAZEL_REPIN_ONLY` | A comma-delimited allowlist for rules to execute repinning. Can be useful if multiple instances of the repository rule are used in a Bazel workspace, but repinning should be limited to one of them. |
 
 """,

crate_universe/private/crates_repository.bzl

@@ -89,6 +89,7 @@ def _crates_repository_impl(repository_ctx):
             splicing_manifest = splicing_manifest,
             config_path = config_path,
             output_dir = repository_ctx.path("splicing-output"),
+            repository_name = repository_ctx.name,
         )
 
         kwargs.update({

crate_universe/private/crates_vendor.bzl

@@ -39,6 +39,9 @@ if [[ -n "${{CARGO_BAZEL_DEBUG:-}}" ]]; then
     _ENVIRON+=(CARGO_BAZEL_DEBUG="${{CARGO_BAZEL_DEBUG}}")
 fi
 
+# Pass on CARGO_REGISTRIES_* and CARGO_REGISTRY*
+while IFS= read -r line; do _ENVIRON+=("${{line}}"); done < <(env | grep ^CARGO_REGISTR)
+
 # The path needs to be preserved to prevent bazel from starting with different
 # startup options (requiring a restart of bazel).
 # If you provide an empty path, bazel starts itself with

crate_universe/private/splicing_utils.bzl

@@ -122,6 +122,7 @@ def splice_workspace_manifest(
         splicing_manifest,
         config_path,
         output_dir,
+        repository_name,
         debug_workspace_dir = None):
     """Splice together a Cargo workspace from various other manifests and package definitions
 
@@ -132,6 +133,7 @@ def splice_workspace_manifest(
         splicing_manifest (path): The path to a splicing manifest.
         config_path (path): The path to the config file (containing `cargo_bazel::config::Config`.)
         output_dir (path): THe location in which to write splicing outputs.
+        repository_name (str): Name of the repository being generated.
         debug_workspace_dir (path): The location in which to save splicing outputs for future review.
 
     Returns:
@@ -147,6 +149,8 @@ def splice_workspace_manifest(
         splicing_manifest,
         "--config",
         config_path,
+        "--repository-name",
+        repository_name,
     ]
 
     if cargo_lockfile:

crate_universe/src/cli/splice.rs

@@ -57,6 +57,10 @@ pub struct SpliceOptions {
     /// The path to a rustc binary for use with Cargo
     #[clap(long, env = "RUSTC")]
     pub rustc: PathBuf,
+
+    /// The name of the repository being generated.
+    #[clap(long)]
+    pub repository_name: String,
 }
 
 /// Combine a set of disjoint manifests into a single workspace.
@@ -84,7 +88,7 @@ pub fn splice(opt: SpliceOptions) -> Result<()> {
     // Splice together the manifest
     let manifest_path = splicer
         .splice_workspace()
-        .context("Failed to splice workspace")?;
+        .with_context(|| format!("Failed to splice workspace {}", opt.repository_name))?;
 
     // Generate a lockfile
     let cargo_lockfile = generate_lockfile(

crate_universe/tests/cargo_integration_test.rs

@@ -116,6 +116,7 @@ fn run(repository_name: &str, manifests: HashMap<String, String>, lockfile: &str
         config,
         cargo,
         rustc,
+        repository_name: String::from("crates_index"),
     })
     .unwrap();