Merge branch 'main' into json-output

Author: EnzoPlayer0ne

.bazelci/presubmit.yml

@@ -2,6 +2,19 @@
 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
+nightly_flags: &nightly_flags
+  - "--//rust/toolchain/channel=nightly"
+nightly_aspects_flags: &nightly_aspects_flags
+  - "--//rust/toolchain/channel=nightly"
+  - "--config=rustfmt"
+  - "--config=clippy"
+single_rust_channel_targets: &single_rust_channel_targets
+  - "--"
+  - "//..."
+  # These tests are expected to fail as they require both a nightly and stable toolchain.
+  - "-//test/unit/channel_transitions/..."
 default_linux_targets: &default_linux_targets
   - "//..."
 default_macos_targets: &default_macos_targets
@@ -47,8 +60,8 @@ tasks:
   windows:
     build_flags:
       - "--enable_runfiles" # this is not enabled by default on windows and is necessary for the cargo build scripts
-      - "--config=rustfmt"
-      - "--config=clippy"
+    test_flags:
+      - "--enable_runfiles"
     build_targets: *default_windows_targets
     test_targets: *default_windows_targets
   ubuntu2004_opt:
@@ -58,24 +71,28 @@ tasks:
     test_targets: *default_linux_targets
     build_flags:
       - "--compilation_mode=opt"
+    test_flags:
+      - "--compilation_mode=opt"
   macos_opt:
     name: Opt Mode
     platform: macos
     build_targets: *default_macos_targets
     test_targets: *default_macos_targets
     build_flags:
       - "--compilation_mode=opt"
-  # # TODO: https://github.com/bazelbuild/rules_rust/issues/1629
-  # windows_opt:
-  #   name: Opt Mode
-  #   platform: windows
-  #   build_flags:
-  #     - "--enable_runfiles" # this is not enabled by default on windows and is necessary for the cargo build scripts
-  #     - "--config=rustfmt"
-  #     - "--config=clippy"
-  #     - "--compilation_mode=opt"
-  #   build_targets: *default_windows_targets
-  #   test_targets: *default_windows_targets
+    test_flags:
+      - "--compilation_mode=opt"
+  windows_opt:
+    name: Opt Mode
+    platform: windows
+    build_flags:
+      - "--enable_runfiles" # this is not enabled by default on windows and is necessary for the cargo build scripts
+      - "--compilation_mode=opt"
+    test_flags:
+      - "--enable_runfiles"
+      - "--compilation_mode=opt"
+    build_targets: *default_windows_targets
+    test_targets: *default_windows_targets
   ubuntu2004_with_aspects:
     name: With Aspects
     platform: ubuntu2004
@@ -135,6 +152,8 @@ tasks:
       - "--enable_runfiles" # this is not enabled by default on windows and is necessary for the cargo build scripts
       - "--config=rustfmt"
       - "--config=clippy"
+    test_flags:
+      - "--enable_runfiles"
     build_targets: *default_windows_targets
     test_targets: *default_windows_targets
   windows_rolling_with_aspects:
@@ -144,6 +163,8 @@ tasks:
       - "--enable_runfiles" # this is not enabled by default on windows and is necessary for the cargo build scripts
       - "--config=rustfmt"
       - "--config=clippy"
+    test_flags:
+      - "--enable_runfiles"
     build_targets: *default_windows_targets
     test_targets: *default_windows_targets
     soft_fail: yes
@@ -194,6 +215,58 @@ tasks:
     build_targets: *default_linux_targets
     test_targets: *default_linux_targets
     build_flags: *aspects_flags
+  ubuntu2004_min_rust_version:
+    name: "Min Rust Version"
+    platform: ubuntu2004
+    shell_commands: *min_rust_version_shell_commands
+    build_targets: *single_rust_channel_targets
+    test_targets: *single_rust_channel_targets
+  ubuntu2004_min_rust_version_with_aspects:
+    name: "Min Rust Version With Aspects"
+    platform: ubuntu2004
+    shell_commands: *min_rust_version_shell_commands
+    build_flags: *aspects_flags
+    build_targets: *single_rust_channel_targets
+    test_flags: *aspects_flags
+    test_targets: *single_rust_channel_targets
+  ubuntu2004_stable_toolchain:
+    name: "Only Stable Toolchain"
+    platform: ubuntu2004
+    # 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
+    build_targets: *single_rust_channel_targets
+    test_targets: *single_rust_channel_targets
+  ubuntu2004_stable_with_aspects:
+    name: "Only Stable Toolchain With Aspects"
+    platform: ubuntu2004
+    # 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
+    build_flags: *aspects_flags
+    build_targets: *single_rust_channel_targets
+    test_flags: *aspects_flags
+    test_targets: *single_rust_channel_targets
+  ubuntu2004_nightly_toolchain:
+    name: "Only Nightly Toolchain"
+    platform: ubuntu2004
+    # 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
+    build_flags: *nightly_flags
+    build_targets: *single_rust_channel_targets
+    test_flags: *nightly_flags
+    test_targets: *single_rust_channel_targets
+  ubuntu2004_nightly_with_aspects:
+    name: "Only Nightly Toolchain With Aspects"
+    platform: ubuntu2004
+    # 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
+    build_flags: *nightly_aspects_flags
+    build_targets: *single_rust_channel_targets
+    test_flags: *nightly_aspects_flags
+    test_targets: *single_rust_channel_targets
   ubuntu2004_rolling_with_aspects:
     name: "Rolling Bazel Version With Aspects"
     bazel: "rolling"
