Skip to content

Commit 478cef4

Browse files
UebelAndreUebelAndre
authored
Reduce number of default supported_platform_triples for crate_universe (#3239)
This should save substantial time for users of `crate_universe` as they don't need to do splicing for platforms they're not going to use. It's still recommended users explicitly set `supported_platform_triples` but my expectation with this change is that it covers most of the bases for users to still provide them with a sufficiently responsive experience compared to the 34 platforms that used to be in splicing.
1 parent 53c3469 commit 478cef4

File tree

98 files changed

+6755
-12355
lines changed

Some content is hidden

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

98 files changed

+6755
-12355
lines changed

‎crate_universe/extensions.bzl‎

Lines changed: 5 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -373,6 +373,7 @@ load(
373373
"//crate_universe/private:common_utils.bzl",
374374
"new_cargo_bazel_fn",
375375
)
376+
load("//crate_universe/private:crates_repository.bzl", "SUPPORTED_PLATFORM_TRIPLES")
376377
load(
377378
"//crate_universe/private:crates_vendor.bzl",
378379
"CRATES_VENDOR_ATTRS",
@@ -1031,7 +1032,10 @@ _FROM_COMMON_ATTRS = {
10311032
"If set, this file must exist within the workspace (but can be empty) before this rule will work."
10321033
),
10331034
),
1034-
"supported_platform_triples": CRATES_VENDOR_ATTRS["supported_platform_triples"],
1035+
"supported_platform_triples": attr.string_list(
1036+
doc = "A set of all platform triples to consider when generating dependencies.",
1037+
default = SUPPORTED_PLATFORM_TRIPLES,
1038+
),
10351039
}
10361040

