[rust][cr149] extra_input_roots using wildcards
These changes have been automatically picked up on by `gnrt gen`. Chromium changes: https://chromium.googlesource.com/chromium/src/+/36a5776a2fefd795a20d7f95a5f0eb64dd9ff75b commit 36a5776a2fefd795a20d7f95a5f0eb64dd9ff75b Author: Lukasz Anforowicz <lukasza@chromium.org> Date: Mon May 4 15:09:18 2026 -0700 [gnrt] Allow wildcards and any file extension in `extra_input_roots`. Rather than allowlisting extensions one-by-one, let's add support for wildcards and let `gnrt_config.toml` pick which extensions to cover. Other changes in this CL: * It turned out that before this CL `extra_input_roots` was ignored for "binary" crates (and only taken into account for "library" crates) * Stop automatically enumerating non-`.rs` files under `src/`. This was somewhat okay when only allowlisted extensions were included, but would result in lots of extra files after this CL. (And also, this removes some unneeded `BUILD.gn` entries here and there.) * Globbing means that we no longer need to manually match extensions in `fn collect_crate_file` so this function has been inlined and refactored away. Tested by manually running the following tools (and including the results in this CL): * `tools/crates/run_gnrt.py gen` * `tools/rust/gnrt_stdlib.py` * `cargo test` and `cargo clippy` in `tools/rust/gnrt` Bug: 508339800 Change-Id: Ieb6b0d7205b407f921272bf5ad7c7bc54f355f32 Reviewed-on: https://chromium-review.googlesource.com/c/chromium/src/+/7809525 Commit-Queue: Łukasz Anforowicz <lukasza@chromium.org> Reviewed-by: Devon Loehr <dloehr@google.com> Cr-Commit-Position: refs/heads/main@{#1624964}
This commit is contained in:
+1
-1
@@ -47,7 +47,7 @@ cargo_crate("lib") {
|
||||
"//brave/third_party/rust/chromium_crates_io/vendor/aho-corasick-v1/src/util/search.rs",
|
||||
"//brave/third_party/rust/chromium_crates_io/vendor/aho-corasick-v1/src/util/special.rs",
|
||||
]
|
||||
inputs = [ "//brave/third_party/rust/chromium_crates_io/vendor/aho-corasick-v1/src/packed/teddy/README.md" ]
|
||||
inputs = []
|
||||
|
||||
build_native_rust_unit_tests = false
|
||||
edition = "2021"
|
||||
|
||||
+1
-6
@@ -34,12 +34,7 @@ cargo_crate("lib") {
|
||||
"//brave/third_party/rust/chromium_crates_io/vendor/bls12_381-v0_8/src/tests/mod.rs",
|
||||
"//brave/third_party/rust/chromium_crates_io/vendor/bls12_381-v0_8/src/util.rs",
|
||||
]
|
||||
inputs = [
|
||||
"//brave/third_party/rust/chromium_crates_io/vendor/bls12_381-v0_8/src/tests/g1_compressed_valid_test_vectors.dat",
|
||||
"//brave/third_party/rust/chromium_crates_io/vendor/bls12_381-v0_8/src/tests/g1_uncompressed_valid_test_vectors.dat",
|
||||
"//brave/third_party/rust/chromium_crates_io/vendor/bls12_381-v0_8/src/tests/g2_compressed_valid_test_vectors.dat",
|
||||
"//brave/third_party/rust/chromium_crates_io/vendor/bls12_381-v0_8/src/tests/g2_uncompressed_valid_test_vectors.dat",
|
||||
]
|
||||
inputs = []
|
||||
|
||||
build_native_rust_unit_tests = false
|
||||
edition = "2021"
|
||||
|
||||
+1
-4
@@ -14,10 +14,7 @@ cargo_crate("lib") {
|
||||
crate_type = "proc-macro"
|
||||
crate_root = "//brave/third_party/rust/chromium_crates_io/vendor/cssparser-macros-v0_6/lib.rs"
|
||||
sources = [ "//brave/third_party/rust/chromium_crates_io/vendor/cssparser-macros-v0_6/lib.rs" ]
|
||||
inputs = [
|
||||
"//brave/third_party/rust/chromium_crates_io/vendor/cssparser-macros-v0_6/.cargo-checksum.json",
|
||||
"//brave/third_party/rust/chromium_crates_io/vendor/cssparser-macros-v0_6/.cargo_vcs_info.json",
|
||||
]
|
||||
inputs = []
|
||||
|
||||
build_native_rust_unit_tests = false
|
||||
edition = "2018"
|
||||
|
||||
@@ -65,6 +65,7 @@ cargo_crate("lib") {
|
||||
]
|
||||
inputs = [
|
||||
"//brave/third_party/rust/chromium_crates_io/vendor/curve25519-dalek-v4/src/../README.md",
|
||||
"//brave/third_party/rust/chromium_crates_io/vendor/curve25519-dalek-v4/src/../docs/assets/rustdoc-include-katex-header.html",
|
||||
"//brave/third_party/rust/chromium_crates_io/vendor/curve25519-dalek-v4/src/../docs/avx2-notes.md",
|
||||
"//brave/third_party/rust/chromium_crates_io/vendor/curve25519-dalek-v4/src/../docs/ifma-notes.md",
|
||||
"//brave/third_party/rust/chromium_crates_io/vendor/curve25519-dalek-v4/src/../docs/parallel-formulas.md",
|
||||
|
||||
Vendored
+1
-5
@@ -16,11 +16,7 @@ cargo_crate("lib") {
|
||||
"//brave/third_party/rust/chromium_crates_io/vendor/fnv-v1/lib.rs"
|
||||
sources =
|
||||
[ "//brave/third_party/rust/chromium_crates_io/vendor/fnv-v1/lib.rs" ]
|
||||
inputs = [
|
||||
"//brave/third_party/rust/chromium_crates_io/vendor/fnv-v1/.cargo-checksum.json",
|
||||
"//brave/third_party/rust/chromium_crates_io/vendor/fnv-v1/.cargo_vcs_info.json",
|
||||
"//brave/third_party/rust/chromium_crates_io/vendor/fnv-v1/README.md",
|
||||
]
|
||||
inputs = []
|
||||
|
||||
build_native_rust_unit_tests = false
|
||||
edition = "2015"
|
||||
|
||||
+1
-4
@@ -18,10 +18,7 @@ cargo_crate("lib") {
|
||||
"//brave/third_party/rust/chromium_crates_io/vendor/fxhash-v0_2/bench.rs",
|
||||
"//brave/third_party/rust/chromium_crates_io/vendor/fxhash-v0_2/lib.rs",
|
||||
]
|
||||
inputs = [
|
||||
"//brave/third_party/rust/chromium_crates_io/vendor/fxhash-v0_2/.cargo-checksum.json",
|
||||
"//brave/third_party/rust/chromium_crates_io/vendor/fxhash-v0_2/README.md",
|
||||
]
|
||||
inputs = []
|
||||
|
||||
build_native_rust_unit_tests = false
|
||||
edition = "2015"
|
||||
|
||||
+1
-4
@@ -24,10 +24,7 @@ cargo_crate("lib") {
|
||||
"//brave/third_party/rust/chromium_crates_io/vendor/markup5ever-v0_14/util/buffer_queue.rs",
|
||||
"//brave/third_party/rust/chromium_crates_io/vendor/markup5ever-v0_14/util/smallcharset.rs",
|
||||
]
|
||||
inputs = [
|
||||
"//brave/third_party/rust/chromium_crates_io/vendor/markup5ever-v0_14/.cargo-checksum.json",
|
||||
"//brave/third_party/rust/chromium_crates_io/vendor/markup5ever-v0_14/.cargo_vcs_info.json",
|
||||
]
|
||||
inputs = []
|
||||
|
||||
build_native_rust_unit_tests = false
|
||||
edition = "2021"
|
||||
|
||||
+1
-5
@@ -19,11 +19,7 @@ cargo_crate("lib") {
|
||||
"//brave/third_party/rust/chromium_crates_io/vendor/matches-v0_1/tests/macro_use_one.rs",
|
||||
"//brave/third_party/rust/chromium_crates_io/vendor/matches-v0_1/tests/use_star.rs",
|
||||
]
|
||||
inputs = [
|
||||
"//brave/third_party/rust/chromium_crates_io/vendor/matches-v0_1/.cargo-checksum.json",
|
||||
"//brave/third_party/rust/chromium_crates_io/vendor/matches-v0_1/.cargo_vcs_info.json",
|
||||
"//brave/third_party/rust/chromium_crates_io/vendor/matches-v0_1/README.md",
|
||||
]
|
||||
inputs = []
|
||||
|
||||
build_native_rust_unit_tests = false
|
||||
edition = "2015"
|
||||
|
||||
+1
-7
@@ -34,13 +34,7 @@ cargo_crate("lib") {
|
||||
"//brave/third_party/rust/chromium_crates_io/vendor/reddsa-v0_5/src/signing_key.rs",
|
||||
"//brave/third_party/rust/chromium_crates_io/vendor/reddsa-v0_5/src/verification_key.rs",
|
||||
]
|
||||
inputs = [
|
||||
"//brave/third_party/rust/chromium_crates_io/vendor/reddsa-v0_5/src/../README.md",
|
||||
"//brave/third_party/rust/chromium_crates_io/vendor/reddsa-v0_5/src/frost/redjubjub/README.md",
|
||||
"//brave/third_party/rust/chromium_crates_io/vendor/reddsa-v0_5/src/frost/redjubjub/dkg.md",
|
||||
"//brave/third_party/rust/chromium_crates_io/vendor/reddsa-v0_5/src/frost/redpallas/README.md",
|
||||
"//brave/third_party/rust/chromium_crates_io/vendor/reddsa-v0_5/src/frost/redpallas/dkg.md",
|
||||
]
|
||||
inputs = [ "//brave/third_party/rust/chromium_crates_io/vendor/reddsa-v0_5/src/../README.md" ]
|
||||
|
||||
build_native_rust_unit_tests = false
|
||||
edition = "2021"
|
||||
|
||||
+1
-5
@@ -27,11 +27,7 @@ cargo_crate("lib") {
|
||||
"//brave/third_party/rust/chromium_crates_io/vendor/selectors-v0_24/tree.rs",
|
||||
"//brave/third_party/rust/chromium_crates_io/vendor/selectors-v0_24/visitor.rs",
|
||||
]
|
||||
inputs = [
|
||||
"//brave/third_party/rust/chromium_crates_io/vendor/selectors-v0_24/.cargo-checksum.json",
|
||||
"//brave/third_party/rust/chromium_crates_io/vendor/selectors-v0_24/.cargo_vcs_info.json",
|
||||
"//brave/third_party/rust/chromium_crates_io/vendor/selectors-v0_24/README.md",
|
||||
]
|
||||
inputs = []
|
||||
|
||||
build_native_rust_unit_tests = false
|
||||
edition = "2015"
|
||||
|
||||
+1
-6
@@ -31,12 +31,7 @@ cargo_crate("lib") {
|
||||
"//brave/third_party/rust/chromium_crates_io/vendor/selectors-v0_26/tree.rs",
|
||||
"//brave/third_party/rust/chromium_crates_io/vendor/selectors-v0_26/visitor.rs",
|
||||
]
|
||||
inputs = [
|
||||
"//brave/third_party/rust/chromium_crates_io/vendor/selectors-v0_26/.cargo-checksum.json",
|
||||
"//brave/third_party/rust/chromium_crates_io/vendor/selectors-v0_26/.cargo_vcs_info.json",
|
||||
"//brave/third_party/rust/chromium_crates_io/vendor/selectors-v0_26/CHANGES.md",
|
||||
"//brave/third_party/rust/chromium_crates_io/vendor/selectors-v0_26/README.md",
|
||||
]
|
||||
inputs = []
|
||||
|
||||
build_native_rust_unit_tests = false
|
||||
edition = "2021"
|
||||
|
||||
+1
-4
@@ -17,10 +17,7 @@ cargo_crate("lib") {
|
||||
sources = [
|
||||
"//brave/third_party/rust/chromium_crates_io/vendor/servo_arc-v0_2/lib.rs",
|
||||
]
|
||||
inputs = [
|
||||
"//brave/third_party/rust/chromium_crates_io/vendor/servo_arc-v0_2/.cargo-checksum.json",
|
||||
"//brave/third_party/rust/chromium_crates_io/vendor/servo_arc-v0_2/.cargo_vcs_info.json",
|
||||
]
|
||||
inputs = []
|
||||
|
||||
build_native_rust_unit_tests = false
|
||||
edition = "2015"
|
||||
|
||||
+1
-4
@@ -17,10 +17,7 @@ cargo_crate("lib") {
|
||||
sources = [
|
||||
"//brave/third_party/rust/chromium_crates_io/vendor/servo_arc-v0_4/lib.rs",
|
||||
]
|
||||
inputs = [
|
||||
"//brave/third_party/rust/chromium_crates_io/vendor/servo_arc-v0_4/.cargo-checksum.json",
|
||||
"//brave/third_party/rust/chromium_crates_io/vendor/servo_arc-v0_4/.cargo_vcs_info.json",
|
||||
]
|
||||
inputs = []
|
||||
|
||||
build_native_rust_unit_tests = false
|
||||
edition = "2021"
|
||||
|
||||
+1
-4
@@ -14,10 +14,7 @@ cargo_crate("buildrs_support") {
|
||||
crate_type = "rlib"
|
||||
crate_root = "//brave/third_party/rust/chromium_crates_io/vendor/string_cache_codegen-v0_5/lib.rs"
|
||||
sources = [ "//brave/third_party/rust/chromium_crates_io/vendor/string_cache_codegen-v0_5/lib.rs" ]
|
||||
inputs = [
|
||||
"//brave/third_party/rust/chromium_crates_io/vendor/string_cache_codegen-v0_5/.cargo-checksum.json",
|
||||
"//brave/third_party/rust/chromium_crates_io/vendor/string_cache_codegen-v0_5/.cargo_vcs_info.json",
|
||||
]
|
||||
inputs = []
|
||||
|
||||
build_native_rust_unit_tests = false
|
||||
edition = "2018"
|
||||
|
||||
Reference in New Issue
Block a user