@@ -219,7 +292,7 @@ tasks:
     name: Negative Rustfmt Tests
     platform: ubuntu2004
     run_targets:
-      - "//test/rustfmt:test_runner"
+      - "//test/rustfmt:rustfmt_integration_test_suite.test_runner"
   rust_analyzer_tests:
     name: Rust-Analyzer Tests
     platform: ubuntu2004
@@ -307,6 +380,8 @@ tasks:
       - "--enable_runfiles" # this is not enabled by default on windows and is necessary for the cargo build scripts
       - "--config=rustfmt"
       - "--config=clippy"
+    test_flags:
+      - "--enable_runfiles"
     windows_targets: &windows_targets
       - "--" # Allows negative patterns; hack for https://github.com/bazelbuild/continuous-integration/pull/245
       - "//..."
@@ -444,9 +519,16 @@ tasks:
     platform: macos
     working_directory: examples/ios_build
     test_flags:
-      - "--platforms=//:ios_x86_64"
+      - "--cpu=ios_x86_64"
+      - "--apple_platform_type=ios"
     test_targets:
       - "//..."
+  zig_cross_compiling:
+    name: Zig cross compiling test
+    platform: ubuntu2004
+    working_directory: examples/zig_cross_compiling
+    build_targets:
+      - "//..."
 
 buildifier:
   version: latest

.bazelrc

@@ -1,5 +1,16 @@
-# `.bazelrc` is a Bazel configuration file.
-# https://bazel.build/docs/best-practices#bazelrc-file
+###############################################################################
+## Bazel Configuration Flags
+##
+## `.bazelrc` is a Bazel configuration file.
+## https://bazel.build/docs/best-practices#bazelrc-file
+###############################################################################
+
+# https://bazel.build/docs/windows#symlink
+startup --windows_enable_symlinks
+
+###############################################################################
+## Unique configuration groups
+###############################################################################
 
 # Enable rustfmt for all targets in the workspace
 build:rustfmt --aspects=//rust:defs.bzl%rustfmt_aspect
@@ -9,9 +20,22 @@ build:rustfmt --output_groups=+rustfmt_checks
 build:clippy --aspects=//rust:defs.bzl%rust_clippy_aspect
 build:clippy --output_groups=+clippy_checks
 
-# https://bazel.build/docs/windows#symlink
-startup --windows_enable_symlinks
+###############################################################################
+## Incompatibility flags
+###############################################################################
+
+# https://github.com/bazelbuild/bazel/issues/8195
+build --incompatible_disallow_empty_glob=true
+
+# https://github.com/bazelbuild/bazel/issues/12821
+build --nolegacy_external_runfiles
+
+###############################################################################
+## Custom user flags
+##
+## This should always be the last thing in the `.bazelrc` file to ensure
+## consistent behavior when setting flags in that file as `.bazelrc` files are
+## evaluated top to bottom.
+###############################################################################
 
-# This import should always be last to allow users to override
-# settings for local development.
 try-import %workspace%/user.bazelrc

.gitattributes

