Merge branch 'main' into examples

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: '.'

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")
 

examples/nix_cross_compiling/MODULE.bazel

@@ -14,7 +14,18 @@ local_path_override(
     path = "../..",
 )
 
-bazel_dep(name = "rules_nixpkgs_core", version = "0.12.0")
+bazel_dep(
+    name = "rules_nixpkgs_core",
+    version = "0.12.0",
+)
+bazel_dep(
+    name = "bazel_skylib",
+    version = "1.7.1",
+)
+bazel_dep(
+    name = "rules_cc",
+    version = "0.0.17",
+)
 
 internal = use_extension("//bazel:nix_repositories.bzl", "internal_ext")
 use_repo(

examples/nix_cross_compiling/bazel/toolchain_rules/llvm_cc_toolchain_config.bzl

@@ -5,6 +5,7 @@ load(
     "artifact_name_pattern",
     "feature",
 )
+load("@rules_cc//cc/common:cc_common.bzl", "cc_common")
 load("//bazel/toolchain_rules/cc_tools:clang.bzl", clang_compile_action_configs = "compile_action_configs")
 load("//bazel/toolchain_rules/cc_tools:ld.lld.bzl", ld_lld_link_action_configs = "link_action_configs")
 load("//bazel/toolchain_rules/cc_tools:ld64.lld.bzl", ld64_lld_link_action_configs = "link_action_configs")

extensions/bindgen/private/bindgen.bzl

@@ -19,6 +19,7 @@ load(
     "CPP_COMPILE_ACTION_NAME",
 )
 load("@rules_cc//cc:defs.bzl", "CcInfo", "cc_library")
+load("@rules_cc//cc/common:cc_common.bzl", "cc_common")
 load("@rules_rust//rust:defs.bzl", "rust_library")
 load("@rules_rust//rust:rust_common.bzl", "BuildInfo")
 

extensions/prost/private/prost.bzl

@@ -1,5 +1,6 @@
 """Rules for building protos in Rust with Prost and Tonic."""
 
+load("@rules_cc//cc/common:cc_info.bzl", "CcInfo")
 load("@rules_proto//proto:defs.bzl", "ProtoInfo", "proto_common")
 load("@rules_proto//proto:proto_common.bzl", proto_toolchains = "toolchains")
 load("@rules_rust//rust:defs.bzl", "rust_common")

extensions/prost/private/prost_transform.bzl

@@ -1,5 +1,6 @@
 """Prost rules."""
 
+load("@rules_cc//cc/common:cc_info.bzl", "CcInfo")
 load("@rules_rust//rust:defs.bzl", "rust_common")
 
 ProstTransformInfo = provider(

rust/private/BUILD.bazel

@@ -14,6 +14,9 @@ bzl_library(
 bzl_library(
     name = "rules_cc_bzl_lib",
     srcs = ["@rules_cc//cc:bzl_srcs"],
+    deps = [
+        "@rules_cc//cc/common",
+    ],
 )
 
 bzl_library(

rust/private/dummy_cc_toolchain/dummy_cc_toolchain.bzl

@@ -1,5 +1,7 @@
 """Cc toolchain definitions for use on wasm platforms"""
 
+load("@rules_cc//cc/common:cc_common.bzl", "cc_common")
+
 def _dummy_cc_toolchain_impl(_ctx):
     # The `all_files` attribute is referenced by rustc_compile_action().
     return [platform_common.ToolchainInfo(all_files = depset([]))]

rust/private/rust.bzl

@@ -15,6 +15,7 @@
 """Rust rule implementations"""
 
 load("@bazel_skylib//lib:paths.bzl", "paths")
+load("@rules_cc//cc/common:cc_info.bzl", "CcInfo")
 load("//rust/private:common.bzl", "COMMON_PROVIDERS", "rust_common")
 load("//rust/private:providers.bzl", "BuildInfo", "LintsInfo")
 load("//rust/private:rustc.bzl", "rustc_compile_action")

rust/private/rustc.bzl

@@ -22,6 +22,8 @@ load(
     "CPP_LINK_NODEPS_DYNAMIC_LIBRARY_ACTION_NAME",
     "CPP_LINK_STATIC_LIBRARY_ACTION_NAME",
 )
+load("@rules_cc//cc/common:cc_common.bzl", "cc_common")
+load("@rules_cc//cc/common:cc_info.bzl", "CcInfo")
 load(":common.bzl", "rust_common")
 load(":compat.bzl", "abs")
 load(":lto.bzl", "construct_lto_arguments")

rust/private/rustdoc_test.bzl

@@ -14,6 +14,7 @@
 
 """Rules for performing `rustdoc --test` on Bazel built crates"""
 
+load("@rules_cc//cc/common:cc_info.bzl", "CcInfo")
 load("//rust/private:common.bzl", "rust_common")
 load("//rust/private:providers.bzl", "CrateInfo")
 load("//rust/private:rustdoc.bzl", "rustdoc_compile_action")

rust/private/utils.bzl

@@ -16,6 +16,8 @@
 
 load("@bazel_skylib//lib:paths.bzl", "paths")
 load("@bazel_tools//tools/cpp:toolchain_utils.bzl", find_rules_cc_toolchain = "find_cpp_toolchain")
+load("@rules_cc//cc/common:cc_common.bzl", "cc_common")
+load("@rules_cc//cc/common:cc_info.bzl", "CcInfo")
 load(":compat.bzl", "abs")
 load(":providers.bzl", "BuildInfo", "CrateGroupInfo", "CrateInfo", "DepInfo", "DepVariantInfo", "RustcOutputDiagnosticsInfo")
 

rust/settings/BUILD.bazel

@@ -44,6 +44,7 @@ bzl_library(
     srcs = glob(["*.bzl"]),
     visibility = ["//rust:__pkg__"],
     deps = [
+        "//rust/private:bzl_lib",
         "@bazel_skylib//rules:common_settings",
     ],
 )

rust/settings/settings.bzl

@@ -10,10 +10,14 @@ load(
     "string_flag",
 )
 load(
-    "//rust:defs.bzl",
+    "//rust/private:clippy.bzl",
     _capture_clippy_output = "capture_clippy_output",
     _clippy_flag = "clippy_flag",
     _clippy_flags = "clippy_flags",
+)
+load("//rust/private:lto.bzl", "rust_lto_flag")
+load(
+    "//rust/private:rustc.bzl",
     _error_format = "error_format",
     _extra_exec_rustc_flag = "extra_exec_rustc_flag",
     _extra_exec_rustc_flags = "extra_exec_rustc_flags",
@@ -23,7 +27,6 @@ load(
     _per_crate_rustc_flag = "per_crate_rustc_flag",
     _rustc_output_diagnostics = "rustc_output_diagnostics",
 )
-load("//rust/private:lto.bzl", "rust_lto_flag")
 load("//rust/private:unpretty.bzl", "rust_unpretty_flag")
 load(":incompatible.bzl", "incompatible_flag")
 

rust/toolchain.bzl

@@ -4,6 +4,8 @@ Toolchain rules for Rust.
 """
 
 load("@bazel_skylib//rules:common_settings.bzl", "BuildSettingInfo")
+load("@rules_cc//cc/common:cc_common.bzl", "cc_common")
+load("@rules_cc//cc/common:cc_info.bzl", "CcInfo")
 load("//rust/platform:triple.bzl", "triple")
 load("//rust/private:common.bzl", "rust_common")
 load("//rust/private:lto.bzl", "RustLtoInfo")

test/cargo_build_script/cc_args_and_env/cc_args_and_env_test.bzl

@@ -11,6 +11,7 @@ load("@bazel_skylib//lib:unittest.bzl", "analysistest", "asserts")
 load("@rules_cc//cc:action_names.bzl", "ACTION_NAME_GROUPS")
 load("@rules_cc//cc:cc_toolchain_config_lib.bzl", "feature", "flag_group", "flag_set")
 load("@rules_cc//cc:defs.bzl", "cc_toolchain")
+load("@rules_cc//cc/common:cc_common.bzl", "cc_common")
 load("//cargo:defs.bzl", "cargo_build_script")
 
 def _test_cc_config_impl(ctx):

test/cc_shared_library/BUILD.bazel

@@ -1,3 +1,4 @@
+load("@rules_cc//cc:cc_shared_library.bzl", "cc_shared_library")
 load("@rules_cc//cc:defs.bzl", "cc_import", "cc_library", "cc_test")
 load("@rules_rust//rust:defs.bzl", "rust_binary", "rust_static_library")
 load("@rules_shell//shell:sh_test.bzl", "sh_test")

test/unit/cc_info/cc_info_test.bzl

@@ -2,6 +2,7 @@
 
 load("@bazel_skylib//lib:unittest.bzl", "analysistest", "asserts")
 load("@rules_cc//cc:defs.bzl", "cc_library")
+load("@rules_cc//cc/common:cc_info.bzl", "CcInfo")
 load("//rust:defs.bzl", "rust_binary", "rust_common", "rust_library", "rust_proc_macro", "rust_shared_library", "rust_static_library")
 
 def _is_dylib_on_windows(ctx):

test/unit/check_runfiles/check_runfiles_test.bzl

@@ -1,6 +1,7 @@
 """Unittests for rust rules."""
 
 load("@bazel_skylib//lib:unittest.bzl", "analysistest", "asserts")
+load("@rules_cc//cc:cc_binary.bzl", "cc_binary")
 load(
     "//rust:defs.bzl",
     "rust_binary",
@@ -56,7 +57,7 @@ def _check_runfiles_test():
     )
 
     # buildifier: disable=native-cc
-    native.cc_binary(
+    cc_binary(
         name = "libbar.so",
         srcs = ["bar.cc"],
         linkshared = True,

test/unit/consistent_crate_name/with_modified_crate_name.bzl

@@ -1,5 +1,7 @@
 """A custom rule that threats all its dependencies as direct dependencies."""
 
+load("@rules_cc//cc/common:cc_info.bzl", "CcInfo")
+
 # buildifier: disable=bzl-visibility
 load("//rust/private:providers.bzl", "BuildInfo", "CrateInfo", "DepInfo", "DepVariantInfo")
 

test/unit/force_all_deps_direct/generator.bzl

@@ -1,5 +1,7 @@
 """A custom rule that threats all its dependencies as direct dependencies."""
 
+load("@rules_cc//cc/common:cc_info.bzl", "CcInfo")
+
 # buildifier: disable=bzl-visibility
 load("//rust/private:providers.bzl", "BuildInfo", "CrateInfo", "DepInfo", "DepVariantInfo")
 

test/unit/interleaved_cc_info/interleaved_cc_info_test.bzl

@@ -2,6 +2,7 @@
 
 load("@bazel_skylib//lib:unittest.bzl", "analysistest", "asserts")
 load("@rules_cc//cc:defs.bzl", "cc_library")
+load("@rules_cc//cc/common:cc_info.bzl", "CcInfo")
 load("//rust:defs.bzl", "rust_library")
 
 def _interleaving_cc_link_order_test_impl(ctx):

test/unit/linkstamps/linkstamps_test.bzl

@@ -2,6 +2,7 @@
 
 load("@bazel_skylib//lib:unittest.bzl", "analysistest", "asserts")
 load("@rules_cc//cc:defs.bzl", "cc_library")
+load("@rules_cc//cc/common:cc_common.bzl", "cc_common")
 load("//rust:defs.bzl", "rust_binary", "rust_common", "rust_library", "rust_test")
 load("//test/unit:common.bzl", "assert_action_mnemonic")
 

test/unit/native_deps/native_action_inputs_test.bzl

@@ -1,6 +1,7 @@
 """Unittests for rust rules."""
 
 load("@bazel_skylib//lib:unittest.bzl", "analysistest", "asserts")
+load("@rules_cc//cc:cc_library.bzl", "cc_library")
 load(
     "//rust:defs.bzl",
     "rust_binary",
@@ -124,7 +125,7 @@ def _native_action_inputs_test():
     )
 
     # buildifier: disable=native-cc
-    native.cc_library(
+    cc_library(
         name = "bar",
         srcs = ["bar.cc"],
     )

test/unit/pipelined_compilation/wrap.bzl

@@ -1,5 +1,7 @@
 """A custom rule that wraps a crate called to_wrap."""
 
+load("@rules_cc//cc/common:cc_info.bzl", "CcInfo")
+
 # buildifier: disable=bzl-visibility
 load("//rust/private:providers.bzl", "BuildInfo", "CrateInfo", "DepInfo", "DepVariantInfo")
 

test/unit/stdlib/stdlib.bzl

@@ -1,6 +1,7 @@
 """Unittest to verify contents and ordering of rust stdlib in rust_library() CcInfo"""
 
 load("@bazel_skylib//lib:unittest.bzl", "analysistest", "asserts")
+load("@rules_cc//cc/common:cc_info.bzl", "CcInfo")
 load("//rust:defs.bzl", "rust_library")
 
 def _categorize_library(name):

test/unit/transitive_crate_outputs/transitive_crate_outputs_test.bzl

@@ -1,6 +1,7 @@
 """Unittests for rust rules."""
 
 load("@bazel_skylib//lib:unittest.bzl", "analysistest", "asserts")
+load("@rules_cc//cc:cc_library.bzl", "cc_library")
 load("//rust:defs.bzl", "rust_common", "rust_library")
 
 def _transitive_crate_outputs_test_impl(ctx):
@@ -32,7 +33,7 @@ def _transitive_crate_outputs_test():
     )
 
     # buildifier: disable=native-cc
-    native.cc_library(
+    cc_library(
         name = "baz",
         srcs = ["baz.cc"],
     )

test/unit/win_interface_library/win_interface_library_analysis_test.bzl

@@ -2,6 +2,7 @@
 
 load("@bazel_skylib//lib:unittest.bzl", "analysistest", "asserts")
 load("@rules_cc//cc:defs.bzl", "cc_binary")
+load("@rules_cc//cc/common:cc_info.bzl", "CcInfo")
 load("//rust:defs.bzl", "rust_binary", "rust_shared_library")
 
 def _win_interface_library_test_impl(ctx):