rebase

Author: ericmcbride

.bazelci/presubmit.yml

@@ -69,9 +69,6 @@ default_macos_targets: &default_macos_targets
 default_windows_targets: &default_windows_targets
   - "--" # Allows negative patterns; hack for https://github.com/bazelbuild/continuous-integration/pull/245
   - "//..."
-default_windows_no_runfiles_targets: &default_windows_no_runfiles_targets
-  - "--" # Allows negative patterns; hack for https://github.com/bazelbuild/continuous-integration/pull/245
-  - "//..."
 crate_universe_vendor_example_targets: &crate_universe_vendor_example_targets
   - "//vendor_external:crates_vendor"
   - "//vendor_local_manifests:crates_vendor"
@@ -148,15 +145,14 @@ tasks:
     shell_commands: *no_bzlmod_shell_commands
     build_targets: *default_windows_targets
     test_targets: *default_windows_targets
-  windows_no_runfiles:
-    name: No Runfiles
+  windows_with_runfiles:
+    name: With Runfiles
     platform: windows
-    build_flags:
-      - "--noenable_runfiles"
-    test_flags:
-      - "--noenable_runfiles"
-    build_targets: *default_windows_no_runfiles_targets
-    test_targets: *default_windows_no_runfiles_targets
+    batch_commands:
+      - echo startup --windows_enable_symlinks > user.bazelrc
+      - echo common --noenable_runfiles >> user.bazelrc
+    build_targets: *default_windows_targets
+    test_targets: *default_windows_targets
   ubuntu2004_split_coverage_postprocessing:
     name: Split Coverage Postprocessing
     platform: ubuntu2004
@@ -251,18 +247,19 @@ tasks:
     build_targets: *default_windows_targets
     test_targets: *default_windows_targets
   windows_no_runfiles_with_aspects:
-    name: No Runfiles With Aspects
+    name: With Runfiles With Aspects
     platform: windows
+    batch_commands:
+      - echo startup --windows_enable_symlinks > user.bazelrc
+      - echo common --noenable_runfiles >> user.bazelrc
     build_flags:
-      - "--noenable_runfiles"
       - "--config=rustfmt"
       - "--config=clippy"
     test_flags:
-      - "--noenable_runfiles"
       - "--config=rustfmt"
       - "--config=clippy"
-    build_targets: *default_windows_no_runfiles_targets
-    test_targets: *default_windows_no_runfiles_targets
+    build_targets: *default_windows_targets
+    test_targets: *default_windows_targets
   windows_rolling_with_aspects:
     name: "Windows Rolling Bazel Version With Aspects"
     platform: windows

.bazelrc

@@ -11,10 +11,6 @@ build --nobuild_runfile_links
 # https://bazel.build/reference/command-line-reference#flag--enable_platform_specific_config
 common --enable_platform_specific_config
 
-# https://bazel.build/docs/windows#symlink
-startup --windows_enable_symlinks
-build:windows --enable_runfiles
-
 # Enable the only currently supported report type
 # https://bazel.build/reference/command-line-reference#flag--combined_report
 coverage --combined_report=lcov

.github/github.bazelrc

@@ -3,10 +3,6 @@
 # Always display the flags being used
 common --announce_rc
 
-# These settings make the windows workers behave similarly to unix workers
-startup --windows_enable_symlinks
-build --enable_runfiles
-
 # Show errors in CI
 test --test_output=errors
 

MODULE.bazel

@@ -2,7 +2,7 @@
 
 module(
     name = "rules_rust",
-    version = "0.59.1",
+    version = "0.59.2",
 )
 
 ###############################################################################

cargo/cargo_build_script_runner/cargo_manifest_dir.rs

