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

Author: bobozaur

.bazelci/presubmit.yml

@@ -1,19 +1,24 @@
 ---
 minimum_bazel_version: &minimum_bazel_version "7.4.1"
+minimum_bazel_shell_commands: &minimum_bazel_shell_commands
+  - echo "build --build_runfile_links" >> user.bazelrc
 no_bzlmod_bazel_version: &no_bzlmod_bazel_version "7.4.1"
 no_bzlmod_shell_commands: &no_bzlmod_shell_commands
   - echo "common --noenable_bzlmod --enable_workspace" >> user.bazelrc
+  - echo "build --build_runfile_links" >> user.bazelrc
   - echo "7.4.1" > .bazelversion
 no_bzlmod_rbe_shell_commands: &no_bzlmod_rbe_shell_commands
   - sed -i 's/^# load("@bazel_ci_rules/load("@bazel_ci_rules/' WORKSPACE.bazel
   - sed -i 's/^# rbe_preconfig/rbe_preconfig/' WORKSPACE.bazel
   - echo "common --noenable_bzlmod --enable_workspace" >> user.bazelrc
+  - echo "build --build_runfile_links" >> user.bazelrc
   - echo "7.4.1" > .bazelversion
 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.72.1"],\n|' WORKSPACE.bazel
+  - sed -i 's|^rust_register_toolchains(|rust_register_toolchains(versions = ["1.74.0"],\n|' WORKSPACE.bazel
+  - sed -i 's|^rust\.toolchain(|rust.toolchain(versions = ["1.74.0"],\n|' MODULE.bazel
 nightly_flags: &nightly_flags
   - "--//rust/toolchain/channel=nightly"
 nightly_aspects_flags: &nightly_aspects_flags
@@ -52,33 +57,23 @@ single_rust_channel_min_version_targets: &single_rust_channel_min_version_target
 default_linux_targets: &default_linux_targets
   - "--"
   - "//..."
+default_rbe_targets: &default_rbe_targets
+  - "--"
+  - "//..."
+  # These require the upstream tools wrapper to include a stdlib, which doesn't currently work on RBE.
+  # We should fix this. See https://github.com/bazelbuild/rules_rust/issues/3252
+  - "-//cargo/cargo_toml_variable_extractor/testdata/..."
 default_macos_targets: &default_macos_targets
   - "--"
   - "//..."
 default_windows_targets: &default_windows_targets
   - "--" # Allows negative patterns; hack for https://github.com/bazelbuild/continuous-integration/pull/245
   - "//..."
-  - "-//test/unit/pipelined_compilation/..."
-default_windows_no_runfiles_targets: &default_windows_no_runfiles_targets
-  - "--" # Allows negative patterns; hack for https://github.com/bazelbuild/continuous-integration/pull/245
-  - "//..."
-  # TODO: https://github.com/bazelbuild/rules_rust/issues/1156
-  - "-//crate_universe/..."
-  - "-//test/chained_direct_deps:mod3_doc_test"
-  - "-//test/out_dir_in_tests:demo_lib_doc_test"
-  - "-//test/rustc_env_files:output_test"
-  - "-//test/test_env_launcher:test"
-  - "-//test/test_env:test_manifest_dir"
-  - "-//test/test_env:test_run"
-  - "-//test/unit/pipelined_compilation/..."
-  - "-//test/unit/rustdoc/..."
-  - "-//rust/runfiles/..."
-  # Runfiles used by the test only.
-  - "-//test/empty_suite:deps_test"
 crate_universe_vendor_example_targets: &crate_universe_vendor_example_targets
   - "//vendor_external:crates_vendor"
   - "//vendor_local_manifests:crates_vendor"
   - "//vendor_local_pkgs:crates_vendor"
+  - "//vendor_local_patching:crates_vendor"
   - "//vendor_remote_manifests:crates_vendor"
   - "//vendor_remote_pkgs:crates_vendor"
   - "@rules_rust//tools/rust_analyzer:gen_rust_project"
