Skip to content

Commit

Permalink
Re-render crate BUILD files after bazelbuild#1647 (bazelbuild#1655)
Browse files Browse the repository at this point in the history 
* Group deps and aliases by platform triple rather than by cfg string when generating BUILD files. This avoid bazel errors due to duplicate keys/deps.

* Re-render crate BUILD files after bazelbuild#1647

* Re-render additional BUILD files

Co-authored-by: UebelAndre <github@uebelandre.com>
  • Loading branch information
@wmatthews-google @UebelAndre
wmatthews-google and UebelAndre authored Nov 18, 2022
1 parent 44c7e15 commit ddf2a4c
Show file tree
Hide file tree
Showing 951 changed files with 12,739 additions and 13,042 deletions.
11 changes: 3 additions & 8 deletions bindgen/3rdparty/crates/BUILD.aho-corasick-0.7.18.bazel
View file
Original file line number Diff line number Diff line change
Expand Up @@ -6,11 +6,6 @@
# bazel run //bindgen/3rdparty:crates_vendor
###############################################################################

load(
"@bazel_skylib//lib:selects.bzl",
"selects",
)

# buildifier: disable=bzl-visibility
load("@rules_rust//crate_universe/private:selects.bzl", "select_with_or")
load(
Expand All @@ -33,7 +28,7 @@ rust_library(
exclude = [
],
),
aliases = selects.with_or({
aliases = select({
"//conditions:default": {
},
}),
Expand All @@ -60,7 +55,7 @@ rust_library(
}),
edition = "2018",
proc_macro_deps = [
] + select_with_or({
] + select({
"//conditions:default": [
],
}),
Expand All @@ -85,7 +80,7 @@ rust_library(
],
version = "0.7.18",
deps = [
] + select_with_or({
] + select({
"//conditions:default": [
"@rules_rust_bindgen__memchr-2.5.0//:memchr",
],
Expand Down
114 changes: 65 additions & 49 deletions bindgen/3rdparty/crates/BUILD.atty-0.2.14.bazel
View file
Original file line number Diff line number Diff line change
Expand Up @@ -6,11 +6,6 @@
# bazel run //bindgen/3rdparty:crates_vendor
###############################################################################

load(
"@bazel_skylib//lib:selects.bzl",
"selects",
)

# buildifier: disable=bzl-visibility
load("@rules_rust//crate_universe/private:selects.bzl", "select_with_or")
load(
Expand All @@ -33,7 +28,7 @@ rust_library(
exclude = [
],
),
aliases = selects.with_or({
aliases = select({
"//conditions:default": {
},
}),
Expand All @@ -58,7 +53,7 @@ rust_library(
}),
edition = "2015",
proc_macro_deps = [
] + select_with_or({
] + select({
"//conditions:default": [
],
}),
Expand All @@ -83,48 +78,69 @@ rust_library(
],
version = "0.2.14",
deps = [
] + select_with_or({
# cfg(target_os = "hermit")
#
# No supported platform triples for cfg: 'cfg(target_os = "hermit")'
# Skipped dependencies: [{"id":"hermit-abi 0.1.19","target":"hermit_abi"}]
#
# cfg(unix)
(
"@rules_rust//rust/platform:aarch64-apple-darwin",
"@rules_rust//rust/platform:aarch64-apple-ios",
"@rules_rust//rust/platform:aarch64-apple-ios-sim",
"@rules_rust//rust/platform:aarch64-linux-android",
"@rules_rust//rust/platform:aarch64-unknown-linux-gnu",
"@rules_rust//rust/platform:arm-unknown-linux-gnueabi",
"@rules_rust//rust/platform:armv7-linux-androideabi",
"@rules_rust//rust/platform:armv7-unknown-linux-gnueabi",
"@rules_rust//rust/platform:i686-apple-darwin",
"@rules_rust//rust/platform:i686-linux-android",
"@rules_rust//rust/platform:i686-unknown-freebsd",
"@rules_rust//rust/platform:i686-unknown-linux-gnu",
"@rules_rust//rust/platform:powerpc-unknown-linux-gnu",
"@rules_rust//rust/platform:s390x-unknown-linux-gnu",
"@rules_rust//rust/platform:x86_64-apple-darwin",
"@rules_rust//rust/platform:x86_64-apple-ios",
"@rules_rust//rust/platform:x86_64-linux-android",
"@rules_rust//rust/platform:x86_64-unknown-freebsd",
"@rules_rust//rust/platform:x86_64-unknown-linux-gnu",
): [
# Target Deps
"@rules_rust_bindgen__libc-0.2.126//:libc",

# Common Deps
],
# cfg(windows)
(
"@rules_rust//rust/platform:i686-pc-windows-msvc",
"@rules_rust//rust/platform:x86_64-pc-windows-msvc",
): [
# Target Deps
"@rules_rust_bindgen__winapi-0.3.9//:winapi",

# Common Deps
] + select({
"@rules_rust//rust/platform:aarch64-apple-darwin": [
"@rules_rust_bindgen__libc-0.2.126//:libc", # cfg(unix)
],
"@rules_rust//rust/platform:aarch64-apple-ios": [
"@rules_rust_bindgen__libc-0.2.126//:libc", # cfg(unix)
],
"@rules_rust//rust/platform:aarch64-apple-ios-sim": [
"@rules_rust_bindgen__libc-0.2.126//:libc", # cfg(unix)
],
"@rules_rust//rust/platform:aarch64-linux-android": [
"@rules_rust_bindgen__libc-0.2.126//:libc", # cfg(unix)
],
"@rules_rust//rust/platform:aarch64-unknown-linux-gnu": [
"@rules_rust_bindgen__libc-0.2.126//:libc", # cfg(unix)
],
"@rules_rust//rust/platform:arm-unknown-linux-gnueabi": [
"@rules_rust_bindgen__libc-0.2.126//:libc", # cfg(unix)
],
"@rules_rust//rust/platform:armv7-linux-androideabi": [
"@rules_rust_bindgen__libc-0.2.126//:libc", # cfg(unix)
],
"@rules_rust//rust/platform:armv7-unknown-linux-gnueabi": [
"@rules_rust_bindgen__libc-0.2.126//:libc", # cfg(unix)
],
"@rules_rust//rust/platform:i686-apple-darwin": [
"@rules_rust_bindgen__libc-0.2.126//:libc", # cfg(unix)
],
"@rules_rust//rust/platform:i686-linux-android": [
"@rules_rust_bindgen__libc-0.2.126//:libc", # cfg(unix)
],
"@rules_rust//rust/platform:i686-pc-windows-msvc": [
"@rules_rust_bindgen__winapi-0.3.9//:winapi", # cfg(windows)
],
"@rules_rust//rust/platform:i686-unknown-freebsd": [
"@rules_rust_bindgen__libc-0.2.126//:libc", # cfg(unix)
],
"@rules_rust//rust/platform:i686-unknown-linux-gnu": [
"@rules_rust_bindgen__libc-0.2.126//:libc", # cfg(unix)
],
"@rules_rust//rust/platform:powerpc-unknown-linux-gnu": [
"@rules_rust_bindgen__libc-0.2.126//:libc", # cfg(unix)
],
"@rules_rust//rust/platform:s390x-unknown-linux-gnu": [
"@rules_rust_bindgen__libc-0.2.126//:libc", # cfg(unix)
],
"@rules_rust//rust/platform:x86_64-apple-darwin": [
"@rules_rust_bindgen__libc-0.2.126//:libc", # cfg(unix)
],
"@rules_rust//rust/platform:x86_64-apple-ios": [
"@rules_rust_bindgen__libc-0.2.126//:libc", # cfg(unix)
],
"@rules_rust//rust/platform:x86_64-linux-android": [
"@rules_rust_bindgen__libc-0.2.126//:libc", # cfg(unix)
],
"@rules_rust//rust/platform:x86_64-pc-windows-msvc": [
"@rules_rust_bindgen__winapi-0.3.9//:winapi", # cfg(windows)
],
"@rules_rust//rust/platform:x86_64-unknown-freebsd": [
"@rules_rust_bindgen__libc-0.2.126//:libc", # cfg(unix)
],
"@rules_rust//rust/platform:x86_64-unknown-linux-gnu": [
"@rules_rust_bindgen__libc-0.2.126//:libc", # cfg(unix)
],
"//conditions:default": [
],
Expand Down
11 changes: 3 additions & 8 deletions bindgen/3rdparty/crates/BUILD.autocfg-1.1.0.bazel
View file
Original file line number Diff line number Diff line change
Expand Up @@ -6,11 +6,6 @@
# bazel run //bindgen/3rdparty:crates_vendor
###############################################################################

load(
"@bazel_skylib//lib:selects.bzl",
"selects",
)

# buildifier: disable=bzl-visibility
load("@rules_rust//crate_universe/private:selects.bzl", "select_with_or")
load(
Expand All @@ -33,7 +28,7 @@ rust_library(
exclude = [
],
),
aliases = selects.with_or({
aliases = select({
"//conditions:default": {
},
}),
Expand All @@ -58,7 +53,7 @@ rust_library(
}),
edition = "2015",
proc_macro_deps = [
] + select_with_or({
] + select({
"//conditions:default": [
],
}),
Expand All @@ -83,7 +78,7 @@ rust_library(
],
version = "1.1.0",
deps = [
] + select_with_or({
] + select({
"//conditions:default": [
],
}),
Expand Down
22 changes: 9 additions & 13 deletions bindgen/3rdparty/crates/BUILD.bindgen-0.60.1.bazel
View file
Original file line number Diff line number Diff line change
Expand Up @@ -6,10 +6,6 @@
# bazel run //bindgen/3rdparty:crates_vendor
###############################################################################

load(
"@bazel_skylib//lib:selects.bzl",
"selects",
)
load(
"@rules_rust//cargo:defs.bzl",
"cargo_build_script",
Expand Down Expand Up @@ -38,7 +34,7 @@ rust_library(
exclude = [
],
),
aliases = selects.with_or({
aliases = select({
"//conditions:default": {
},
}),
Expand Down Expand Up @@ -71,7 +67,7 @@ rust_library(
}),
edition = "2018",
proc_macro_deps = [
] + select_with_or({
] + select({
"//conditions:default": [
],
}),
Expand All @@ -96,7 +92,7 @@ rust_library(
],
version = "0.60.1",
deps = [
] + select_with_or({
] + select({
"//conditions:default": [
"@rules_rust_bindgen__bindgen-0.60.1//:build_script_build",
"@rules_rust_bindgen__bitflags-1.3.2//:bitflags",
Expand Down Expand Up @@ -127,7 +123,7 @@ rust_binary(
exclude = [
],
),
aliases = selects.with_or({
aliases = select({
"//conditions:default": {
},
}),
Expand Down Expand Up @@ -160,7 +156,7 @@ rust_binary(
}),
edition = "2018",
proc_macro_deps = [
] + select_with_or({
] + select({
"//conditions:default": [
],
}),
Expand All @@ -186,7 +182,7 @@ rust_binary(
version = "0.60.1",
deps = [
":bindgen",
] + select_with_or({
] + select({
"//conditions:default": [
"@rules_rust_bindgen__bindgen-0.60.1//:build_script_build",
"@rules_rust_bindgen__bitflags-1.3.2//:bitflags",
Expand Down Expand Up @@ -218,7 +214,7 @@ cargo_build_script(
exclude = [
],
),
aliases = selects.with_or({
aliases = select({
"//conditions:default": {
},
}),
Expand Down Expand Up @@ -246,7 +242,7 @@ cargo_build_script(
}),
edition = "2018",
proc_macro_deps = [
] + select_with_or({
] + select({
"//conditions:default": [
],
}),
Expand Down Expand Up @@ -276,7 +272,7 @@ cargo_build_script(
version = "0.60.1",
visibility = ["//visibility:private"],
deps = [
] + select_with_or({
] + select({
"//conditions:default": [
],
}),
Expand Down
11 changes: 3 additions & 8 deletions bindgen/3rdparty/crates/BUILD.bitflags-1.3.2.bazel
View file
Original file line number Diff line number Diff line change
Expand Up @@ -6,11 +6,6 @@
# bazel run //bindgen/3rdparty:crates_vendor
###############################################################################

load(
"@bazel_skylib//lib:selects.bzl",
"selects",
)

# buildifier: disable=bzl-visibility
load("@rules_rust//crate_universe/private:selects.bzl", "select_with_or")
load(
Expand All @@ -33,7 +28,7 @@ rust_library(
exclude = [
],
),
aliases = selects.with_or({
aliases = select({
"//conditions:default": {
},
}),
Expand All @@ -59,7 +54,7 @@ rust_library(
}),
edition = "2018",
proc_macro_deps = [
] + select_with_or({
] + select({
"//conditions:default": [
],
}),
Expand All @@ -84,7 +79,7 @@ rust_library(
],
version = "1.3.2",
deps = [
] + select_with_or({
] + select({
"//conditions:default": [
],
}),
Expand Down
11 changes: 3 additions & 8 deletions bindgen/3rdparty/crates/BUILD.cexpr-0.6.0.bazel
View file
Original file line number Diff line number Diff line change
Expand Up @@ -6,11 +6,6 @@
# bazel run //bindgen/3rdparty:crates_vendor
###############################################################################

load(
"@bazel_skylib//lib:selects.bzl",
"selects",
)

# buildifier: disable=bzl-visibility
load("@rules_rust//crate_universe/private:selects.bzl", "select_with_or")
load(
Expand All @@ -33,7 +28,7 @@ rust_library(
exclude = [
],
),
aliases = selects.with_or({
aliases = select({
"//conditions:default": {
},
}),
Expand All @@ -58,7 +53,7 @@ rust_library(
}),
edition = "2018",
proc_macro_deps = [
] + select_with_or({
] + select({
"//conditions:default": [
],
}),
Expand All @@ -83,7 +78,7 @@ rust_library(
],
version = "0.6.0",
deps = [
] + select_with_or({
] + select({
"//conditions:default": [
"@rules_rust_bindgen__nom-7.1.1//:nom",
],
Expand Down
Loading

0 comments on commit ddf2a4c

Please sign in to comment.