Merge branch 'main' into revert

Author: UebelAndre

.bazelci/presubmit.yml

@@ -1108,7 +1108,3 @@ tasks:
       - "//..."
     test_targets:
       - "//..."
-
-buildifier:
-  version: latest
-  warnings: "all"

.github/workflows/formatting.yaml

@@ -14,6 +14,14 @@ jobs:
     runs-on: ubuntu-latest
     steps:
       - uses: actions/checkout@v2
+      - name: Buildifier
+        run: |
+          wget "https://github.com/bazelbuild/buildtools/releases/download/v${BUILDIFIER_VERSION}/buildifier-linux-amd64" -O buildifier
+          chmod +x ./buildifier
+          ./buildifier -lint=warn -mode=check -warnings=all -r ${{ github.workspace }}
+          rm ./buildifier
+        env:
+          BUILDIFIER_VERSION: 8.0.2
       - uses: DoozyX/[email protected]
         with:
           source: '.'

MODULE.bazel

@@ -90,7 +90,7 @@ use_repo(
     "libc",
     "rtra",
     "rtra__serde-1.0.217",
-    "rtra__serde_json-1.0.137",
+    "rtra__serde_json-1.0.138",
     "rules_rust_test_load_arbitrary_tool",
     "rules_rust_toolchain_test_target_json",
 )

cargo/private/cargo_build_script.bzl

@@ -4,6 +4,7 @@ load("@bazel_skylib//lib:paths.bzl", "paths")
 load("@bazel_skylib//rules:common_settings.bzl", "BuildSettingInfo")
 load("@bazel_tools//tools/cpp:toolchain_utils.bzl", "find_cpp_toolchain")
 load("@rules_cc//cc:action_names.bzl", "ACTION_NAMES")
+load("@rules_cc//cc/common:cc_common.bzl", "cc_common")
 load("//rust:defs.bzl", "rust_common")
 load("//rust:rust_common.bzl", "BuildInfo")
 

cargo/private/internal_extensions.bzl

@@ -1,5 +1,6 @@
 """Bzlmod module extensions that are only used internally"""
 
+load("@bazel_features//:features.bzl", "bazel_features")
 load("//cargo:deps.bzl", "cargo_dependencies")
 
 def _internal_deps_impl(module_ctx):
@@ -12,10 +13,15 @@ def _internal_deps_impl(module_ctx):
     # is_dev_dep is ignored here. It's not relevant for internal_deps, as dev
     # dependencies are only relevant for module extensions that can be used
     # by other MODULES.
-    return module_ctx.extension_metadata(
-        root_module_direct_deps = [repo.repo for repo in direct_deps],
-        root_module_direct_dev_deps = [],
-    )
+    metadata_kwargs = {
+        "root_module_direct_deps": [repo.repo for repo in direct_deps],
+        "root_module_direct_dev_deps": [],
+    }
+
+    if bazel_features.external_deps.extension_metadata_has_reproducible:
+        metadata_kwargs["reproducible"] = True
+
+    return module_ctx.extension_metadata(**metadata_kwargs)
 
 # This is named a single character to reduce the size of path names when running build scripts, to reduce the chance
 # of hitting the 260 character windows path name limit.

examples/crate_universe/MODULE.bazel

@@ -616,7 +616,7 @@ use_repo(
     "crates_vendor_pkgs__tracing-0.1.41",
     "crates_vendor_pkgs__tracing-subscriber-0.3.19",
     "cvm",
-    "cvm__tempfile-3.15.0",
+    "cvm__tempfile-3.16.0",
     "cvm__tokio-1.43.0",
     "cvm__tokio-test-0.4.4",
 )

examples/crate_universe/alias_rule/cargo-bazel-lock_global_alias_annotation_none.json

