Merge branch 'main' into patrick/bazel9

Author: patrickmscott

.gitattributes

@@ -2,7 +2,7 @@
 **/cargo-bazel-lock.json linguist-generated
 crate_universe/3rdparty/crates/** linguist-generated
 crate_universe/test_data/metadata/*/metadata.json linguist-generated
-examples/bzlmod/hello_world/third-party/crates/** linguist-generated
+examples/hello_world/third-party/crates/** linguist-generated
 examples/crate_universe_unnamed/vendor_remote_manifests/crates/** linguist-generated
 examples/crate_universe_unnamed/vendor_remote_pkgs/crates/** linguist-generated
 examples/crate_universe/vendor_external/crates/** linguist-generated

crate_universe/extensions.bzl

@@ -144,7 +144,7 @@ For more details about repin, [please refer to the documentation](https://bazelb
 In cases where Rust targets have heavy interactions with other Bazel targets ([Cc](https://docs.bazel.build/versions/main/be/c-cpp.html), [Proto](https://rules-proto-grpc.com/en/4.5.0/lang/rust.html),
 etc.), maintaining Cargo.toml files may have diminishing returns as things like rust-analyzer
 begin to be confused about missing targets or environment variables defined only in Bazel.
-In situations like this, it may be desirable to have a "Cargo free" setup. You find an example in the in the [example folder](https://github.com/bazelbuild/rules_rust/examples/bzlmod/hello_world_no_cargo).
+In situations like this, it may be desirable to have a "Cargo free" setup. You find an example in the in the [example folder](https://github.com/bazelbuild/rules_rust/tree/main/examples/hello_world_no_cargo).
 
 crates_repository supports this through the packages attribute,
 as shown below.
@@ -227,7 +227,7 @@ Only a cargo workspace needs updating whenever the underlying Cargo.toml file ch
 In some cases, it is require that all external dependencies are vendored, meaning downloaded
 and stored in the workspace. This helps, for example, to conduct licence scans, apply custom patches,
 or to ensure full build reproducibility since no download error could possibly occur.
-You find a complete example in the in the [example folder](https://github.com/bazelbuild/rules_rust/examples/bzlmod/all_deps_vendor).
+You find a complete example in the in the [example folder](https://github.com/bazelbuild/rules_rust/tree/main/examples/all_deps_vendor).
 
 For the setup, you need to add the skylib in addition to the rust rules to your `MODULE.bazel`.
 
@@ -367,7 +367,7 @@ sys_deps()
 
 Now, you can build the project as usual.
 
-There are some more examples of using crate_universe with bzlmod in the [example folder](https://github.com/bazelbuild/rules_rust/blob/main/examples/bzlmod/).
+There are some more examples of using crate_universe with bzlmod in the [example folder](https://github.com/bazelbuild/rules_rust/blob/main/examples/).
 
 """
 

tools/rust_analyzer/3rdparty/BUILD.bazel

@@ -3,6 +3,18 @@ load("//crate_universe:defs.bzl", "crate", "crates_vendor")
 
 crates_vendor(
     name = "crates_vendor",
+    annotations = {
+        "io-lifetimes": [
+            crate.annotation(
+                patches = ["@rules_rust//tools/rust_analyzer/3rdparty/patches:io-lifetimes-determinism.patch"],
+            ),
+        ],
+        "rustix": [
+            crate.annotation(
+                patches = ["@rules_rust//tools/rust_analyzer/3rdparty/patches:rustix-determinism.patch"],
+            ),
+        ],
+    },
     cargo_lockfile = "Cargo.Bazel.lock",
     mode = "remote",
     packages = {

tools/rust_analyzer/3rdparty/crates/defs.bzl

@@ -0,0 +1 @@
+exports_files(glob(include = ["*.patch"]))

tools/rust_analyzer/3rdparty/patches/BUILD.bazel

@@ -0,0 +1,3 @@
+# Crate Patches
+
+Patches in this folder are used for patching crates in `../crates`, e.g. to fix non deterministic behavior.

tools/rust_analyzer/3rdparty/patches/README.md

@@ -0,0 +1,21 @@
+diff --git build.rs build.rs
+index 2fc2a38..5a01d04 100644
+--- build.rs
++++ build.rs
+@@ -43,7 +43,6 @@ fn has_feature(feature: &str) -> bool {
+ fn can_compile<T: AsRef<str>>(test: T) -> bool {
+     use std::process::Stdio;
+ 
+-    let out_dir = var("OUT_DIR").unwrap();
+     let rustc = var("RUSTC").unwrap();
+     let target = var("TARGET").unwrap();
+ 
+@@ -68,7 +67,7 @@ fn can_compile<T: AsRef<str>>(test: T) -> bool {
+         .arg("--target")
+         .arg(target)
+         .arg("--out-dir")
+-        .arg(out_dir); // Put the output somewhere inconsequential.
++        .arg("/dev/null"); // Put the output somewhere inconsequential to avoid non-determinism.
+ 
+     // If Cargo wants to set RUSTFLAGS, use that.
+     if let Ok(rustflags) = var("CARGO_ENCODED_RUSTFLAGS") {

tools/rust_analyzer/3rdparty/patches/io-lifetimes-determinism.patch

@@ -0,0 +1,33 @@
+diff --git build.rs build.rs
+index 320b3052..611bd280 100644
+--- build.rs
++++ build.rs
+@@ -86,7 +86,10 @@ fn main() {
+         // x86 our asm support requires naked functions. On PowerPC and MIPS,
+         // Rust's inline asm is considered experimental, so only use it if
+         // `--cfg=rustix_use_experimental_asm` is given.
+-        if (feature_rustc_dep_of_std || vendor == "mustang" || can_compile("use std::arch::asm;"))
++        // Note: On x86_64 linux, assume asm is available (any rustc >= 1.59 supports it)
++        // to avoid non-deterministic probe compilation.
++        let has_asm = arch == "x86_64" || feature_rustc_dep_of_std || vendor == "mustang" || can_compile("use std::arch::asm;");
++        if has_asm
+             && (arch != "x86" || has_feature("naked_functions"))
+             && ((arch != "powerpc64" && arch != "mips" && arch != "mips64")
+                 || rustix_use_experimental_asm)
+@@ -242,7 +245,6 @@ fn has_feature(feature: &str) -> bool {
+ fn can_compile<T: AsRef<str>>(test: T) -> bool {
+     use std::process::Stdio;
+ 
+-    let out_dir = var("OUT_DIR").unwrap();
+     let rustc = var("RUSTC").unwrap();
+     let target = var("TARGET").unwrap();
+ 
+@@ -267,7 +269,7 @@ fn can_compile<T: AsRef<str>>(test: T) -> bool {
+         .arg("--target")
+         .arg(target)
+         .arg("--out-dir")
+-        .arg(out_dir); // Put the output somewhere inconsequential.
++        .arg("/dev/null"); // Put the output somewhere inconsequential.
+ 
+     // If Cargo wants to set RUSTFLAGS, use that.
+     if let Ok(rustflags) = var("CARGO_ENCODED_RUSTFLAGS") {