Merge branch 'main' into bugfix/cargo-home-crlf

Author: timbess

.github/workflows/formatting.yaml

@@ -21,7 +21,7 @@ jobs:
           ./buildifier -lint=warn -mode=check -warnings=all -r ${{ github.workspace }}
           rm ./buildifier
         env:
-          BUILDIFIER_VERSION: 8.0.2
+          BUILDIFIER_VERSION: 8.2.0
       - uses: DoozyX/clang-format-lint-action@v0.14
         with:
           source: '.'

cargo/private/cargo_build_script.bzl

@@ -193,6 +193,27 @@ def _pwd_flags_isystem(args):
 
     return res
 
+def _pwd_flags_bindir(args):
+    """Prefix execroot-relative paths of known arguments with ${pwd}.
+
+    Args:
+        args (list): List of tool arguments.
+
+    Returns:
+        list: The modified argument list.
+    """
+    res = []
+    fix_next_arg = False
+    for arg in args:
+        if fix_next_arg and not paths.is_absolute(arg):
+            res.append("${{pwd}}/{}".format(arg))
+        else:
+            res.append(arg)
+
+        fix_next_arg = arg == "-B"
+
+    return res
+
 def _pwd_flags_fsanitize_ignorelist(args):
     """Prefix execroot-relative paths of known arguments with ${pwd}.
 
@@ -212,7 +233,7 @@ def _pwd_flags_fsanitize_ignorelist(args):
     return res
 
 def _pwd_flags(args):
-    return _pwd_flags_fsanitize_ignorelist(_pwd_flags_isystem(_pwd_flags_sysroot(args)))
+    return _pwd_flags_fsanitize_ignorelist(_pwd_flags_isystem(_pwd_flags_bindir(_pwd_flags_sysroot(args))))
 
 def _feature_enabled(ctx, feature_name, default = False):
     """Check if a feature is enabled.

examples/hello_world/MODULE.bazel

@@ -28,6 +28,7 @@ crate.from_cargo(
     manifests = ["//third-party-in-workspace:Cargo.toml"],
 )
 use_repo(crate, "crates_in_workspace")
+
 crate.annotation(
     additive_build_file = "//:BUILD.anyhow.bazel",
     crate = "anyhow",

rust/toolchain.bzl

@@ -65,7 +65,7 @@ def _rust_stdlib_filegroup_impl(ctx):
         alloc_files = [f for f in dot_a_files if "alloc" in f.basename and "std" not in f.basename]
         between_alloc_and_core_files = [f for f in dot_a_files if "compiler_builtins" in f.basename]
         core_files = [f for f in dot_a_files if ("core" in f.basename or "adler" in f.basename) and "std" not in f.basename]
-        panic_files = [f for f in dot_a_files if f.basename in ["cfg_if", "libc", "panic_abort", "panic_unwind", "unwind"]]
+        panic_files = [f for f in dot_a_files if any([c in f.basename for c in ["cfg_if", "libc", "panic_abort", "panic_unwind", "unwind"]])]
         between_core_and_std_files = [
             f
             for f in dot_a_files

test/cargo_build_script/cc_args_and_env/BUILD.bazel

@@ -1,5 +1,7 @@
 load(
     "cc_args_and_env_test.bzl",
+    "bindir_absolute_test",
+    "bindir_relative_test",
     "fsanitize_ignorelist_absolute_test",
     "fsanitize_ignorelist_relative_test",
     "isystem_absolute_test",
@@ -19,6 +21,10 @@ isystem_relative_test(name = "isystem_relative_test")
 
 isystem_absolute_test(name = "isystem_absolute_test")
 
+bindir_relative_test(name = "bindir_relative_test")
+
+bindir_absolute_test(name = "bindir_absolute_test")
+
 fsanitize_ignorelist_absolute_test(name = "fsanitize_ignorelist_absolute_test")
 
 fsanitize_ignorelist_relative_test(name = "fsanitize_ignorelist_relative_test")

test/cargo_build_script/cc_args_and_env/cc_args_and_env_test.bzl

@@ -207,6 +207,28 @@ def isystem_absolute_test(name):
         expected_cflags = ["-isystem", "/test/absolute/path"],
     )
 
+def bindir_relative_test(name):
+    cargo_build_script_with_extra_cc_compile_flags(
+        name = "%s/cargo_build_script" % name,
+        extra_cc_compile_flags = ["-B", "test/relative/path"],
+    )
+    cc_args_and_env_analysis_test(
+        name = name,
+        target_under_test = "%s/cargo_build_script" % name,
+        expected_cflags = ["-B", "${pwd}/test/relative/path"],
+    )
+
+def bindir_absolute_test(name):
+    cargo_build_script_with_extra_cc_compile_flags(
+        name = "%s/cargo_build_script" % name,
+        extra_cc_compile_flags = ["-B", "/test/absolute/path"],
+    )
+    cc_args_and_env_analysis_test(
+        name = name,
+        target_under_test = "%s/cargo_build_script" % name,
+        expected_cflags = ["-B", "/test/absolute/path"],
+    )
+
 def fsanitize_ignorelist_relative_test(name):
     cargo_build_script_with_extra_cc_compile_flags(
         name = "%s/cargo_build_script" % name,