@@ -105,8 +100,8 @@ tasks:
     shell_commands:
       - sed -i 's/^# load("@bazel_ci_rules/load("@bazel_ci_rules/' WORKSPACE.bazel
       - sed -i 's/^# rbe_preconfig/rbe_preconfig/' WORKSPACE.bazel
-    build_targets: *default_linux_targets
-    test_targets: *default_linux_targets
+    build_targets: *default_rbe_targets
+    test_targets: *default_rbe_targets
   macos:
     platform: macos_arm64
     build_targets: *default_macos_targets
@@ -132,8 +127,8 @@ tasks:
     platform: rbe_ubuntu2004
     bazel: *no_bzlmod_bazel_version
     shell_commands: *no_bzlmod_rbe_shell_commands
-    build_targets: *default_linux_targets
-    test_targets: *default_linux_targets
+    build_targets: *default_rbe_targets
+    test_targets: *default_rbe_targets
   macos_no_bzlmod:
     name: No Bzlmod
     platform: macos_arm64
@@ -150,15 +145,14 @@ tasks:
     shell_commands: *no_bzlmod_shell_commands
     build_targets: *default_windows_targets
     test_targets: *default_windows_targets
-  windows_no_runfiles:
-    name: No Runfiles
+  windows_with_runfiles:
+    name: With Runfiles
     platform: windows
-    build_flags:
-      - "--noenable_runfiles"
-    test_flags:
-      - "--noenable_runfiles"
-    build_targets: *default_windows_no_runfiles_targets
-    test_targets: *default_windows_no_runfiles_targets
+    batch_commands:
+      - echo startup --windows_enable_symlinks > user.bazelrc
+      - echo common --noenable_runfiles >> user.bazelrc
+    build_targets: *default_windows_targets
+    test_targets: *default_windows_targets
   ubuntu2004_split_coverage_postprocessing:
     name: Split Coverage Postprocessing
     platform: ubuntu2004
@@ -213,16 +207,16 @@ tasks:
       - sed -i 's/^# load("@bazel_ci_rules/load("@bazel_ci_rules/' WORKSPACE.bazel
       - sed -i 's/^# rbe_preconfig/rbe_preconfig/' WORKSPACE.bazel
     build_flags: *aspects_flags
-    build_targets: *default_linux_targets
-    test_targets: *default_linux_targets
+    build_targets: *default_rbe_targets
+    test_targets: *default_rbe_targets
   rbe_ubuntu2004_rolling_with_aspects:
     name: RBE Rolling Bazel Version With Aspects
     platform: rbe_ubuntu2004
     shell_commands:
       - sed -i 's/^# load("@bazel_ci_rules/load("@bazel_ci_rules/' WORKSPACE.bazel
       - sed -i 's/^# rbe_preconfig/rbe_preconfig/' WORKSPACE.bazel
-    build_targets: *default_linux_targets
-    test_targets: *default_linux_targets
+    build_targets: *default_rbe_targets
+    test_targets: *default_rbe_targets
     build_flags: *aspects_flags
     soft_fail: yes
     bazel: "rolling"
@@ -253,18 +247,19 @@ tasks:
     build_targets: *default_windows_targets
     test_targets: *default_windows_targets
   windows_no_runfiles_with_aspects:
-    name: No Runfiles With Aspects
+    name: With Runfiles With Aspects
     platform: windows
+    batch_commands:
+      - echo startup --windows_enable_symlinks > user.bazelrc
+      - echo common --noenable_runfiles >> user.bazelrc
     build_flags:
-      - "--noenable_runfiles"
       - "--config=rustfmt"
       - "--config=clippy"
     test_flags:
-      - "--noenable_runfiles"
       - "--config=rustfmt"
       - "--config=clippy"
