From 3c1bcc012f285dc59d39143e658df67659142cd1 Mon Sep 17 00:00:00 2001 From: David Tolnay Date: Wed, 27 Dec 2023 16:17:36 -0800 Subject: [PATCH] Bazel rules_rust 0.35.0 --- WORKSPACE | 4 ++-- third-party/bazel/BUILD.anstyle-1.0.4.bazel | 4 +++- third-party/bazel/BUILD.cc-1.0.83.bazel | 4 +++- third-party/bazel/BUILD.clap-4.4.11.bazel | 4 +++- third-party/bazel/BUILD.clap_builder-4.4.11.bazel | 4 +++- third-party/bazel/BUILD.clap_lex-0.6.0.bazel | 4 +++- third-party/bazel/BUILD.codespan-reporting-0.11.1.bazel | 4 +++- third-party/bazel/BUILD.libc-0.2.151.bazel | 4 +++- third-party/bazel/BUILD.once_cell-1.19.0.bazel | 4 +++- third-party/bazel/BUILD.proc-macro2-1.0.70.bazel | 4 +++- third-party/bazel/BUILD.quote-1.0.33.bazel | 4 +++- third-party/bazel/BUILD.scratch-1.0.7.bazel | 4 +++- third-party/bazel/BUILD.syn-2.0.41.bazel | 4 +++- third-party/bazel/BUILD.termcolor-1.4.0.bazel | 4 +++- third-party/bazel/BUILD.unicode-ident-1.0.12.bazel | 4 +++- third-party/bazel/BUILD.unicode-width-0.1.11.bazel | 4 +++- third-party/bazel/BUILD.winapi-0.3.9.bazel | 4 +++- .../bazel/BUILD.winapi-i686-pc-windows-gnu-0.4.0.bazel | 4 +++- third-party/bazel/BUILD.winapi-util-0.1.6.bazel | 4 +++- .../bazel/BUILD.winapi-x86_64-pc-windows-gnu-0.4.0.bazel | 4 +++- third-party/bazel/alias_rules.bzl | 6 +++++- third-party/bazel/defs.bzl | 6 ++++-- 22 files changed, 68 insertions(+), 24 deletions(-) diff --git a/WORKSPACE b/WORKSPACE index b8399b33a..6806a0669 100644 --- a/WORKSPACE +++ b/WORKSPACE @@ -4,8 +4,8 @@ load("@bazel_tools//tools/build_defs/repo:http.bzl", "http_archive") http_archive( name = "rules_rust", - sha256 = "75177226380b771be36d7efc538da842c433f14cd6c36d7660976efb53defe86", - urls = ["https://github.com/bazelbuild/rules_rust/releases/download/0.34.1/rules_rust-v0.34.1.tar.gz"], + sha256 = "d21c328b21f3c9ecfa4c1e92dd61ace63ff22603234067cf0fe495f75ac251ae", + urls = ["https://github.com/bazelbuild/rules_rust/releases/download/0.35.0/rules_rust-v0.35.0.tar.gz"], ) load("@rules_rust//rust:repositories.bzl", "rules_rust_dependencies", "rust_register_toolchains") diff --git a/third-party/bazel/BUILD.anstyle-1.0.4.bazel b/third-party/bazel/BUILD.anstyle-1.0.4.bazel index f38c404c6..baffdaa9b 100644 --- a/third-party/bazel/BUILD.anstyle-1.0.4.bazel +++ b/third-party/bazel/BUILD.anstyle-1.0.4.bazel @@ -34,7 +34,9 @@ rust_library( ], crate_root = "src/lib.rs", edition = "2021", - rustc_flags = ["--cap-lints=allow"], + rustc_flags = [ + "--cap-lints=allow", + ], tags = [ "cargo-bazel", "crate-name=anstyle", diff --git a/third-party/bazel/BUILD.cc-1.0.83.bazel b/third-party/bazel/BUILD.cc-1.0.83.bazel index 47550d207..3a13bd03d 100644 --- a/third-party/bazel/BUILD.cc-1.0.83.bazel +++ b/third-party/bazel/BUILD.cc-1.0.83.bazel @@ -30,7 +30,9 @@ rust_library( ), crate_root = "src/lib.rs", edition = "2018", - rustc_flags = ["--cap-lints=allow"], + rustc_flags = [ + "--cap-lints=allow", + ], tags = [ "cargo-bazel", "crate-name=cc", diff --git a/third-party/bazel/BUILD.clap-4.4.11.bazel b/third-party/bazel/BUILD.clap-4.4.11.bazel index 67ecf7255..09e3d7416 100644 --- a/third-party/bazel/BUILD.clap-4.4.11.bazel +++ b/third-party/bazel/BUILD.clap-4.4.11.bazel @@ -36,7 +36,9 @@ rust_library( ], crate_root = "src/lib.rs", edition = "2021", - rustc_flags = ["--cap-lints=allow"], + rustc_flags = [ + "--cap-lints=allow", + ], tags = [ "cargo-bazel", "crate-name=clap", diff --git a/third-party/bazel/BUILD.clap_builder-4.4.11.bazel b/third-party/bazel/BUILD.clap_builder-4.4.11.bazel index 3df51a710..5d0208f29 100644 --- a/third-party/bazel/BUILD.clap_builder-4.4.11.bazel +++ b/third-party/bazel/BUILD.clap_builder-4.4.11.bazel @@ -36,7 +36,9 @@ rust_library( ], crate_root = "src/lib.rs", edition = "2021", - rustc_flags = ["--cap-lints=allow"], + rustc_flags = [ + "--cap-lints=allow", + ], tags = [ "cargo-bazel", "crate-name=clap_builder", diff --git a/third-party/bazel/BUILD.clap_lex-0.6.0.bazel b/third-party/bazel/BUILD.clap_lex-0.6.0.bazel index 7efa071cf..87ad20239 100644 --- a/third-party/bazel/BUILD.clap_lex-0.6.0.bazel +++ b/third-party/bazel/BUILD.clap_lex-0.6.0.bazel @@ -30,7 +30,9 @@ rust_library( ), crate_root = "src/lib.rs", edition = "2021", - rustc_flags = ["--cap-lints=allow"], + rustc_flags = [ + "--cap-lints=allow", + ], tags = [ "cargo-bazel", "crate-name=clap_lex", diff --git a/third-party/bazel/BUILD.codespan-reporting-0.11.1.bazel b/third-party/bazel/BUILD.codespan-reporting-0.11.1.bazel index 907d313c3..ae2aadd32 100644 --- a/third-party/bazel/BUILD.codespan-reporting-0.11.1.bazel +++ b/third-party/bazel/BUILD.codespan-reporting-0.11.1.bazel @@ -30,7 +30,9 @@ rust_library( ), crate_root = "src/lib.rs", edition = "2018", - rustc_flags = ["--cap-lints=allow"], + rustc_flags = [ + "--cap-lints=allow", + ], tags = [ "cargo-bazel", "crate-name=codespan-reporting", diff --git a/third-party/bazel/BUILD.libc-0.2.151.bazel b/third-party/bazel/BUILD.libc-0.2.151.bazel index ba919f061..262f87b6a 100644 --- a/third-party/bazel/BUILD.libc-0.2.151.bazel +++ b/third-party/bazel/BUILD.libc-0.2.151.bazel @@ -31,7 +31,9 @@ rust_library( ), crate_root = "src/lib.rs", edition = "2015", - rustc_flags = ["--cap-lints=allow"], + rustc_flags = [ + "--cap-lints=allow", + ], tags = [ "cargo-bazel", "crate-name=libc", diff --git a/third-party/bazel/BUILD.once_cell-1.19.0.bazel b/third-party/bazel/BUILD.once_cell-1.19.0.bazel index 0efd77531..71659404c 100644 --- a/third-party/bazel/BUILD.once_cell-1.19.0.bazel +++ b/third-party/bazel/BUILD.once_cell-1.19.0.bazel @@ -36,7 +36,9 @@ rust_library( ], crate_root = "src/lib.rs", edition = "2021", - rustc_flags = ["--cap-lints=allow"], + rustc_flags = [ + "--cap-lints=allow", + ], tags = [ "cargo-bazel", "crate-name=once_cell", diff --git a/third-party/bazel/BUILD.proc-macro2-1.0.70.bazel b/third-party/bazel/BUILD.proc-macro2-1.0.70.bazel index 419f1fe45..7fda38b89 100644 --- a/third-party/bazel/BUILD.proc-macro2-1.0.70.bazel +++ b/third-party/bazel/BUILD.proc-macro2-1.0.70.bazel @@ -36,7 +36,9 @@ rust_library( ], crate_root = "src/lib.rs", edition = "2021", - rustc_flags = ["--cap-lints=allow"], + rustc_flags = [ + "--cap-lints=allow", + ], tags = [ "cargo-bazel", "crate-name=proc-macro2", diff --git a/third-party/bazel/BUILD.quote-1.0.33.bazel b/third-party/bazel/BUILD.quote-1.0.33.bazel index 26513c270..1504609c8 100644 --- a/third-party/bazel/BUILD.quote-1.0.33.bazel +++ b/third-party/bazel/BUILD.quote-1.0.33.bazel @@ -34,7 +34,9 @@ rust_library( ], crate_root = "src/lib.rs", edition = "2018", - rustc_flags = ["--cap-lints=allow"], + rustc_flags = [ + "--cap-lints=allow", + ], tags = [ "cargo-bazel", "crate-name=quote", diff --git a/third-party/bazel/BUILD.scratch-1.0.7.bazel b/third-party/bazel/BUILD.scratch-1.0.7.bazel index 810b6c1a8..95fe75abe 100644 --- a/third-party/bazel/BUILD.scratch-1.0.7.bazel +++ b/third-party/bazel/BUILD.scratch-1.0.7.bazel @@ -31,7 +31,9 @@ rust_library( ), crate_root = "src/lib.rs", edition = "2015", - rustc_flags = ["--cap-lints=allow"], + rustc_flags = [ + "--cap-lints=allow", + ], tags = [ "cargo-bazel", "crate-name=scratch", diff --git a/third-party/bazel/BUILD.syn-2.0.41.bazel b/third-party/bazel/BUILD.syn-2.0.41.bazel index f37b19417..803d57a84 100644 --- a/third-party/bazel/BUILD.syn-2.0.41.bazel +++ b/third-party/bazel/BUILD.syn-2.0.41.bazel @@ -40,7 +40,9 @@ rust_library( ], crate_root = "src/lib.rs", edition = "2021", - rustc_flags = ["--cap-lints=allow"], + rustc_flags = [ + "--cap-lints=allow", + ], tags = [ "cargo-bazel", "crate-name=syn", diff --git a/third-party/bazel/BUILD.termcolor-1.4.0.bazel b/third-party/bazel/BUILD.termcolor-1.4.0.bazel index 9684e6474..d85d1181f 100644 --- a/third-party/bazel/BUILD.termcolor-1.4.0.bazel +++ b/third-party/bazel/BUILD.termcolor-1.4.0.bazel @@ -30,7 +30,9 @@ rust_library( ), crate_root = "src/lib.rs", edition = "2018", - rustc_flags = ["--cap-lints=allow"], + rustc_flags = [ + "--cap-lints=allow", + ], tags = [ "cargo-bazel", "crate-name=termcolor", diff --git a/third-party/bazel/BUILD.unicode-ident-1.0.12.bazel b/third-party/bazel/BUILD.unicode-ident-1.0.12.bazel index 4d051f219..00dfdaf12 100644 --- a/third-party/bazel/BUILD.unicode-ident-1.0.12.bazel +++ b/third-party/bazel/BUILD.unicode-ident-1.0.12.bazel @@ -30,7 +30,9 @@ rust_library( ), crate_root = "src/lib.rs", edition = "2018", - rustc_flags = ["--cap-lints=allow"], + rustc_flags = [ + "--cap-lints=allow", + ], tags = [ "cargo-bazel", "crate-name=unicode-ident", diff --git a/third-party/bazel/BUILD.unicode-width-0.1.11.bazel b/third-party/bazel/BUILD.unicode-width-0.1.11.bazel index a003cbd87..f6117e077 100644 --- a/third-party/bazel/BUILD.unicode-width-0.1.11.bazel +++ b/third-party/bazel/BUILD.unicode-width-0.1.11.bazel @@ -33,7 +33,9 @@ rust_library( ], crate_root = "src/lib.rs", edition = "2015", - rustc_flags = ["--cap-lints=allow"], + rustc_flags = [ + "--cap-lints=allow", + ], tags = [ "cargo-bazel", "crate-name=unicode-width", diff --git a/third-party/bazel/BUILD.winapi-0.3.9.bazel b/third-party/bazel/BUILD.winapi-0.3.9.bazel index e7de5db87..cbe1cbd2f 100644 --- a/third-party/bazel/BUILD.winapi-0.3.9.bazel +++ b/third-party/bazel/BUILD.winapi-0.3.9.bazel @@ -44,7 +44,9 @@ rust_library( ], crate_root = "src/lib.rs", edition = "2015", - rustc_flags = ["--cap-lints=allow"], + rustc_flags = [ + "--cap-lints=allow", + ], tags = [ "cargo-bazel", "crate-name=winapi", diff --git a/third-party/bazel/BUILD.winapi-i686-pc-windows-gnu-0.4.0.bazel b/third-party/bazel/BUILD.winapi-i686-pc-windows-gnu-0.4.0.bazel index e2b4993dd..af6873ec2 100644 --- a/third-party/bazel/BUILD.winapi-i686-pc-windows-gnu-0.4.0.bazel +++ b/third-party/bazel/BUILD.winapi-i686-pc-windows-gnu-0.4.0.bazel @@ -31,7 +31,9 @@ rust_library( ), crate_root = "src/lib.rs", edition = "2015", - rustc_flags = ["--cap-lints=allow"], + rustc_flags = [ + "--cap-lints=allow", + ], tags = [ "cargo-bazel", "crate-name=winapi-i686-pc-windows-gnu", diff --git a/third-party/bazel/BUILD.winapi-util-0.1.6.bazel b/third-party/bazel/BUILD.winapi-util-0.1.6.bazel index 36f62cca3..0c7ba8204 100644 --- a/third-party/bazel/BUILD.winapi-util-0.1.6.bazel +++ b/third-party/bazel/BUILD.winapi-util-0.1.6.bazel @@ -30,7 +30,9 @@ rust_library( ), crate_root = "src/lib.rs", edition = "2021", - rustc_flags = ["--cap-lints=allow"], + rustc_flags = [ + "--cap-lints=allow", + ], tags = [ "cargo-bazel", "crate-name=winapi-util", diff --git a/third-party/bazel/BUILD.winapi-x86_64-pc-windows-gnu-0.4.0.bazel b/third-party/bazel/BUILD.winapi-x86_64-pc-windows-gnu-0.4.0.bazel index 910ed486c..306cdff4a 100644 --- a/third-party/bazel/BUILD.winapi-x86_64-pc-windows-gnu-0.4.0.bazel +++ b/third-party/bazel/BUILD.winapi-x86_64-pc-windows-gnu-0.4.0.bazel @@ -31,7 +31,9 @@ rust_library( ), crate_root = "src/lib.rs", edition = "2015", - rustc_flags = ["--cap-lints=allow"], + rustc_flags = [ + "--cap-lints=allow", + ], tags = [ "cargo-bazel", "crate-name=winapi-x86_64-pc-windows-gnu", diff --git a/third-party/bazel/alias_rules.bzl b/third-party/bazel/alias_rules.bzl index 2304bfcbc..14b04c127 100644 --- a/third-party/bazel/alias_rules.bzl +++ b/third-party/bazel/alias_rules.bzl @@ -1,10 +1,14 @@ """Alias that transitions its target to `compilation_mode=opt`. Use `transition_alias="opt"` to enable.""" +load("@rules_cc//cc:defs.bzl", "CcInfo") load("@rules_rust//rust:rust_common.bzl", "COMMON_PROVIDERS") def _transition_alias_impl(ctx): # `ctx.attr.actual` is a list of 1 item due to the transition - return [ctx.attr.actual[0][provider] for provider in COMMON_PROVIDERS] + providers = [ctx.attr.actual[0][provider] for provider in COMMON_PROVIDERS] + if CcInfo in ctx.attr.actual[0]: + providers.append(ctx.attr.actual[0][CcInfo]) + return providers def _change_compilation_mode(compilation_mode): def _change_compilation_mode_impl(_settings, _attr): diff --git a/third-party/bazel/defs.bzl b/third-party/bazel/defs.bzl index 4f2362b6a..9353df4f5 100644 --- a/third-party/bazel/defs.bzl +++ b/third-party/bazel/defs.bzl @@ -371,7 +371,8 @@ _CONDITIONS = { "aarch64-fuchsia": ["@rules_rust//rust/platform:aarch64-fuchsia"], "aarch64-linux-android": ["@rules_rust//rust/platform:aarch64-linux-android"], "aarch64-pc-windows-msvc": ["@rules_rust//rust/platform:aarch64-pc-windows-msvc"], - "aarch64-unknown-linux-gnu": ["@rules_rust//rust/platform:aarch64-unknown-linux-gnu", "@rules_rust//rust/platform:aarch64-unknown-nixos-gnu"], + "aarch64-unknown-linux-gnu": ["@rules_rust//rust/platform:aarch64-unknown-linux-gnu"], + "aarch64-unknown-nixos-gnu": ["@rules_rust//rust/platform:aarch64-unknown-nixos-gnu"], "aarch64-unknown-nto-qnx710": ["@rules_rust//rust/platform:aarch64-unknown-nto-qnx710"], "arm-unknown-linux-gnueabi": ["@rules_rust//rust/platform:arm-unknown-linux-gnueabi"], "armv7-linux-androideabi": ["@rules_rust//rust/platform:armv7-linux-androideabi"], @@ -399,7 +400,8 @@ _CONDITIONS = { "x86_64-pc-windows-gnu": [], "x86_64-pc-windows-msvc": ["@rules_rust//rust/platform:x86_64-pc-windows-msvc"], "x86_64-unknown-freebsd": ["@rules_rust//rust/platform:x86_64-unknown-freebsd"], - "x86_64-unknown-linux-gnu": ["@rules_rust//rust/platform:x86_64-unknown-linux-gnu", "@rules_rust//rust/platform:x86_64-unknown-nixos-gnu"], + "x86_64-unknown-linux-gnu": ["@rules_rust//rust/platform:x86_64-unknown-linux-gnu"], + "x86_64-unknown-nixos-gnu": ["@rules_rust//rust/platform:x86_64-unknown-nixos-gnu"], "x86_64-unknown-none": ["@rules_rust//rust/platform:x86_64-unknown-none"], }