Merge branch 'main' into rust-analyzer-discover-config

Author: krasimirgg

.bazelci/presubmit.yml

@@ -72,7 +72,7 @@ default_windows_no_runfiles_targets: &default_windows_no_runfiles_targets
   - "-//test/test_env:test_run"
   - "-//test/unit/pipelined_compilation/..."
   - "-//test/unit/rustdoc/..."
-  - "-//tools/runfiles/..."
+  - "-//rust/runfiles/..."
   # Runfiles used by the test only.
   - "-//test/empty_suite:deps_test"
 crate_universe_vendor_example_targets: &crate_universe_vendor_example_targets
@@ -293,7 +293,7 @@ tasks:
       - "--enable_bzlmod"
     build_targets:
       - "//crate_universe:cargo_bazel_bin"
-      - "//tools/runfiles"
+      - "//rust/runfiles"
       - "//util/import"
   ubuntu2004_clang:
     name: With Clang
@@ -498,6 +498,14 @@ tasks:
     working_directory: examples/crate_universe_local_path
     run_targets:
       - "//:vendor_edit_test_in_tree"
+  example_bindgen_toolchain:
+    name: Example custom bindgen toolchain registration
+    platform: ubuntu2204
+    working_directory: examples/bindgen_toolchain
+    build_targets:
+      - "//..."
+    test_targets:
+      - "//..."
 # See https://github.com/bazelbuild/rules_rust/issues/2186 about re-enabling these.
 #  crate_universe_examples_windows:
 #    name: Crate Universe Examples

.github/release_notes.template