@@ -1,5 +1,5 @@
 {
-  "checksum": "ada765c28b94768d68976e0b5bfdbdd95c36c9c03fc4c1341112d3d03f89a7e3",
+  "checksum": "0b175bc37d566da5fe84c73eafac661a2a63c54e48018171d60023e60e2f959d",
   "crates": {
     "direct-cargo-bazel-deps 0.0.1": {
       "name": "direct-cargo-bazel-deps",

examples/crate_universe/alias_rule/cargo-bazel-lock_global_alias_annotation_opt.json

@@ -1,5 +1,5 @@
 {
-  "checksum": "f17d39a7245250d57bdde7ef4fb4ea9d20af493a0de62a2926a502b541b0d4cd",
+  "checksum": "6168e50ce554c325e7cd7648b8af23060c35670254e2ee6eb12e12ce8e361eaa",
   "crates": {
     "direct-cargo-bazel-deps 0.0.1": {
       "name": "direct-cargo-bazel-deps",

examples/crate_universe/alias_rule/cargo-bazel-lock_global_custom_annotation_none.json

@@ -1,5 +1,5 @@
 {
-  "checksum": "da9f00f61c0a0ba41e4e3bd4647ecd93cbf6698d63e682e4b87f1b997f7c992c",
+  "checksum": "8548d8aea6a668636f32213571ee4613bccf6e42a8c348729db3e995bb165c99",
   "crates": {
     "direct-cargo-bazel-deps 0.0.1": {
       "name": "direct-cargo-bazel-deps",

examples/crate_universe/alias_rule/cargo-bazel-lock_global_dbg_annotation_fastbuild.json

@@ -1,5 +1,5 @@
 {
-  "checksum": "b9c7a321739ba98b4426a4fff987ee2627784824a107e2751df9cd97c3ff6027",
+  "checksum": "0192c5add4aa14a44263591f6de5c6959f75ed8d19ca3f824c94155b43867cf9",
   "crates": {
     "direct-cargo-bazel-deps 0.0.1": {
       "name": "direct-cargo-bazel-deps",

examples/crate_universe/alias_rule/cargo-bazel-lock_global_opt_annotation_alias.json

@@ -1,5 +1,5 @@
 {
-  "checksum": "627b6296d8735ba4e760c7ba10b3e84a4ac0fe2e77b42ea94f9c6f9558b25827",
+  "checksum": "e5965970a46d761f1fd190c2fcaa3b9407e42c2f4276fa1aca28db0a2a6940ab",
   "crates": {
     "direct-cargo-bazel-deps 0.0.1": {
       "name": "direct-cargo-bazel-deps",

examples/crate_universe/alias_rule/cargo-bazel-lock_global_opt_annotation_dbg.json

@@ -1,5 +1,5 @@
 {
-  "checksum": "f7cd279078538b45cce848867dc0f792313acf77bf7609f35f5e61b5a1f8ffa5",
+  "checksum": "d077d90815047260cb05ba52fd60ff3acd28fe29f9d2944b343977a0b2ff3479",
   "crates": {
     "direct-cargo-bazel-deps 0.0.1": {
       "name": "direct-cargo-bazel-deps",

examples/crate_universe/alias_rule/cargo-bazel-lock_global_opt_annotation_none.json

@@ -1,5 +1,5 @@
 {
-  "checksum": "1dbed40c57aa50acd1bc2a5cd2ddb67f35ac3bbe511ac91e29d81fd464f91d55",
+  "checksum": "fbb85524633971bf48042b0e6a85766c02ad622cb0010345496dd11ece6b4d1e",
   "crates": {
     "direct-cargo-bazel-deps 0.0.1": {
       "name": "direct-cargo-bazel-deps",

examples/crate_universe/cargo_aliases/cargo-bazel-lock.json

@@ -1,5 +1,5 @@
 {
-  "checksum": "52b1cfe7911faccdeabc2611b0196e3beebbe211dd0e3a49fe29c6937eaaa330",
+  "checksum": "9394139952d3f3eb07a3263d99517fad1c7232e46a00dd82044eba40d2c8b718",
   "crates": {
     "anstyle 1.0.1": {
       "name": "anstyle",