@@ -0,0 +1,18 @@
+**/Cargo.Bazel.lock linguist-generated
+**/cargo-bazel-lock.json linguist-generated
+bindgen/3rdparty/crates/** linguist-generated
+crate_universe/3rdparty/crates/** linguist-generated
+crate_universe/test_data/metadata/*/metadata.json linguist-generated
+examples/crate_universe/vendor_external/crates/** linguist-generated
+examples/crate_universe/vendor_local_manifests/crates/** linguist-generated
+examples/crate_universe/vendor_local_pkgs/crates/** linguist-generated
+examples/crate_universe/vendor_remote_manifests/crates/** linguist-generated
+examples/crate_universe/vendor_remote_pkgs/crates/** linguist-generated
+examples/crate_universe_unnamed/vendor_remote_manifests/crates/** linguist-generated
+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
+tools/rust_analyzer/3rdparty/crates/** linguist-generated
+util/import/3rdparty/crates/** linguist-generated
+wasm_bindgen/3rdparty/crates/** linguist-generated

.github/github.bazelrc

@@ -16,5 +16,4 @@ build --verbose_failures
 # UI for cleaner CI output
 common --color=no
 common --curses=no
-common --show_task_finish
 common --show_timestamps

.github/workflows/release.yaml

@@ -2,6 +2,11 @@
 name: Release
 on:
   workflow_dispatch:
+  push:
+    branches:
+      - main
+    paths:
+      - version.bzl
 
 defaults:
   run:
@@ -14,7 +19,7 @@ jobs:
   validation:
     runs-on: ubuntu-20.04
     steps:
-      - uses: actions/checkout@v2
+      - uses: actions/checkout@v3
       # TODO: Unfortunately it's not obvious how to restrict `workflow_dispatch` to a particular branch
       # so this step ensures releases are always done off of `main`.
       - name: Ensure branch is 'main'
@@ -50,6 +55,9 @@ jobs:
           - os: ubuntu-20.04
             env:
               TARGET: "aarch64-unknown-linux-gnu"
+          - os: windows-2019
+            env:
+              TARGET: "aarch64-pc-windows-msvc"
           - os: macos-11
             env:
               TARGET: "x86_64-apple-darwin"
@@ -66,13 +74,16 @@ jobs:
             env:
               TARGET: "x86_64-unknown-linux-musl"
     steps:
-      - uses: actions/checkout@v2
+      - uses: actions/checkout@v3
       - name: Install rust toolchains for host
         run: |
           # Detect the current version of rust
           version="$(grep 'DEFAULT_RUST_VERSION =' ./rust/private/common.bzl | grep -o '[[:digit:].]\+')"
           rustup override set "${version}"
+          rustup target add ${TARGET}
           rustup update stable && rustup default stable
+        env:
+          TARGET: "${{ matrix.env.TARGET }}"
       - name: Setup macos build tooling
         run: |
           sudo xcode-select -s /Applications/Xcode_12.4.app/Contents/Developer/
@@ -95,7 +106,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@v2
+      - uses: actions/upload-artifact@v3
         with:
           name: "${{ matrix.env.TARGET }}"
           path: ${{ github.workspace }}/crate_universe/target/artifacts/${{ matrix.env.TARGET }}
@@ -104,8 +115,8 @@ jobs:
     needs: builds
     runs-on: ubuntu-20.04
     steps:
-      - uses: actions/checkout@v2
-      - uses: actions/download-artifact@v2
+      - uses: actions/checkout@v3
+      - uses: actions/download-artifact@v3
         with:
           path: ${{ github.workspace }}/crate_universe/target/artifacts
       - name: Detect the current version
@@ -127,7 +138,7 @@ jobs:
           ARTIFACTS_DIR: ${{ github.workspace }}/crate_universe/target/artifacts
           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@v2
+      - uses: actions/upload-artifact@v3
         with:
           name: "rules_rust.tar.gz"
           path: ${{ github.workspace }}/.github/rules_rust.tar.gz
@@ -169,6 +180,15 @@ jobs:
           asset_name: cargo-bazel-aarch64-apple-darwin
           asset_path: ${{ github.workspace }}/crate_universe/target/artifacts/aarch64-apple-darwin/cargo-bazel
           asset_content_type: application/octet-stream
+      - name: "Upload aarch64-pc-windows-msvc"
+        uses: actions/upload-release-asset@v1
+        env:
+          GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
+        with:
+          upload_url: ${{ steps.rules_rust_release.outputs.upload_url }}
+          asset_name: cargo-bazel-aarch64-pc-windows-msvc.exe
+          asset_path: ${{ github.workspace }}/crate_universe/target/artifacts/aarch64-pc-windows-msvc/cargo-bazel.exe
+          asset_content_type: application/octet-stream
       - name: "Upload aarch64-unknown-linux-gnu"
         uses: actions/upload-release-asset@v1
         env:

BUILD.bazel

@@ -95,6 +95,15 @@ extra_exec_rustc_flag(
     visibility = ["//visibility:public"],
 )
 
+# This setting may be used to override the prefix for source paths rustc embeds into build artifacts.
+# Setting this setting to a fixed value (e.g., "/source/") can help achieve reproducible builds and
+# improve cache utilization.
+source_path_prefix(
+    name = "source_path_prefix",
+    build_setting_default = ".",
+    visibility = ["//visibility:public"],
+)
+
 # This setting is used by the clippy rules. See https://bazelbuild.github.io/rules_rust/rust_clippy.html
 label_flag(
     name = "clippy.toml",

bindgen/3rdparty/BUILD.bazel

@@ -5,6 +5,7 @@ crates_vendor(
     name = "crates_vendor",
     annotations = {
         "bindgen": [crate.annotation(
+            gen_binaries = ["bindgen"],
             gen_build_script = True,
         )],
         "clang-sys": [crate.annotation(