Skip to content

Commit ddf2a4c

Browse files
wmatthews-googleUebelAndre
wmatthews-google
and
UebelAndre
authored
Re-render crate BUILD files after bazelbuild#1647 (bazelbuild#1655)
* 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 <[email protected]>
1 parent 44c7e15 commit ddf2a4c

File tree

951 files changed

+12739
-13042
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

951 files changed

+12739
-13042
lines changed

‎bindgen/3rdparty/crates/BUILD.aho-corasick-0.7.18.bazel

Lines changed: 3 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -6,11 +6,6 @@
66
# bazel run //bindgen/3rdparty:crates_vendor
77
###############################################################################
88

9-
load(
10-
"@bazel_skylib//lib:selects.bzl",
11-
"selects",
12-
)
13-
149
# buildifier: disable=bzl-visibility
1510
load("@rules_rust//crate_universe/private:selects.bzl", "select_with_or")
1611
load(
@@ -33,7 +28,7 @@ rust_library(
3328
exclude = [
3429
],
3530
),
36-
aliases = selects.with_or({
31+
aliases = select({
3732
"//conditions:default": {
3833
},
3934
}),
@@ -60,7 +55,7 @@ rust_library(
6055
}),
6156
edition = "2018",
6257
proc_macro_deps = [
63-
] + select_with_or({
58+
] + select({
6459
"//conditions:default": [
6560
],
6661
}),
@@ -85,7 +80,7 @@ rust_library(
8580
],
8681
version = "0.7.18",
8782
deps = [
88-
] + select_with_or({
83+
] + select({
8984
"//conditions:default": [
9085
"@rules_rust_bindgen__memchr-2.5.0//:memchr",
9186
],

‎bindgen/3rdparty/crates/BUILD.atty-0.2.14.bazel

Lines changed: 65 additions & 49 deletions
Original file line numberDiff line numberDiff line change
@@ -6,11 +6,6 @@
66
# bazel run //bindgen/3rdparty:crates_vendor
77
###############################################################################
88

9-
load(
10-
"@bazel_skylib//lib:selects.bzl",
11-
"selects",
12-
)
13-
149
# buildifier: disable=bzl-visibility
1510
load("@rules_rust//crate_universe/private:selects.bzl", "select_with_or")
1611
load(
@@ -33,7 +28,7 @@ rust_library(
3328
exclude = [
3429
],
3530
),
36-
aliases = selects.with_or({
31+
aliases = select({
3732
"//conditions:default": {
3833
},
3934
}),
@@ -58,7 +53,7 @@ rust_library(
5853
}),
5954
edition = "2015",
6055
proc_macro_deps = [
61-
] + select_with_or({
56+
] + select({
6257
"//conditions:default": [
6358
],
6459
}),
@@ -83,48 +78,69 @@ rust_library(
8378
],
8479
version = "0.2.14",
8580
deps = [
86-
] + select_with_or({
87-
# cfg(target_os = "hermit")
88-
#
89-
# No supported platform triples for cfg: 'cfg(target_os = "hermit")'
90-
# Skipped dependencies: [{"id":"hermit-abi 0.1.19","target":"hermit_abi"}]
91-
#
92-
# cfg(unix)
93-
(
94-
"@rules_rust//rust/platform:aarch64-apple-darwin",
95-
"@rules_rust//rust/platform:aarch64-apple-ios",
96-
"@rules_rust//rust/platform:aarch64-apple-ios-sim",
97-
"@rules_rust//rust/platform:aarch64-linux-android",
98-
"@rules_rust//rust/platform:aarch64-unknown-linux-gnu",
99-
"@rules_rust//rust/platform:arm-unknown-linux-gnueabi",
100-
"@rules_rust//rust/platform:armv7-linux-androideabi",
101-
"@rules_rust//rust/platform:armv7-unknown-linux-gnueabi",
102-
"@rules_rust//rust/platform:i686-apple-darwin",
103-
"@rules_rust//rust/platform:i686-linux-android",
104-
"@rules_rust//rust/platform:i686-unknown-freebsd",
105-
"@rules_rust//rust/platform:i686-unknown-linux-gnu",
106-
"@rules_rust//rust/platform:powerpc-unknown-linux-gnu",
107-
"@rules_rust//rust/platform:s390x-unknown-linux-gnu",
108-
"@rules_rust//rust/platform:x86_64-apple-darwin",
109-
"@rules_rust//rust/platform:x86_64-apple-ios",
110-
"@rules_rust//rust/platform:x86_64-linux-android",
111-
"@rules_rust//rust/platform:x86_64-unknown-freebsd",
112-
"@rules_rust//rust/platform:x86_64-unknown-linux-gnu",
113-
): [
114-
# Target Deps
115-
"@rules_rust_bindgen__libc-0.2.126//:libc",
116-
117-
# Common Deps
118-
],
119-
# cfg(windows)
120-
(
121-
"@rules_rust//rust/platform:i686-pc-windows-msvc",
122-
"@rules_rust//rust/platform:x86_64-pc-windows-msvc",
123-
): [
124-
# Target Deps
125-
"@rules_rust_bindgen__winapi-0.3.9//:winapi",
126-
127-
# Common Deps
81+
] + select({
82+
"@rules_rust//rust/platform:aarch64-apple-darwin": [
83+
"@rules_rust_bindgen__libc-0.2.126//:libc", # cfg(unix)
84+
],
85+
"@rules_rust//rust/platform:aarch64-apple-ios": [
86+
"@rules_rust_bindgen__libc-0.2.126//:libc", # cfg(unix)
87+
],
88+
"@rules_rust//rust/platform:aarch64-apple-ios-sim": [
89+
"@rules_rust_bindgen__libc-0.2.126//:libc", # cfg(unix)
90+
],
91+
"@rules_rust//rust/platform:aarch64-linux-android": [
92+
"@rules_rust_bindgen__libc-0.2.126//:libc", # cfg(unix)
93+
],
94+
"@rules_rust//rust/platform:aarch64-unknown-linux-gnu": [
95+
"@rules_rust_bindgen__libc-0.2.126//:libc", # cfg(unix)
96+
],
97+
"@rules_rust//rust/platform:arm-unknown-linux-gnueabi": [
98+
"@rules_rust_bindgen__libc-0.2.126//:libc", # cfg(unix)
99+
],
100+
"@rules_rust//rust/platform:armv7-linux-androideabi": [
101+
"@rules_rust_bindgen__libc-0.2.126//:libc", # cfg(unix)
102+
],
103+
"@rules_rust//rust/platform:armv7-unknown-linux-gnueabi": [
104+
"@rules_rust_bindgen__libc-0.2.126//:libc", # cfg(unix)
105+
],
106+
"@rules_rust//rust/platform:i686-apple-darwin": [
107+
"@rules_rust_bindgen__libc-0.2.126//:libc", # cfg(unix)
108+
],
109+
"@rules_rust//rust/platform:i686-linux-android": [
110+
"@rules_rust_bindgen__libc-0.2.126//:libc", # cfg(unix)
111+
],
112+
"@rules_rust//rust/platform:i686-pc-windows-msvc": [
113+
"@rules_rust_bindgen__winapi-0.3.9//:winapi", # cfg(windows)
114+
],
115+
"@rules_rust//rust/platform:i686-unknown-freebsd": [
116+
"@rules_rust_bindgen__libc-0.2.126//:libc", # cfg(unix)
117+
],
118+
"@rules_rust//rust/platform:i686-unknown-linux-gnu": [
119+
"@rules_rust_bindgen__libc-0.2.126//:libc", # cfg(unix)
120+
],
121+
"@rules_rust//rust/platform:powerpc-unknown-linux-gnu": [
122+
"@rules_rust_bindgen__libc-0.2.126//:libc", # cfg(unix)
123+
],
124+
"@rules_rust//rust/platform:s390x-unknown-linux-gnu": [
125+
"@rules_rust_bindgen__libc-0.2.126//:libc", # cfg(unix)
126+
],
127+
"@rules_rust//rust/platform:x86_64-apple-darwin": [
128+
"@rules_rust_bindgen__libc-0.2.126//:libc", # cfg(unix)
129+
],
130+
"@rules_rust//rust/platform:x86_64-apple-ios": [
131+
"@rules_rust_bindgen__libc-0.2.126//:libc", # cfg(unix)
132+
],
133+
"@rules_rust//rust/platform:x86_64-linux-android": [
134+
"@rules_rust_bindgen__libc-0.2.126//:libc", # cfg(unix)
135+
],
136+
"@rules_rust//rust/platform:x86_64-pc-windows-msvc": [
137+
"@rules_rust_bindgen__winapi-0.3.9//:winapi", # cfg(windows)
138+
],
139+
"@rules_rust//rust/platform:x86_64-unknown-freebsd": [
140+
"@rules_rust_bindgen__libc-0.2.126//:libc", # cfg(unix)
141+
],
142+
"@rules_rust//rust/platform:x86_64-unknown-linux-gnu": [
143+
"@rules_rust_bindgen__libc-0.2.126//:libc", # cfg(unix)
128144
],
129145
"//conditions:default": [
130146
],

‎bindgen/3rdparty/crates/BUILD.autocfg-1.1.0.bazel

Lines changed: 3 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -6,11 +6,6 @@
66
# bazel run //bindgen/3rdparty:crates_vendor
77
###############################################################################
88

9-
load(
10-
"@bazel_skylib//lib:selects.bzl",
11-
"selects",
12-
)
13-
149
# buildifier: disable=bzl-visibility
1510
load("@rules_rust//crate_universe/private:selects.bzl", "select_with_or")
1611
load(
@@ -33,7 +28,7 @@ rust_library(
3328
exclude = [
3429
],
3530
),
36-
aliases = selects.with_or({
31+
aliases = select({
3732
"//conditions:default": {
3833
},
3934
}),
@@ -58,7 +53,7 @@ rust_library(
5853
}),
5954
edition = "2015",
6055
proc_macro_deps = [
61-
] + select_with_or({
56+
] + select({
6257
"//conditions:default": [
6358
],
6459
}),
@@ -83,7 +78,7 @@ rust_library(
8378
],
8479
version = "1.1.0",
8580
deps = [
86-
] + select_with_or({
81+
] + select({
8782
"//conditions:default": [
8883
],
8984
}),

‎bindgen/3rdparty/crates/BUILD.bindgen-0.60.1.bazel

Lines changed: 9 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -6,10 +6,6 @@
66
# bazel run //bindgen/3rdparty:crates_vendor
77
###############################################################################
88

9-
load(
10-
"@bazel_skylib//lib:selects.bzl",
11-
"selects",
12-
)
139
load(
1410
"@rules_rust//cargo:defs.bzl",
1511
"cargo_build_script",
@@ -38,7 +34,7 @@ rust_library(
3834
exclude = [
3935
],
4036
),
41-
aliases = selects.with_or({
37+
aliases = select({
4238
"//conditions:default": {
4339
},
4440
}),
@@ -71,7 +67,7 @@ rust_library(
7167
}),
7268
edition = "2018",
7369
proc_macro_deps = [
74-
] + select_with_or({
70+
] + select({
7571
"//conditions:default": [
7672
],
7773
}),
@@ -96,7 +92,7 @@ rust_library(
9692
],
9793
version = "0.60.1",
9894
deps = [
99-
] + select_with_or({
95+
] + select({
10096
"//conditions:default": [
10197
"@rules_rust_bindgen__bindgen-0.60.1//:build_script_build",
10298
"@rules_rust_bindgen__bitflags-1.3.2//:bitflags",
@@ -127,7 +123,7 @@ rust_binary(
127123
exclude = [
128124
],
129125
),
130-
aliases = selects.with_or({
126+
aliases = select({
131127
"//conditions:default": {
132128
},
133129
}),
@@ -160,7 +156,7 @@ rust_binary(
160156
}),
161157
edition = "2018",
162158
proc_macro_deps = [
163-
] + select_with_or({
159+
] + select({
164160
"//conditions:default": [
165161
],
166162
}),
@@ -186,7 +182,7 @@ rust_binary(
186182
version = "0.60.1",
187183
deps = [
188184
":bindgen",
189-
] + select_with_or({
185+
] + select({
190186
"//conditions:default": [
191187
"@rules_rust_bindgen__bindgen-0.60.1//:build_script_build",
192188
"@rules_rust_bindgen__bitflags-1.3.2//:bitflags",
@@ -218,7 +214,7 @@ cargo_build_script(
218214
exclude = [
219215
],
220216
),
221-
aliases = selects.with_or({
217+
aliases = select({
222218
"//conditions:default": {
223219
},
224220
}),
@@ -246,7 +242,7 @@ cargo_build_script(
246242
}),
247243
edition = "2018",
248244
proc_macro_deps = [
249-
] + select_with_or({
245+
] + select({
250246
"//conditions:default": [
251247
],
252248
}),
@@ -276,7 +272,7 @@ cargo_build_script(
276272
version = "0.60.1",
277273
visibility = ["//visibility:private"],
278274
deps = [
279-
] + select_with_or({
275+
] + select({
280276
"//conditions:default": [
281277
],
282278
}),

‎bindgen/3rdparty/crates/BUILD.bitflags-1.3.2.bazel

Lines changed: 3 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -6,11 +6,6 @@
66
# bazel run //bindgen/3rdparty:crates_vendor
77
###############################################################################
88

9-
load(
10-
"@bazel_skylib//lib:selects.bzl",
11-
"selects",
12-
)
13-
149
# buildifier: disable=bzl-visibility
1510
load("@rules_rust//crate_universe/private:selects.bzl", "select_with_or")
1611
load(
@@ -33,7 +28,7 @@ rust_library(
3328
exclude = [
3429
],
3530
),
36-
aliases = selects.with_or({
31+
aliases = select({
3732
"//conditions:default": {
3833
},
3934
}),
@@ -59,7 +54,7 @@ rust_library(
5954
}),
6055
edition = "2018",
6156
proc_macro_deps = [
62-
] + select_with_or({
57+
] + select({
6358
"//conditions:default": [
6459
],
6560
}),
@@ -84,7 +79,7 @@ rust_library(
8479
],
8580
version = "1.3.2",
8681
deps = [
87-
] + select_with_or({
82+
] + select({
8883
"//conditions:default": [
8984
],
9085
}),

‎bindgen/3rdparty/crates/BUILD.cexpr-0.6.0.bazel

Lines changed: 3 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -6,11 +6,6 @@
66
# bazel run //bindgen/3rdparty:crates_vendor
77
###############################################################################
88

9-
load(
10-
"@bazel_skylib//lib:selects.bzl",
11-
"selects",
12-
)
13-
149
# buildifier: disable=bzl-visibility
1510
load("@rules_rust//crate_universe/private:selects.bzl", "select_with_or")
1611
load(
@@ -33,7 +28,7 @@ rust_library(
3328
exclude = [
3429
],
3530
),
36-
aliases = selects.with_or({
31+
aliases = select({
3732
"//conditions:default": {
3833
},
3934
}),
@@ -58,7 +53,7 @@ rust_library(
5853
}),
5954
edition = "2018",
6055
proc_macro_deps = [
61-
] + select_with_or({
56+
] + select({
6257
"//conditions:default": [
6358
],
6459
}),
@@ -83,7 +78,7 @@ rust_library(
8378
],
8479
version = "0.6.0",
8580
deps = [
86-
] + select_with_or({
81+
] + select({
8782
"//conditions:default": [
8883
"@rules_rust_bindgen__nom-7.1.1//:nom",
8984
],

0 commit comments

Comments
 (0)