Merge branch 'main' into cargo_bazel_bootstrap

.bazelci/presubmit.yml

@@ -3,7 +3,7 @@ aspects_flags: &aspects_flags
   - "--config=rustfmt"
   - "--config=clippy"
 min_rust_version_shell_commands: &min_rust_version_shell_commands
-  - sed -i 's|^rust_register_toolchains(|rust_register_toolchains(versions = ["1.59.0"],\n|' WORKSPACE.bazel
+  - sed -i 's|^rust_register_toolchains(|rust_register_toolchains(versions = ["1.62.0"],\n|' WORKSPACE.bazel
 nightly_flags: &nightly_flags
   - "--//rust/toolchain/channel=nightly"
 nightly_aspects_flags: &nightly_aspects_flags
@@ -42,6 +42,10 @@ coverage_validation_post_shell_commands: &coverage_validation_post_shell_command
       ; 1>&2 cat bazel-out/_coverage/_coverage_report.dat \
       ; exit 1 \
       ; }
+split_coverage_postprocessing_shell_commands: &split_coverage_postprocessing_shell_commands
+  - echo "coverage --experimental_fetch_all_coverage_outputs" >> user.bazelrc
+  - echo "coverage --experimental_split_coverage_postprocessing" >> user.bazelrc
+  - echo "build --//rust/settings:experimental_use_coverage_metadata_files" >> user.bazelrc
 tasks:
   ubuntu2004:
     build_targets: *default_linux_targets
@@ -69,6 +73,18 @@ tasks:
   windows:
     build_targets: *default_windows_targets
     test_targets: *default_windows_targets
+  ubuntu2004_split_coverage_postprocessing:
+    name: Split Coverage Postprocessing
+    platform: ubuntu2004
+    shell_commands: *split_coverage_postprocessing_shell_commands
+    coverage_targets: *default_linux_targets
+    post_shell_commands: *coverage_validation_post_shell_commands
+  macos_split_coverage_postprocessing:
+    name: Split Coverage Postprocessing
+    platform: macos
+    shell_commands: *split_coverage_postprocessing_shell_commands
+    coverage_targets: *default_macos_targets
+    post_shell_commands: *coverage_validation_post_shell_commands
   ubuntu2004_opt:
     name: Opt Mode
     platform: ubuntu2004
@@ -205,15 +221,15 @@ tasks:
   ubuntu1804:
     name: "Min Bazel Version"
     # If updating the minimum bazel version, please also update /docs/index.md
-    bazel: "5.2.0"
+    bazel: "6.0.0"
     platform: ubuntu1804
     build_targets: *default_linux_targets
     test_targets: *default_linux_targets
     coverage_targets: *default_linux_targets
     post_shell_commands: *coverage_validation_post_shell_commands
   ubuntu1804_with_aspects:
     name: "Min Bazel Version With Aspects"
-    bazel: "5.2.0"
+    bazel: "6.0.0"
     platform: ubuntu1804
     build_targets: *default_linux_targets
     test_targets: *default_linux_targets
@@ -580,7 +596,7 @@ tasks:
       - "--apple_platform_type=ios"
     test_targets:
       - "//..."
-  # TODO: https://github.com/bazelbuild/rules_rust/issues/1892
+  # TODO: https://github.com/bazelbuild/rules_rust/issues/2075
   # zig_cross_compiling:
   #   name: Zig cross compiling test
   #   platform: ubuntu2004

.bazelrc

@@ -16,6 +16,10 @@ build:windows --enable_runfiles
 # https://bazel.build/reference/command-line-reference#flag--combined_report
 coverage --combined_report=lcov
 
+# Avoid fully cached builds reporting no coverage and failing CI
+# https://bazel.build/reference/command-line-reference#flag--experimental_fetch_all_coverage_outputs
+coverage --experimental_fetch_all_coverage_outputs
+
 ###############################################################################
 ## Unique configuration groups
 ###############################################################################

.clang-format

@@ -1,3 +1,4 @@
 ---
 BasedOnStyle: Google
+IndentWidth: 4
 ...

.gitattributes

@@ -12,7 +12,8 @@ examples/crate_universe_unnamed/vendor_remote_manifests/crates/** linguist-gener
 examples/crate_universe_unnamed/vendor_remote_pkgs/crates/** linguist-generated
 examples/sys/basic/3rdparty/crates/** linguist-generated
 examples/sys/complex/3rdparty/crates/** linguist-generated
-proto/3rdparty/crates/** linguist-generated
+proto/prost/private/3rdparty/crates/** linguist-generated
+proto/protobuf/3rdparty/crates/** linguist-generated
 tools/rust_analyzer/3rdparty/crates/** linguist-generated
 util/import/3rdparty/crates/** linguist-generated
 wasm_bindgen/3rdparty/crates/** linguist-generated

.github/workflows/formatting.yaml

@@ -0,0 +1,21 @@
+name: Formatting
+
+on:
+  push:
+    branches:
+      - main
+  pull_request:
+    types:
+      - opened
+      - synchronize
+
+jobs:
+  clang-format-checking:
+    runs-on: ubuntu-latest
+    steps:
+      - uses: actions/checkout@v2
+      - uses: DoozyX/[email protected]
+        with:
+          source: '.'
+          extensions: 'h,c,cc,proto'
+          clangFormatVersion: 14

WORKSPACE.bazel

@@ -10,13 +10,26 @@ load("@rules_rust//crate_universe:repositories.bzl", "crate_universe_dependencie
 
 crate_universe_dependencies(bootstrap = True)
 
-load("@rules_rust//proto:repositories.bzl", "rust_proto_repositories")
+# buildifier: disable=bzl-visibility
+load("@rules_rust//proto/prost/private:repositories.bzl", "rust_prost_dependencies", "rust_prost_register_toolchains")
 
-rust_proto_repositories()
+rust_prost_dependencies()
 
-load("@rules_rust//proto:transitive_repositories.bzl", "rust_proto_transitive_repositories")
+rust_prost_register_toolchains()
 
-rust_proto_transitive_repositories()
+load("@rules_rust//proto/prost:transitive_repositories.bzl", "rust_prost_transitive_repositories")
+
+rust_prost_transitive_repositories()
+
+load("@rules_rust//proto/protobuf:repositories.bzl", "rust_proto_protobuf_dependencies", "rust_proto_protobuf_register_toolchains")
+
+rust_proto_protobuf_dependencies()
+
+rust_proto_protobuf_register_toolchains()
+
+load("@rules_rust//proto/protobuf:transitive_repositories.bzl", "rust_proto_protobuf_transitive_repositories")
+
+rust_proto_protobuf_transitive_repositories()
 
 load("@rules_rust//bindgen:repositories.bzl", "rust_bindgen_dependencies", "rust_bindgen_register_toolchains")
 
@@ -48,6 +61,10 @@ load("//test:deps.bzl", "rules_rust_test_deps")
 
 rules_rust_test_deps()
 
+load("//test:deps_transitive.bzl", "rules_rust_test_deps_transitive")
+
+rules_rust_test_deps_transitive()
+
 # --- end stardoc
 
 load("@bazel_tools//tools/build_defs/repo:http.bzl", "http_archive")