@@ -21,6 +21,8 @@ http_archive(
 
 ## Extensions
 
+<details>
+
 ### Bindgen
 
 <details>
@@ -140,3 +142,5 @@ http_archive(
 ```
 
 </details>
+
+</details>

.github/workflows/formatting.yaml

@@ -29,7 +29,7 @@ jobs:
           clangFormatVersion: 14
       - uses: actionsx/prettier@v2
         with:
-          args: --config "${{ github.workspace }}/.prettierrc.toml" --write "**/*.{js,ts}"
+          args: --config "${{ github.workspace }}/.prettierrc.toml" --write "**/*.{js,mjs,cjs,jsx,ts,tsx}"
       # Prettier has no diff view so we must make one ourselves
       # https://github.com/prettier/prettier/issues/6885
       - run: |

.github/workflows/release.yaml

@@ -111,7 +111,7 @@ jobs:
             bazel ${BAZEL_STARTUP_FLAGS[@]} run //crate_universe/tools/cross_installer -- --target=${TARGET} --output="${OUTPUT_PATH}"
         env:
           TARGET: "${{ matrix.env.TARGET }}"
-      - uses: actions/upload-artifact@v3
+      - uses: actions/upload-artifact@v4
         with:
           name: "${{ matrix.env.TARGET }}"
           path: ${{ github.workspace }}/crate_universe/target/artifacts/${{ matrix.env.TARGET }}
@@ -121,7 +121,7 @@ jobs:
     runs-on: ubuntu-20.04
     steps:
       - uses: actions/checkout@v3
-      - uses: actions/download-artifact@v3
+      - uses: actions/download-artifact@v4
         with:
           path: ${{ github.workspace }}/crate_universe/target/artifacts
       - name: Detect the current version
@@ -156,7 +156,7 @@ jobs:
           URL_PREFIX: https://github.com/${{ github.repository_owner }}/rules_rust/releases/download/${{ env.RELEASE_VERSION }}
 
       # Upload the artifact in case creating a release fails so all artifacts can then be manually recovered.
-      - uses: actions/upload-artifact@v3
+      - uses: actions/upload-artifact@v4
         with:
           name: "rules_rust.tar.gz"
           path: ${{ github.workspace }}/.github/rules_rust.tar.gz

MODULE.bazel

@@ -2,42 +2,20 @@
 
 module(
     name = "rules_rust",
-    version = "0.57.1",
+    version = "0.58.0",
 )
 
 ###############################################################################
 ## Core
 ###############################################################################
 
-bazel_dep(
-    name = "bazel_features",
-    version = "1.21.0",
-)
-bazel_dep(
-    name = "bazel_skylib",
-    version = "1.7.1",
-)
-bazel_dep(
-    name = "platforms",
-    version = "0.0.11",
-)
-bazel_dep(
-    name = "rules_cc",
-    version = "0.0.17",
-)
-bazel_dep(
-    name = "rules_license",
-    version = "1.0.0",
-)
-bazel_dep(
-    name = "rules_shell",
-    version = "0.3.0",
-)
-bazel_dep(
-    name = "apple_support",
-    version = "1.17.1",
-    repo_name = "build_bazel_apple_support",
-)
+bazel_dep(name = "bazel_features", version = "1.21.0")
+bazel_dep(name = "bazel_skylib", version = "1.7.1")
+bazel_dep(name = "platforms", version = "0.0.11")
+bazel_dep(name = "rules_cc", version = "0.1.1")
+bazel_dep(name = "rules_license", version = "1.0.0")
+bazel_dep(name = "rules_shell", version = "0.3.0")
+bazel_dep(name = "apple_support", version = "1.17.1", repo_name = "build_bazel_apple_support")
 
 internal_deps = use_extension("//rust/private:internal_extensions.bzl", "i")
 use_repo(
@@ -90,27 +68,15 @@ use_repo(
     "generated_inputs_in_external_repo",
     "libc",
     "rtra",
-    "rtra__serde-1.0.217",
-    "rtra__serde_json-1.0.138",
+    "rtra__serde-1.0.218",
+    "rtra__serde_json-1.0.139",
     "rules_rust_test_load_arbitrary_tool",
     "rules_rust_toolchain_test_target_json",
 )
 
-bazel_dep(
-    name = "rules_python",
-    version = "0.40.0",
-    dev_dependency = True,
-)
-bazel_dep(
-    name = "rules_testing",
-    version = "0.7.0",
-    dev_dependency = True,
-)
-bazel_dep(
-    name = "bazel_ci_rules",
-    version = "1.0.0",
-    dev_dependency = True,
-)
+bazel_dep(name = "rules_python", version = "0.40.0", dev_dependency = True)
+bazel_dep(name = "rules_testing", version = "0.7.0", dev_dependency = True)
+bazel_dep(name = "bazel_ci_rules", version = "1.0.0", dev_dependency = True)
 
 ###############################################################################
 ## Crate Universe
@@ -131,13 +97,13 @@ use_repo(
     "cui",
     "cui__anyhow-1.0.95",
     "cui__camino-1.1.9",
-    "cui__cargo-lock-10.0.1",
+    "cui__cargo-lock-10.1.0",
     "cui__cargo-platform-0.1.9",
     "cui__cargo_metadata-0.19.1",
     "cui__cargo_toml-0.21.0",
     "cui__cfg-expr-0.17.2",
     "cui__clap-4.5.26",
-    "cui__crates-index-3.5.0",
+    "cui__crates-index-3.6.0",
     "cui__glob-0.3.2",
     "cui__hex-0.4.3",
     "cui__indoc-2.0.5",

cargo/private/cargo_bootstrap.bzl

@@ -173,13 +173,13 @@ def _detect_changes(repository_ctx):
     # 'consumed' which means changes to it will trigger rebuilds
 
     for src in repository_ctx.attr.srcs:
-        repository_ctx.path(src)
+        repository_ctx.watch(src)
 
-    repository_ctx.path(repository_ctx.attr.cargo_lockfile)
-    repository_ctx.path(repository_ctx.attr.cargo_toml)
+    repository_ctx.watch(repository_ctx.attr.cargo_lockfile)
+    repository_ctx.watch(repository_ctx.attr.cargo_toml)
 
     if repository_ctx.attr.cargo_config:
-        repository_ctx.path(repository_ctx.attr.cargo_config)
+        repository_ctx.watch(repository_ctx.attr.cargo_config)
 
 def _cargo_bootstrap_repository_impl(repository_ctx):
     # Pretend to Bazel that this rule's input files have been used, so that it will re-run the rule if they change.

cargo/private/cargo_build_script.bzl

@@ -361,8 +361,12 @@ def _cargo_build_script_impl(ctx):
     if use_default_shell_env:
         env.update(ctx.configuration.default_shell_env)
 
+    if toolchain.cargo:
+        env.update({
+            "CARGO": "${{pwd}}/{}".format(toolchain.cargo.path),
+        })
+
     env.update({
-        "CARGO": "${{pwd}}/{}".format(toolchain.cargo.path),
         "CARGO_CRATE_NAME": name_to_crate_name(pkg_name),
         "CARGO_MANIFEST_DIR": manifest_dir,
         "CARGO_PKG_NAME": pkg_name,