-    build_targets: *default_windows_no_runfiles_targets
-    test_targets: *default_windows_no_runfiles_targets
+    build_targets: *default_windows_targets
+    test_targets: *default_windows_targets
   windows_rolling_with_aspects:
     name: "Windows Rolling Bazel Version With Aspects"
     platform: windows
@@ -332,6 +327,7 @@ tasks:
     # If updating the minimum bazel version, please also update /docs/index.md
     bazel: *minimum_bazel_version
     platform: ubuntu1804
+    shell_commands: *minimum_bazel_shell_commands
     build_targets: *default_linux_targets
     test_targets: *default_linux_targets
     coverage_targets: *default_linux_targets
@@ -340,6 +336,7 @@ tasks:
     name: "Min Bazel Version With Aspects"
     bazel: *minimum_bazel_version
     platform: ubuntu1804
+    shell_commands: *minimum_bazel_shell_commands
     build_targets: *default_linux_targets
     test_targets: *default_linux_targets
     build_flags: *aspects_flags
@@ -365,6 +362,7 @@ tasks:
     # Test rules while only registering a nightly toolchain
     shell_commands:
       - sed -i 's|^rust_register_toolchains(|load("//rust/private:common.bzl", "DEFAULT_RUST_VERSION")\nrust_register_toolchains(versions = [DEFAULT_RUST_VERSION],\n|' WORKSPACE.bazel
+      - sed -i 's|^rust\.toolchain(|rust.toolchain(versions = ['$(awk '$0 ~ /^DEFAULT_RUST_VERSION = / {print $3}' rust/private/common.bzl)'],\n|' MODULE.bazel
     build_targets: *single_rust_channel_targets
     test_targets: *single_rust_channel_targets
   ubuntu2004_stable_with_aspects:
@@ -373,6 +371,7 @@ tasks:
     # Test rules while only registering a nightly toolchain
     shell_commands:
       - sed -i 's|^rust_register_toolchains(|load("//rust/private:common.bzl", "DEFAULT_RUST_VERSION")\nrust_register_toolchains(versions = [DEFAULT_RUST_VERSION],\n|' WORKSPACE.bazel
+      - sed -i 's|^rust\.toolchain(|rust.toolchain(versions = ['$(awk '$0 ~ /^DEFAULT_RUST_VERSION = / {print $3}' rust/private/common.bzl)'],\n|' MODULE.bazel
     build_flags: *aspects_flags
     build_targets: *single_rust_channel_targets
     test_flags: *aspects_flags
@@ -383,6 +382,7 @@ tasks:
     # Test rules while only registering a nightly toolchain
     shell_commands:
       - sed -i 's|^rust_register_toolchains(|load("//rust/private:common.bzl", "DEFAULT_NIGHTLY_ISO_DATE")\nrust_register_toolchains(versions = ["nightly/" + DEFAULT_NIGHTLY_ISO_DATE],\n|' WORKSPACE.bazel
+      - sed -i 's|^rust\.toolchain(|rust.toolchain(versions = ["nightly/'$(awk -F '"' '$0 ~ /^DEFAULT_NIGHTLY_ISO_DATE = / {print $2}' rust/private/common.bzl)'"],\n|' MODULE.bazel
     build_flags: *nightly_flags
     build_targets: *single_rust_channel_targets
     test_flags: *nightly_flags
@@ -393,6 +393,7 @@ tasks:
     # Test rules while only registering a nightly toolchain
     shell_commands:
       - sed -i 's|^rust_register_toolchains(|load("//rust/private:common.bzl", "DEFAULT_NIGHTLY_ISO_DATE")\nrust_register_toolchains(versions = ["nightly/" + DEFAULT_NIGHTLY_ISO_DATE],\n|' WORKSPACE.bazel