@@ -279,7 +279,7 @@ impl RunfilesMaker {
     /// Delete runfiles from the runfiles directory that do not match user defined suffixes
     ///
     /// The Windows implementation assumes symlinks are not supported and real files will have
-    /// been copied into the runfiles directoriy.
+    /// been copied into the runfiles directory.
     fn drain_runfiles_dir_windows(&self) -> Result<(), String> {
         for dest in self.runfiles.values() {
             if !self

crate_universe/extensions.bzl

@@ -26,7 +26,7 @@ There are some examples of using crate_universe with bzlmod in the [example fold
 To use rules_rust in a project using bzlmod, add the following to your MODULE.bazel file:
 
 ```python
-bazel_dep(name = "rules_rust", version = "0.59.1")
+bazel_dep(name = "rules_rust", version = "0.59.2")
 ```
 
 You find the latest version on the [release page](https://github.com/bazelbuild/rules_rust/releases).
@@ -243,7 +243,7 @@ module(
 bazel_dep(name = "bazel_skylib", version = "1.7.1")
 
 # https://github.com/bazelbuild/rules_rust/releases
-bazel_dep(name = "rules_rust", version = "0.59.1")
+bazel_dep(name = "rules_rust", version = "0.59.2")
 
 ###############################################################################
 # T O O L C H A I N S
@@ -801,7 +801,11 @@ def _get_generator(module_ctx):
         generator_sha256 = module_ctx.os.environ.get(CARGO_BAZEL_GENERATOR_SHA256)
         generator_url = module_ctx.os.environ.get(CARGO_BAZEL_GENERATOR_URL)
     elif len(CARGO_BAZEL_URLS) == 0:
-        return module_ctx.path(Label("@cargo_bazel_bootstrap//:cargo-bazel"))
+        # For Bazel 7 and below, `module_ctx.path` will also watch files so to avoid
+        # volatility in lock files caused by referencing host specific files, direct
+        # references are avoided.
+        return module_ctx.path(Label("@cargo_bazel_bootstrap//:BUILD.bazel")).dirname.get_child("cargo-bazel")
+
     else:
         generator_sha256 = CARGO_BAZEL_SHA256S.get(host_triple.str)
         generator_url = CARGO_BAZEL_URLS.get(host_triple.str)
@@ -839,8 +843,17 @@ def _get_host_cargo_rustc(module_ctx, host_triple, host_tools_repo):
     """
     binary_ext = system_to_binary_ext(host_triple.system)
 
-    cargo_path = str(module_ctx.path(Label("@{}//:bin/cargo{}".format(host_tools_repo, binary_ext))))
-    rustc_path = str(module_ctx.path(Label("@{}//:bin/rustc{}".format(host_tools_repo, binary_ext))))
+    # For Bazel 7 and below, `module_ctx.path` will also watch files so to avoid
+    # volatility in lock files caused by referencing host specific files, direct
+    # references are avoided. Note that `BUILD.bazel` is not used as it also
+    # contains host specific data.
+    root = module_ctx.path(Label("@{rust_host_tools}//:WORKSPACE.bazel".format(
+        rust_host_tools = host_tools_repo,
+    )))
+
+    cargo_path = root.dirname.get_child("bin/cargo{}".format(binary_ext))
+    rustc_path = root.dirname.get_child("bin/rustc{}".format(binary_ext))
+
     return cargo_path, rustc_path
 
 def _crate_impl(module_ctx):

docs/src/index.md

@@ -98,5 +98,3 @@ WORKSPACE support is officially tested with Bazel 7 for as long as that is the m
 We aim to support Linux and macOS.
 
 We do not have sufficient maintainer expertise to support Windows. Most things probably work, but we have had to disable many tests in CI because we lack the expertise to fix them. We welcome contributions to help improve its support.
-
-Windows support for some features requires `--enable_runfiles` to be passed to Bazel, we recommend putting it in your bazelrc. See [Using Bazel on Windows](https://bazel.build/configure/windows) for more Windows-specific recommendations.

examples/all_crate_deps/.bazelrc

@@ -1,10 +1,3 @@
-# Required on windows
-common --enable_platform_specific_config
-startup --windows_enable_symlinks
-build:windows --enable_runfiles
-
-build --experimental_enable_bzlmod
-
 # This isn't currently the defaut in Bazel, but we enable it to test we'll be ready if/when it flips.
 build --incompatible_disallow_empty_glob
 

examples/compile_opt/.bazelrc

@@ -1,8 +1,3 @@
-# Required on windows
-common --enable_platform_specific_config
-startup --windows_enable_symlinks
-build:windows --enable_runfiles
-
 # This isn't currently the defaut in Bazel, but we enable it to test we'll be ready if/when it flips.
 build --incompatible_disallow_empty_glob
 

examples/crate_universe/MODULE.bazel

@@ -603,7 +603,6 @@ use_repo(
     "crates_vendor_pkgs__tracing-0.1.41",
     "crates_vendor_pkgs__tracing-subscriber-0.3.19",
     "cvm",
-    "cvm__serde_yaml-0.9.34-deprecated",
     "cvm__tempfile-3.19.0",
     "cvm__tokio-1.44.1",
     "cvm__tokio-test-0.4.4",