10371041
_from_cargo = tag_class(

‎crate_universe/private/crates_repository.bzl‎

Lines changed: 13 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -22,7 +22,19 @@ load(
2222
load("//crate_universe/private:urls.bzl", "CARGO_BAZEL_SHA256S", "CARGO_BAZEL_URLS")
2323
load("//rust:defs.bzl", "rust_common")
2424
load("//rust/platform:triple.bzl", "get_host_triple")
25-
load("//rust/platform:triple_mappings.bzl", "SUPPORTED_PLATFORM_TRIPLES")
25+
26+
# A reduced subset of platform triples that cover a wide range of known users.
27+
# The reduced set is intended to speed up the splciing step which has `O(N^2)`
28+
# complexity for each platform triple added.
29+
SUPPORTED_PLATFORM_TRIPLES = [
30+
"aarch64-apple-darwin",
31+
"aarch64-unknown-linux-gnu",
32+
"wasm32-unknown-unknown",
33+
"wasm32-wasip1",
34+
"x86_64-pc-windows-msvc",
35+
"x86_64-unknown-linux-gnu",
36+
"x86_64-unknown-nixos-gnu",
37+
]
2638

2739
def _crates_repository_impl(repository_ctx):
2840
# Determine the current host's platform triple

‎examples/crate_universe/alias_rule/cargo-bazel-lock_global_alias_annotation_none.json‎

Lines changed: 1 addition & 88 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
{
2-
"checksum": "0b175bc37d566da5fe84c73eafac661a2a63c54e48018171d60023e60e2f959d",
2+
"checksum": "07feae63b62c36dfcee6215163c2da995f5b8a3a4086cbaedadc0edf9463fc2f",
33
"crates": {
44
"direct-cargo-bazel-deps 0.0.1": {
55
"name": "direct-cargo-bazel-deps",
@@ -117,110 +117,23 @@
117117
"aarch64-apple-darwin": [
118118
"aarch64-apple-darwin"
119119
],
120-
"aarch64-apple-ios": [
121-
"aarch64-apple-ios"
122-
],
123-
"aarch64-apple-ios-sim": [
124-
"aarch64-apple-ios-sim"
125-
],
126-
"aarch64-linux-android": [
127-
"aarch64-linux-android"
128-
],
129-
"aarch64-pc-windows-msvc": [
130-
"aarch64-pc-windows-msvc"
131-
],
132-
"aarch64-unknown-fuchsia": [
133-
"aarch64-unknown-fuchsia"
134-
],
135120
"aarch64-unknown-linux-gnu": [
136121
"aarch64-unknown-linux-gnu"
137122
],
138-
"aarch64-unknown-nixos-gnu": [
139-
"aarch64-unknown-nixos-gnu"
140-
],
141-
"aarch64-unknown-nto-qnx710": [
142-
"aarch64-unknown-nto-qnx710"
143-
],
144-
"aarch64-unknown-uefi": [
145-
"aarch64-unknown-uefi"
146-
],
147-
"arm-unknown-linux-gnueabi": [
148-
"arm-unknown-linux-gnueabi"
149-
],
150-
"armv7-linux-androideabi": [
151-
"armv7-linux-androideabi"
152-
],
153-
"armv7-unknown-linux-gnueabi": [
154-
"armv7-unknown-linux-gnueabi"
155-
],
156-
"i686-apple-darwin": [
157-
"i686-apple-darwin"
158-
],
159-
"i686-linux-android": [
160-
"i686-linux-android"
161-
],
162-
"i686-pc-windows-msvc": [
163-
"i686-pc-windows-msvc"
164-
],
165-
"i686-unknown-freebsd": [
166-
"i686-unknown-freebsd"
167-
],
168-
"i686-unknown-linux-gnu": [
169-
"i686-unknown-linux-gnu"
170-
],
171-
"powerpc-unknown-linux-gnu": [
172-
"powerpc-unknown-linux-gnu"
173-
],
174-
"riscv32imc-unknown-none-elf": [
175-
"riscv32imc-unknown-none-elf"
176-
],
177-
"riscv64gc-unknown-none-elf": [
178-
"riscv64gc-unknown-none-elf"
179-
],
180-
"s390x-unknown-linux-gnu": [
181-
"s390x-unknown-linux-gnu"
182-
],
183-
"thumbv7em-none-eabi": [
184-
"thumbv7em-none-eabi"
185-
],
186-
"thumbv8m.main-none-eabi": [
187-
"thumbv8m.main-none-eabi"
188-
],
189123
"wasm32-unknown-unknown": [
190124
"wasm32-unknown-unknown"
191125
],
192126
"wasm32-wasip1": [
193127
"wasm32-wasip1"
194128
],
195-
"x86_64-apple-darwin": [
196-
"x86_64-apple-darwin"
197-
],
198-
"x86_64-apple-ios": [
199-
"x86_64-apple-ios"
200-
],
201-
"x86_64-linux-android": [
202-
"x86_64-linux-android"
203-
],
204129
"x86_64-pc-windows-msvc": [
205130
"x86_64-pc-windows-msvc"
206131
],
207-
"x86_64-unknown-freebsd": [
208-
"x86_64-unknown-freebsd"
209-
],
210-
"x86_64-unknown-fuchsia": [
211-
"x86_64-unknown-fuchsia"
212-
],
213132
"x86_64-unknown-linux-gnu": [
214133
"x86_64-unknown-linux-gnu"
215134
],
216135
"x86_64-unknown-nixos-gnu": [
217136
"x86_64-unknown-nixos-gnu"
218-
],
219-
"x86_64-unknown-none": [
220-
"x86_64-unknown-none"
221-
],
222-
"x86_64-unknown-uefi": [
223-
"x86_64-unknown-uefi"
224137
]
225138
},
226139
"direct_deps": [

‎examples/crate_universe/alias_rule/cargo-bazel-lock_global_alias_annotation_opt.json‎

Lines changed: 1 addition & 88 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
{
2-
"checksum": "6168e50ce554c325e7cd7648b8af23060c35670254e2ee6eb12e12ce8e361eaa",
2+
"checksum": "9178d0ef0fe03c0b7b5b1ce979b0aa90433f33d0aee48da3a99a22926ccd0d0c",
33
"crates": {
44
"direct-cargo-bazel-deps 0.0.1": {
55
"name": "direct-cargo-bazel-deps",
@@ -118,110 +118,23 @@
118118
"aarch64-apple-darwin": [
119119
"aarch64-apple-darwin"
120120
],
121-
"aarch64-apple-ios": [
122-
"aarch64-apple-ios"
123-
],
124-
"aarch64-apple-ios-sim": [
125-
"aarch64-apple-ios-sim"
126-
],
127-
"aarch64-linux-android": [
128-
"aarch64-linux-android"
129-
],
130-
"aarch64-pc-windows-msvc": [
131-
"aarch64-pc-windows-msvc"
132-
],
133-
"aarch64-unknown-fuchsia": [
134-
"aarch64-unknown-fuchsia"
135-
],
136121
"aarch64-unknown-linux-gnu": [
137122
"aarch64-unknown-linux-gnu"
138123
],
139-
"aarch64-unknown-nixos-gnu": [
140-
"aarch64-unknown-nixos-gnu"
141-
],
142-
"aarch64-unknown-nto-qnx710": [
143-
"aarch64-unknown-nto-qnx710"
144-
],
145-
"aarch64-unknown-uefi": [
146-
"aarch64-unknown-uefi"
147-
],
148-
"arm-unknown-linux-gnueabi": [
149-
"arm-unknown-linux-gnueabi"
150-
],
151-
"armv7-linux-androideabi": [
152-
"armv7-linux-androideabi"
153-
],
154-
"armv7-unknown-linux-gnueabi": [
155-
"armv7-unknown-linux-gnueabi"
156-
],
157-
"i686-apple-darwin": [
158-
"i686-apple-darwin"
159-
],
160-
"i686-linux-android": [
161-
"i686-linux-android"
162-
],
163-
"i686-pc-windows-msvc": [
164-
"i686-pc-windows-msvc"
165-
],
166-
"i686-unknown-freebsd": [
167-
"i686-unknown-freebsd"
168-
],
169-
"i686-unknown-linux-gnu": [
170-
"i686-unknown-linux-gnu"
171-
],
172-
"powerpc-unknown-linux-gnu": [
173-
"powerpc-unknown-linux-gnu"
174-
],
175-
"riscv32imc-unknown-none-elf": [
176-
"riscv32imc-unknown-none-elf"
177-
],
178-
"riscv64gc-unknown-none-elf": [
179-
"riscv64gc-unknown-none-elf"
180-
],
181-
"s390x-unknown-linux-gnu": [
182-
"s390x-unknown-linux-gnu"
183-
],
184-
"thumbv7em-none-eabi": [
185-
"thumbv7em-none-eabi"
186-
],
187-
"thumbv8m.main-none-eabi": [
188-
"thumbv8m.main-none-eabi"
189-
],
190124
"wasm32-unknown-unknown": [
191125
"wasm32-unknown-unknown"
192126
],
193127
"wasm32-wasip1": [
194128
"wasm32-wasip1"
195129
],
196-
"x86_64-apple-darwin": [
197-
"x86_64-apple-darwin"
198-
],
199-
"x86_64-apple-ios": [
200-
"x86_64-apple-ios"
201-
],
202-
"x86_64-linux-android": [
203-
"x86_64-linux-android"
204-
],
205130
"x86_64-pc-windows-msvc": [
206131
"x86_64-pc-windows-msvc"
207132
],
208-
"x86_64-unknown-freebsd": [
209-
"x86_64-unknown-freebsd"
210-
],
211-
"x86_64-unknown-fuchsia": [
212-
"x86_64-unknown-fuchsia"
213-
],
214133
"x86_64-unknown-linux-gnu": [
215134
"x86_64-unknown-linux-gnu"
216135
],
217136
"x86_64-unknown-nixos-gnu": [
218137
"x86_64-unknown-nixos-gnu"
219-
],
220-
"x86_64-unknown-none": [
221-
"x86_64-unknown-none"
222-
],
223-
"x86_64-unknown-uefi": [
224-
"x86_64-unknown-uefi"
225138
]
226139
},
227140
"direct_deps": [

‎examples/crate_universe/alias_rule/cargo-bazel-lock_global_custom_annotation_none.json‎

Lines changed: 1 addition & 88 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
{
2-
"checksum": "8548d8aea6a668636f32213571ee4613bccf6e42a8c348729db3e995bb165c99",
2+
"checksum": "77603e5382a2c6122f03edee856500632417d73756a3d24f8c9080f2f7a6ab49",
33
"crates": {
44
"direct-cargo-bazel-deps 0.0.1": {
55
"name": "direct-cargo-bazel-deps",
@@ -117,110 +117,23 @@
117117
"aarch64-apple-darwin": [
118118
"aarch64-apple-darwin"
119119
],
120-
"aarch64-apple-ios": [
121-
"aarch64-apple-ios"
122-
],
123-
"aarch64-apple-ios-sim": [
124-
"aarch64-apple-ios-sim"
125-
],
126-
"aarch64-linux-android": [
127-
"aarch64-linux-android"
128-
],
129-
"aarch64-pc-windows-msvc": [
130-
"aarch64-pc-windows-msvc"
131-
],
132-
"aarch64-unknown-fuchsia": [
133-
"aarch64-unknown-fuchsia"
134-
],
135120
"aarch64-unknown-linux-gnu": [
136121
"aarch64-unknown-linux-gnu"
137122
],
138-
"aarch64-unknown-nixos-gnu": [
139-
"aarch64-unknown-nixos-gnu"
140-
],
141-
"aarch64-unknown-nto-qnx710": [
142-
"aarch64-unknown-nto-qnx710"
143-
],
144-
"aarch64-unknown-uefi": [
145-
"aarch64-unknown-uefi"
146-
],
147-
"arm-unknown-linux-gnueabi": [
148-
"arm-unknown-linux-gnueabi"
149-
],
150-
"armv7-linux-androideabi": [
151-
"armv7-linux-androideabi"
152-
],
153-
"armv7-unknown-linux-gnueabi": [
154-
"armv7-unknown-linux-gnueabi"
155-
],
156-
"i686-apple-darwin": [
157-
"i686-apple-darwin"
158-
],
159-
"i686-linux-android": [
160-
"i686-linux-android"
161-
],
162-
"i686-pc-windows-msvc": [
163-
"i686-pc-windows-msvc"
164-
],
165-
"i686-unknown-freebsd": [
166-
"i686-unknown-freebsd"
167-
],
168-
"i686-unknown-linux-gnu": [
169-
"i686-unknown-linux-gnu"
170-
],
171-
"powerpc-unknown-linux-gnu": [
172-
"powerpc-unknown-linux-gnu"
173-
],
174-
"riscv32imc-unknown-none-elf": [
175-
"riscv32imc-unknown-none-elf"
176-
],
177-
"riscv64gc-unknown-none-elf": [
178-
"riscv64gc-unknown-none-elf"
179-
],
180-
"s390x-unknown-linux-gnu": [
181-
"s390x-unknown-linux-gnu"
182-
],
183-
"thumbv7em-none-eabi": [
184-
"thumbv7em-none-eabi"
185-
],
186-
"thumbv8m.main-none-eabi": [
187-
"thumbv8m.main-none-eabi"
188-
],
189123
"wasm32-unknown-unknown": [
190124
"wasm32-unknown-unknown"
191125
],
192126
"wasm32-wasip1": [
193127
"wasm32-wasip1"
194128
],
195-
"x86_64-apple-darwin": [
196-
"x86_64-apple-darwin"
197-
],
198-
"x86_64-apple-ios": [
199-
"x86_64-apple-ios"
200-
],
201-
"x86_64-linux-android": [
202-
"x86_64-linux-android"
203-
],
204129
"x86_64-pc-windows-msvc": [
205130
"x86_64-pc-windows-msvc"
206131
],
207-
"x86_64-unknown-freebsd": [
208-
"x86_64-unknown-freebsd"
209-
],
210-
"x86_64-unknown-fuchsia": [
211-
"x86_64-unknown-fuchsia"
212-
],
213132
"x86_64-unknown-linux-gnu": [
214133
"x86_64-unknown-linux-gnu"
215134
],
216135
"x86_64-unknown-nixos-gnu": [
217136
"x86_64-unknown-nixos-gnu"
218-
],
219-
"x86_64-unknown-none": [
220-
"x86_64-unknown-none"
221-
],
222-
"x86_64-unknown-uefi": [
223-
"x86_64-unknown-uefi"
224137
]
225138
},
226139
"direct_deps": [

0 commit comments

Comments
 (0)