+      - sed -i 's|^rust\.toolchain(|rust.toolchain(versions = ["nightly/'$(awk -F '"' '$0 ~ /^DEFAULT_NIGHTLY_ISO_DATE = / {print $2}' rust/private/common.bzl)'"],\n|' MODULE.bazel
     build_flags: *nightly_aspects_flags
     build_targets: *single_rust_channel_targets
     test_flags: *nightly_aspects_flags
@@ -520,77 +521,69 @@ tasks:
   cc_common_link_ubuntu2004:
     name: Build via cc_common.link
     platform: ubuntu2004
-    working_directory: test/cc_common_link
+    working_directory: test/integration/cc_common_link
+    build_targets:
+      - "//..."
+    test_targets:
+      - "//..."
+  cc_common_link_macos:
+    name: Build via cc_common.link
+    platform: macos_arm64
+    working_directory: test/integration/cc_common_link
     build_targets:
-      - "--"
       - "//..."
-      # The with_global_alloc directory is a repository on its own tested in the 'Build via cc_common.link using a global allocator' task.
-      - "-//with_global_alloc/..."
     test_targets:
-      - "--"
       - "//..."
-      # The with_global_alloc directory is a repository on its own tested in the 'Build via cc_common.link using a global allocator' task.
-      - "-//with_global_alloc/..."
-    build_flags:
-      - "--@rules_rust//rust/settings:experimental_use_cc_common_link=True"
-    test_flags:
-      - "--@rules_rust//rust/settings:experimental_use_cc_common_link=True"
   cc_common_link_with_global_alloc_ubuntu2004:
     name: Build via cc_common.link using a global allocator
     platform: ubuntu2004
-    working_directory: test/cc_common_link/with_global_alloc
+    working_directory: test/integration/cc_common_link_with_global_alloc
+    build_targets:
+      - "//..."
+    test_targets:
+      - "//..."
+  cc_common_link_with_global_alloc_macos:
+    name: Build via cc_common.link using a global allocator
+    platform: macos_arm64
+    working_directory: test/integration/cc_common_link_with_global_alloc
     build_targets:
       - "//..."
     test_targets:
       - "//..."
-    build_flags:
-      - "--@rules_rust//rust/settings:experimental_use_cc_common_link=True"
-      - "--@rules_rust//rust/settings:experimental_use_global_allocator=True"
-    test_flags:
-      - "--@rules_rust//rust/settings:experimental_use_cc_common_link=True"
-      - "--@rules_rust//rust/settings:experimental_use_global_allocator=True"
   cc_common_link_no_std_ubuntu2004:
     name: Build with no_std + alloc using cc_common.link infrastructure for linking
     platform: ubuntu2004
-    working_directory: test/no_std
+    working_directory: test/integration/no_std
     build_targets:
       - "//..."
     test_targets:
       - "//..."
     build_flags:
-      - "--@rules_rust//rust/toolchain/channel=nightly"
-      - "--@rules_rust//rust/settings:experimental_use_cc_common_link=True"
-      - "--@rules_rust//rust/settings:experimental_use_global_allocator=True"
-      - "--@rules_rust//rust/settings:no_std=alloc"
+      - "--config=no_std_alloc_using_cc_common_link"
     test_flags:
-      - "--@rules_rust//rust/toolchain/channel=nightly"
-      - "--@rules_rust//rust/settings:experimental_use_cc_common_link=True"
-      - "--@rules_rust//rust/settings:experimental_use_global_allocator=True"
-      - "--@rules_rust//rust/settings:no_std=alloc"
+      - "--config=no_std_alloc_using_cc_common_link"
   no_std_ubuntu2004:
     name: Build with no_std + alloc
     platform: ubuntu2004
-    working_directory: test/no_std
+    working_directory: test/integration/no_std
     build_targets:
       - "//..."
     test_targets:
       - "//..."
     build_flags:
-      - "--@rules_rust//rust/toolchain/channel=nightly"
-      - "--@rules_rust//rust/settings:no_std=alloc"
+      - "--config=no_std_alloc"
     test_flags:
-      - "--@rules_rust//rust/toolchain/channel=nightly"
-      - "--@rules_rust//rust/settings:no_std=alloc"
+      - "--config=no_std_alloc"
   bzlmod_repo_mapping_runfiles:
     name: bzlmod repo mapping test
     platform: ubuntu2004
-    working_directory: test/bzlmod_repo_mapping/module_a
+    working_directory: test/integration/bzlmod_repo_mapping/module_a
     test_targets:
       - "//..."
   aliased_toolchains:
     name: aliased toolchains test
     platform: ubuntu2004
-    working_directory: test/aliased_toolchains
+    working_directory: test/integration/aliased_toolchains
     build_targets:
       - "@rust_toolchains//:all"
       - "//..."
@@ -1073,6 +1066,8 @@ tasks:
     platform: ubuntu2004
     name: Extensions wasm-bindgen
     working_directory: extensions/wasm_bindgen
+    shell_commands:
+      - "bash ./test/bazelci_unix_setup.sh"
     build_flags: *aspects_flags
     test_flags: *aspects_flags
     build_targets:
@@ -1090,22 +1085,22 @@ tasks:
     test_flags: *aspects_flags
     build_targets:
       - "//..."
-    test_targets:
-      - "--"
-      - "//..."
-      # TODO: https://github.com/bazelbuild/rules_rust/issues/3039
-      - "-//rules_js/test:hello_world_wasm_lib_test"
-      - "-//rules_js/test:hello_world_wasm_direct_test"
+    # TODO: https://github.com/bazelbuild/rules_rust/issues/3039
+    # test_targets:
+    #   - "//..."
   extensions_wasm_bindgen_macos:
     platform: macos_arm64
     name: Extensions wasm-bindgen
-    working_directory: extensions
+    working_directory: extensions/wasm_bindgen
+    shell_commands:
+      - "bash ./test/bazelci_unix_setup.sh"
     build_flags: *aspects_flags
     test_flags: *aspects_flags
     build_targets:
       - "//..."
-    test_targets:
-      - "//..."
+    # TODO: https://github.com/bazelbuild/rules_rust/issues/3039
+    # test_targets:
+    #   - "//..."
   extensions_wasm_bindgen_windows:
     platform: windows
     name: Extensions wasm-bindgen

.bazelignore

@@ -4,7 +4,4 @@ crate_universe/private/bootstrap
 docs
 examples
 extensions
-test/aliased_toolchains
-test/bzlmod_repo_mapping
-test/cc_common_link
-test/no_std
+test/integration

.bazelrc

@@ -5,13 +5,12 @@
 ## https://bazel.build/docs/best-practices#bazelrc-file
 ###############################################################################
 
+# Skip building runfiles links for faster builds.
+build --nobuild_runfile_links
+
 # https://bazel.build/reference/command-line-reference#flag--enable_platform_specific_config
 common --enable_platform_specific_config
 
-# https://bazel.build/docs/windows#symlink
-startup --windows_enable_symlinks
-build:windows --enable_runfiles
-
 # Enable the only currently supported report type
 # https://bazel.build/reference/command-line-reference#flag--combined_report
 coverage --combined_report=lcov

.bazelversion

@@ -6,7 +6,7 @@ bcr_test_module:
       - "ubuntu2004"
       # # TODO: https://github.com/bazelbuild/rules_rust/issues/2009
       # - "windows"
-    bazel: ["7.x"]
+    bazel: ["7.x", "8.x"]
   tasks:
     run_tests:
       name: "Run test module"

.bcr/extensions/bindgen/presubmit.yml

@@ -2,7 +2,7 @@ bcr_test_module:
   module_path: ""
   matrix:
     platform: ["macos_arm64", "ubuntu2004", "windows"]
-    bazel: ["7.x"]
+    bazel: ["7.x", "8.x"]
   tasks:
     run_tests:
       name: "Run test module"