Squashed 'third_party/rules_rust/' changes from 078c6908f..bf9ddeb7c
bf9ddeb7c Release 0.25.1 (#2049)
db5b2fd65 Update tinyjson (#2050)
6a7872ae3 Fix prost proto packages not sanitizing to valid module names (#2044)
c080d7bfa Moved legacy protobuf rules to `proto/protobuf` (#2043)
1281cc051 Remove debug code. (#2048)
cd126be1f Fix build failure finding crate_roots when mixed with generated sources (#2041)
7f751cddd Consolidate rust_prost_library and fix extension-only proto generation. (#2047)
6118c81f2 Release 0.25.0 (#2042)
a6f29fd07 Add Prost and Tonic rules. (#2033)
9442aed8c fix: `crate_type` more accurately corresponds to CC linking actions (#1975)
4f4e2b17b Re-enable zig example on CI (#2030)
2ded0c2f5 Fix flaky coverage test in CI (#2028)
36f8251f9 Exclude .tmp_git_root from globs (#1948)
ca750fa83 Eliminate Rustfmt action in Bindgen rules. Bindgen can run rustfmt (#2025)
c55ec0cfb Allow sysroots from cc_toolchains to be added to bindgen actions (#2024)
9314b1b0c Release 0.24.1 (#2023)
92ea74ade Making rust_std attr in rust_toolchain mandatory (#1984)
a54b8e14b Update `rust_library_group` to use `DepVariantInfo` (#2022)
47644346b Release v0.24.0 (#2020)
a6b0a7f39 Rust library group (#1848)
bc43f4841 Fix crate_universe's `all_crate_deps` and `aliases` functions failing in case the crate's Cargo.toml has condtional dependencies (#2018)
8f27ec7c5 fix: load cargo manifest without resolving abs path of deps (#2017)
23f99bb63 feature: `target_compatible_with` added to `CommonAttrs` (#1976)
11f8c9875 Make `rust_doc_test` inherit it's crate aliases attribute (#2007)
8e848414d Regenerated crate_universe outputs for all packages (#2011)
1b6365131 Don't use startup:windows (#2012)
e80582e75 Fix thumbv* platform resolution (#2010)
367f90ef0 Update bindgen version to 0.65.1 (#2008)
e6ed5bf90 Release 0.23.0 (#2003)
93b230bb8 Fix code coverage collection. (#2001)
0a14bfbb0 Minor CI and test cleanup (#2004)
3e2ee941a Update bindgen rules to build clang from source. (#1998)
5a1a7577d Split up cargo_build_script tests (#2002)
eb6413e83 Update various bash scripts to pipe errors to stderr (#1999)
affe947ac Update stardoc version (#1997)
7073146f8 Add support for armv8-m (#1993)
73a06f130 Added Rust 1.70.0 (#1991)
23c20a93f Fixes crates_vendor workspace name detection when using bzlmod (#1990)
f5813fa08 Set windows flags in platform-specific bazelrc (#1988)
c1632b5b5 Fix up anchor link (#1987)
56e760487 Fix typo in crate_universe-generated defs.bzl comment (#1981)
94cbe4c2c Symlink in the exec-root so that relative paths will work, unchanged. (#1781)
af8ef62eb Release 0.22.0 (#1974)
4aaa6de30 Allow specifying exec and target compatibility constraints (#1971)
f1b19c394 Update rules_apple in tests (#1972)
937e63399 Add T2 support for x86_64-unknown-none (#1967)
66b1bf165 fix: lld-link (MSVC) fix flags including `-l` prefix (#1958)
285dcbbb9 feature: expose `extra_rustc_flags` and `extra_exec_rustc_flags` at `rust_register_toolchains` (#1959)
0f25cb462 Removed `rust_toolchain.os` in favor of `rust_toolchain.exec_triple`. (#1960)
a2a1109dc Add T2 support for thumbv7em-none-eabi (#1957)
80f0eb488 Support for `no_std` mode (#1934)
99aaf0830 Rename crates_vendor_manifests to cvm to shorten windows path lengths (#1944)
0a57da049 Added tests for build script dependencies to crate_universe (#1943)
caffb0a08 Release 0.21.1 (#1936)
c869a17c7 Fix regression in building zlib (#1935)
24b9dea4f Release 0.21.0 (#1933)
7677c617e Add support for rustc flags to `rust_proto_library` (#1932)
fa304ae48 Updated zlib BUILD file to support darwin-arm64 (#1931)
a86313282 Added Rust 1.69.0 (#1930)
f0e12c707 Make BuildInfo provider public (#1920)
c6ad23aba Respect `#[global_allocator]` in `cc_common.link` builds (#1926)
d78752504 Exclude target directory from release tars (#1922)
0339cd18a [wasm-bindgen] Update to v0.2.84 (#1919)
07af5678e Handle corner case for windows architecture detection (#1915)
c56e7660d Fix optional deps by platform (#1911)
4663ff6a3 cc_common_link: also respect --custom_malloc if set (#1912)
dab425760 Add Rust 1.68.2 (#1908)
e4bd39f95 Add empty rustfmt.toml (#1907)
eaf513865 Support bzlmod (#1528)
1074ecbab Release v0.20.0 (#1900)
44aec0a79 ci: fix test config in cc_common_link_ubuntu2004 (#1904)
6571cde64 Adds per_crate_rustc_flag build setting. (#1827)
7a47449df Added Rust 1.68.1 (#1898)
e3bcdbad1 Fixed rustdoc warnings in crate_universe (#1897)
529f45900 Added `rustdoc_flags` attribute to rust_doc rule (#1867)
9e3499405 Have rustdoc return its output directory instead of zip default. (#1868)
9d6741f40 Implement support for optional crates enabled with dep: features (#1885)
fd10963ea Skip adding -lstatic to libtest and libstd on Darwin (#1620)
b3314b45e Release 0.19.1 (#1895)
c1a9fd86f Accumulate all features from cargo tree output (#1884)
206f71c95 Disable zig example (#1893)
1a5d07cd2 Add runfiles support to rust_stdlib_filegroup (#1890)
6996cd550 Deleted unused targets and cleanup docs (#1889)
a85e24e20 Fix triple constraints for iOS and watchOS (#1888)
e13fd3bad Release rules_rust and cargo-bazel (#1882)
9e9853d63 Add support for thumbv7em with hard float (#1871)
b3cd5962e Added Rust 1.68.0 (#1866)
f1b7aedf5 Support sparse indexes (#1857)
7f2dd433a Make fetch_shas work with mktemp from coreutils 8.32 (#1870)
a9cc01230 Update crate_universe dependencies (#1872)
c038e94ae Pipe stderr from cargo tree processes (#1879)
222d60322 Parallelize cargo tree calls (#1874)
cdbbf7131 Add Fuchsia platform support (#1833)
17e5b04c2 Use `_make_link_flags_darwin` when target os is `ios`. (#1843)
d9ecc8df4 crate_universe: Support fetching crates with git branch, tag or rev (#1846)
1c694cd60 Forward `toolchains` to `cargo_build_script` targets (#1862)
9affcbfa7 Skip detecting abi for empty values (#1830)
6193fe823 Re-enable crate_universe MacOS tests (#1861)
c25db95ae Updated Rust to 1.67.1 (#1864)
7b8fd06be Support `[patch]` in crate_universe when using multiple `Cargo.toml`s (#1856)
c645fe399 Silence windows build failure (#1863)
75bba7b50 Make rust_clippy providers match rustfmt_test (#1806)
f09d72755 Fix test assertion for arm64 macs (#1845)
f4113bfe1 Fix tests for new Apple toolchain (#1844)
20ce44e30 fix: use target_triple struct instead of string (#1835)
bdbded181 Fix code example in doc (#1838)
4f4014052 Fix typo: plced -> placed (#1834)
baeb0664d Remove ios/android/wasm support for gen_rust_project deps (#1684)
02557a47a Add `render_config` attribute to `crates_vendor`. (#1832)
4357fb154 Updated rules_rust to version 0.18.0 (#1829)
9adfdca9b Various cleanups (#1828)
4fa412385 Added update known shas to include T1-T2 triples (#1824)
905731ad9 Instructions on how to perform `rustfmt` check (#1822) (#1823)
108b1a187 Encapsulate running cargo into a struct (#1815)
57a099b63 Fixes resolver issue with root packages and another dependency format (#1819)
78ca9ba0a Use env method recently added to cargo_metadata (#1813)
92834930f Updated `rust_toolchain.target_json` to take encoded json strings (#1810)
84f1d0657 support `resolver = "2"` target-specific features (#1710)
a5853fd37 Use correct dynamic link args fro proc-macro crates (#1803)
b656e2553 Added tests for the `triple` constructor (#1811)
ea4a79ad9 Disable job in CI to avoid infrastructure failure. (#1816)
2fc02f030 Delete `rust_toolchain.rusrc_srcs` (#1807)
804d5fc1f Convert `rust_toolchain` attrs `exec_triple` and `target_triple` to structs (#1808)
499a2ca38 Updated platform triple values from strings to structs ("triple") (#1804)
aae1dbdcb Unify functions for computing constraint values for platform triple abi (#1805)
0d6d2b1eb Updated rules_rust version to `0.17.0` (#1800)
88e83f2df Added Rust 1.67.0 (#1799)
6922b5012 rustdoc_test: fix and test OUT_DIR (#1779)
ad01d1b0e [crate_universe] add an annotation to disable pipelining (#1733)
f651cd18f Add `CARGO_BAZEL_REPIN_ONLY` repinning allowlist (#1798)
d7f0debb0 Revert "Disable broken clang and ldd CI jobs (#1785)" (#1796)
96f82aaad Fix `cc_common.link` file output name (#1795)
5079b64d5 Fix use of `rustfmt_toolchain` when `rustc` is not provided (#1794)
23c650f35 Have `--experimental_use_cc_common_link` cover `rust_shared_library` (#1792)
ba0fb5956 Added support for `--nolegacy_external_runfiles` to `rust_doc_test` (#1790)
112242bb7 Prevent crates_vendor from restarting bazel. (#1791)
52231ef9f Added compatibility flags to `.bazelrc` to prevent regressions (#1789)
91cd399a0 Add "crate-name={}" tag to Crate Universe targets (#1787)
1b1dae196 Added Rust 1.66.1 (#1767)
fe17e8b8e Add file:// prefix to env var in docs (#1788)
0fe742bff Updated `rust_bindgen` to use `rustfmt_toolchain` (#1770)
042fd6c1c Update docs on setting Rust versions (#1786)
dddd8a0d4 Updated crate_universe dependencies (#1775)
a1330a71f Download `rustc` in `rustfmt_toolchain_repository` (#1769)
e96aad9aa Updated the ios_build example to use `crates_vendor` (#1778)
e315007df Disable broken clang and ldd CI jobs (#1785)
4e89d52a9 rustdoc_test: substitute the root of the current crate (#1777)
a52041fb5 Support `target_settings` in `rust_repository_set` and `rust_toolchain_repository` (#1758)
49906eb29 Update clippy and rustfmt aspects to require CrateInfo providers (#1772)
85564208e Updated rules_rust version to `0.16.1` (#1761)
614499a5b Fixed inability to deserialize crate_universe lockfiles (#1760)
9803d3034 Fix data and compile_data for rust_doc (#1741)
927a364cb Update Release github pipeline to trigger automatically (#1757)
7d03e05f8 Fix release pipeline (#1756)
cf7ca5dfd Updated rules_rust to version `0.16.0` (#1750)
203fe4b9a Remove unnecessary binary file (#1755)
941c7cca9 Don't propagate `compatible_with` to the underlying `cargo_build_script` `rust_binary` target (#1754)
a31490d9a Make loads from @rules_rust//rust:defs.bzl come out on one line (#1753)
7ebad4d50 Generate only the needed subset of binaries for bindgen and proto (#1751)
4ef3d4aaa Repin examples/crate_universe_unnamed (#1752)
d6e300359 Regenerate BUILD files using serde_starlark renderer (#1746)
e7c8a97d1 Convert BUILD.$name-$version.bazel to serde_starlark (#1743)
c09818d3b Exclude generated files from language stats and collapse in code review (#1747)
26a24f030 Added CI for single toolchain channel workspaces (#1712)
caed7d814 Report context on error failing to get version (#1744)
36b57af7b Add gen_binaries annotation to control which bins to make target for (#1718)
d916a6f52 crate_universe re-pinning now defaults to "workspace" (#1723)
f34661ee1 Propagate `compatible_with` attribute to the underlying `_build_script_run` target (#1745)
92977d1bf Re-pinned all dependencies managed by crate_universe (#1735)
d5289ad1c Added `rustfmt_toolchain` and refactored toolchain repository rules (#1719)
532e60ff0 Collect targets in a deterministic order (#1736)
52e02c25b Eliminate all use of hash-based collections from crate_universe (#1737)
31073ff8e Replace tera template with serde_starlark (#1734)
d4e5586d0 Support the RUNFILES_DIR environment variable. (#1732)
1357b85b1 Addressed clippy warnings from `clippy 0.1.67 (ec56537c 2022-12-15)` (#1717)
8bc9f788d Support dsym_folder output group in tests (#1703)
90c5b6eb7 Added CI for minimum supported Rust version (#1720)
be82ff8bd Match prerelease versions with annotation wildcard (#1716)
36c7f285b Arm Thumb Embedded Targets. (#1721)
5ef52e465 Update current_toolchain_files tests to use a dedicated test rule (#1714)
c75ea6f9e Add `Runfiles::current_repository` to runfiles library (#1713)
2f0511782 Updated rules_rust to version `0.15.0` (#1706)
019f87178 Added Rust 1.66.0 (#1705)
1469cd7cb Fix labels to work with canonical label literals. (#1700)
5826a500a Add riscv32imc and riscv64gc to the known sha targets (#1698)
40dee95ce Fixed typos: normla -> normal (#1699)
8f08e77ac load_arbitrary_tool uses tool_suburl to look up sha256 (#1695)
8faec3060 Fix typos in crate_universe rendered comments (#1691)
bd64711ff Silence flaky test (#1693)
46b7ea5af Added a build setting for toolchain channels (#1671)
70b272aad Updated rules_rust to version `0.14.0` (#1669)
91e597dd1 Updated all crates_vendor outputs (#1687)
9a047b0b9 Updated crate_universe dependencies (#1686)
3a91d2f5b Add RV64GC target (#1683)
d9e752ab4 Add per-toolchain `rustc_flags` (#1635)
56237415e stardoc: Use backtick not `<code>` for attr default values (#1682)
d4b31a494 Allow passing a bazel path to vendor explicitly (#1661)
d51bf9ce0 Updated crate_universe to work with `--nolegacy_external_runfiles` (#1680)
7f40636d1 crate_universe/private/crates_vendor.bzl typo fix (#1678)
025bf7db8 Merge cc toolchain flags into build script env (#1675)
b7c36c051 Fix confusing/misleading crate_universe docs (#1677)
29233e354 Revert #1564 (#1663)
ed32b6de2 Common glob excludes (#1673)
61b99cdd1 fix: add space to crate data exclude list (#1665)
8bb25b8b7 Support Windows ARM64 (aarch64-pc-windows-msvc) (#1664)
ddf2a4c23 Re-render crate BUILD files after #1647 (#1655)
44c7e1588 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. (#1647)
de18d8bb6 Allow `buildifier` attribute to be a file (#1660)
aa0815dc9 Fix naming of ambiguous libs (#1625)
ff314d4ab Also pass -c opt to tests in opt mode CI (#1626)
ff4e90515 Reenable windows job (#1658)
c45b8e91f Updated rules_rust to version `0.13.0` (#1644)
87d6b6c37 Update `//util/label` to support `+` in packages (#1654)
ab6959db5 fix: Fix issue with wasi-0.11.0+wasi-snapshot-preview1 (#1632)
28c090ed0 Replaced custom platform constraint values with aliases to `@platforms` (#1652)
dfbea4f52 Deprecated `rust_toolchain.rustc_srcs` (#1653)
fd1db4391 Remove deprecated attributes from rust_toolchain and cargo_bootstrap (#1651)
c8ab970c4 Generated rust-project.json files now include sysroot paths (#1641)
0a3e04cf9 Fix vendoring when not in a package (#1646)
aece1e37d Deduplicate expand_location targets in rust-project.json crate creation to avoid a bazel crash (#1639)
03a0b2483 [docs] Fixing typos in CargoConfig doc strings (#1638)
bd4fd2ac5 Upgraded cfg-expr dependency to 0.12.0. (#1636)
330554a13 Disable failing job in CI (#1640)
849f106e6 Consider compilation mode when choosing `pic`/`nopic` object files to link (#1624)
53491d719 Updated rules_rust to version `0.12.0` (#1630)
8e8843724 Remove empty glob (#1628)
1f621a944 Added Rust 1.65.0 (#1627)
c6af4d025 Add `-c opt` mode to CI (#1621)
95320cc8b process_wrapper: print line on error to parse message as json (#1566)
81eaccf39 Fixed CI breakage (#1619)
478fc3a57 Fix ambiguous native dependencies in `proc_macro`s and `staticlib`s (#1611)
9e3d8415e Build deps of _build_script_run in 'exec' mode (#1561)
ea031082b Fixed outdated docs (#1614)
a8c540e49 Restore support for old cargo_build_script load statements (#1613)
295b5ccc7 Renamed `_build_script_run` rule to `cargo_build_script` (#1612)
3778069ec Remove references to Google mirror in docs (#1607)
aad54ba29 Updated crate_universe dependencies (#1606)
c349df2a6 Remove Google mirror from Starlark snippet in release notes (#1604)
0493b998d Avoid rendering a mock root package when possible (#1596)
b04aa053c process_wrapper: Apply substitutions to param files (#1565)
b209b3e15 Updated rules_rust to version `0.11.0`. (#1587)
b1079453b Typo correction on doc (#1593)
ca5678266 Updated crate_universe dependencies (#1591)
a364d448f Fixes crates_vendor labels in remote mode when used from the root workspace (#1575)
1cc37c268 Expose the output directory from cargo_build_script (#1588)
7ffe0a555 Ignore non-utf8 text in build script output (#1583)
c5b38fe00 Merge runfiles from transitive dependencies of rust_test crate attr (#1487)
da3d522d5 Fix build scripts targeting the wrong architecture (#1564)
d288ed634 Add `out_dir` support in `cargo_dep_env` (#1571)
78d6c1b46 fix: incorrect rustfmt edition query (#1582)
48927127e Set CARGO_MANIFEST_DIR at runtime for tests (#1559)
76bd69033 Add an output group for the .rmeta (#1585)
352bfeb05 Cleanup deprecated code (#1577)
86dc561f9 Move crate_root_src to utils (#1570)
beb554eb9 update to wasm-bindgen v0.2.83 (#1567)
73fd1616b Export AbsoluteLabel functionality (#1568)
c57e7a399 Remap $PWD to empty string instead of "." (#1563)
f0cdcedc2 Added Rust 1.64.0 (#1562)
1d326554a Update docs to show release policies and support (#1560)
78c793a0a Fix markdown typo in rust_analyzer.md (#1553)
c13980fb6 Add iOS examples (#1546)
8a5e07e9f Update apple_support (#1549)
6dacd9803 Strip leading '@'s for labels in the splicing manifest (#1547)
f73d1d6fb use crate_info.deps in establish_cc_info (#1543)
4845af6c0 Add android example (#1545)
9570b7aa7 Remove -lgcc from Android builds (#1541)
cb9ca1b81 Fix crate_universe/private/srcs.bzl to work with repo mappings (#1540)
d1fc9accc Minor cleanup of CI pipelines (#1534)
2bb077b3b Updated rules_rust to version 0.10.0 (#1533)
b8751b860 add cc config info to dummy wasm32 cc toolchain (#1532)
f5ed797ee Updates rust_test to use main.rs as the root when use_libtest_harness is false (#1518)
cfcaf21d5 Preserve directory structure of source files when some are generated (#1526)
51c065841 migrating to rbe_preconfig and remove bazel_toolchains (#1524)
055abd402 Fix typo in an example of crates_repository rule (#1520)
8bfed1cd2 Added Rust 1.63.0 (#1512)
3a69ce09b Update wasm_bindgen to 0.2.82 (#1513)
git-subtree-dir: third_party/rules_rust
git-subtree-split: bf9ddeb7c83a9fe8a7d87c76134cdd8e16131b62
Signed-off-by: Adam Snaider <adsnaider@gmail.com>
Change-Id: Id9490c68d6221da66953a915a25042ef8b848505
diff --git a/util/collect_coverage.sh b/util/collect_coverage.sh
index 328a5c6..648de5e 100755
--- a/util/collect_coverage.sh
+++ b/util/collect_coverage.sh
@@ -6,14 +6,20 @@
set -x
fi
+if [[ "${RUNFILES_DIR:0:1}" != "/" ]]; then
+ if [[ -n "${ROOT}" ]]; then
+ RUNFILES_DIR="${ROOT}/${RUNFILES_DIR}"
+ fi
+fi
+
readonly profdata_file=$COVERAGE_DIR/coverage.profdata
-"$RUNFILES_DIR/$TEST_WORKSPACE/$RUST_LLVM_PROFDATA" \
+"$RUNFILES_DIR/$RUST_LLVM_PROFDATA" \
merge \
--sparse "$COVERAGE_DIR"/*.profraw \
-output "$profdata_file"
-"$RUNFILES_DIR/$TEST_WORKSPACE/$RUST_LLVM_COV" \
+"$RUNFILES_DIR/$RUST_LLVM_COV" \
export \
-format=lcov \
-instr-profile "$profdata_file" \
@@ -22,4 +28,7 @@
-path-equivalence=.,"$ROOT" \
"$RUNFILES_DIR/$TEST_WORKSPACE/$TEST_BINARY" \
@"$COVERAGE_MANIFEST" \
- | sed 's#/proc/self/cwd/##' > "$COVERAGE_OUTPUT_FILE"
+ | sed 's#/proc/self/cwd/##' > "$COVERAGE_DIR/rust_coverage.dat"
+
+# Bazel doesn't support LLVM profdata coverage amongst other coverage formats.
+rm "$profdata_file"
diff --git a/util/fetch_shas.sh b/util/fetch_shas.sh
index 50fe137..91408fd 100755
--- a/util/fetch_shas.sh
+++ b/util/fetch_shas.sh
@@ -88,7 +88,7 @@
echo "}"
}
-export TMPDIR="$(mktemp -d -t bazel_reload_shas_shalists)"
+export TMPDIR="$(mktemp -d -t bazel_reload_shas_shalists.XXXXXXXXXX)"
echo "Fetching known shas..."
echo "$(emit_bzl_file_contents $(enumerate_keys))" > "${BUILD_WORKSPACE_DIRECTORY}/rust/known_shas.bzl"
echo "Done"
diff --git a/util/fetch_shas_NIGHTLY_ISO_DATES.txt b/util/fetch_shas_NIGHTLY_ISO_DATES.txt
index ce46ada..e5f77a2 100644
--- a/util/fetch_shas_NIGHTLY_ISO_DATES.txt
+++ b/util/fetch_shas_NIGHTLY_ISO_DATES.txt
@@ -16,3 +16,14 @@
2022-05-19
2022-06-30
2022-07-18
+2022-08-11
+2022-09-21
+2022-11-02
+2022-12-15
+2023-01-11
+2023-01-26
+2023-02-10
+2023-03-09
+2023-03-23
+2023-04-20
+2023-06-01
diff --git a/util/fetch_shas_TARGETS.txt b/util/fetch_shas_TARGETS.txt
index e5bacb4..81acd7a 100644
--- a/util/fetch_shas_TARGETS.txt
+++ b/util/fetch_shas_TARGETS.txt
@@ -1,10 +1,91 @@
aarch64-apple-darwin
+aarch64-apple-ios
+aarch64-apple-ios-sim
+aarch64-fuchsia
+aarch64-linux-android
+aarch64-pc-windows-msvc
+aarch64-unknown-fuchsia
aarch64-unknown-linux-gnu
aarch64-unknown-linux-musl
+aarch64-unknown-none
+aarch64-unknown-none-softfloat
+aarch64-unknown-uefi
+arm-linux-androideabi
+arm-unknown-linux-gnueabi
+arm-unknown-linux-gnueabihf
+arm-unknown-linux-musleabi
+arm-unknown-linux-musleabihf
+armebv7r-none-eabi
+armebv7r-none-eabihf
+armv5te-unknown-linux-gnueabi
+armv5te-unknown-linux-musleabi
+armv7-linux-androideabi
+armv7-unknown-linux-gnueabi
+armv7-unknown-linux-gnueabihf
+armv7-unknown-linux-musleabi
+armv7-unknown-linux-musleabihf
+armv7a-none-eabi
+armv7r-none-eabi
+armv7r-none-eabihf
+asmjs-unknown-emscripten
+i586-pc-windows-msvc
+i586-unknown-linux-gnu
+i586-unknown-linux-musl
+i686-linux-android
+i686-pc-windows-gnu
+i686-pc-windows-msvc
+i686-unknown-freebsd
+i686-unknown-linux-gnu
+i686-unknown-linux-musl
+i686-unknown-uefi
+mips-unknown-linux-gnu
+mips-unknown-linux-musl
+mips64-unknown-linux-gnuabi64
+mips64-unknown-linux-muslabi64
+mips64el-unknown-linux-gnuabi64
+mips64el-unknown-linux-muslabi64
+mipsel-unknown-linux-gnu
+mipsel-unknown-linux-musl
+nvptx64-nvidia-cuda
+powerpc-unknown-linux-gnu
+powerpc64-unknown-linux-gnu
+powerpc64le-unknown-linux-gnu
+riscv32i-unknown-none-elf
+riscv32imac-unknown-none-elf
+riscv32imc-unknown-none-elf
+riscv64gc-unknown-linux-gnu
+riscv64gc-unknown-none-elf
+riscv64imac-unknown-none-elf
+s390x-unknown-linux-gnu
+sparc64-unknown-linux-gnu
+sparcv9-sun-solaris
+thumbv6m-none-eabi
+thumbv7em-none-eabi
+thumbv7em-none-eabihf
+thumbv7m-none-eabi
+thumbv7neon-linux-androideabi
+thumbv7neon-unknown-linux-gnueabihf
+thumbv8m.base-none-eabi
+thumbv8m.main-none-eabi
+thumbv8m.main-none-eabihf
+wasm32-unknown-emscripten
wasm32-unknown-unknown
wasm32-wasi
x86_64-apple-darwin
+x86_64-apple-ios
+x86_64-fortanix-unknown-sgx
+x86_64-fuchsia
+x86_64-linux-android
+x86_64-pc-solaris
+x86_64-pc-windows-gnu
x86_64-pc-windows-msvc
x86_64-unknown-freebsd
+x86_64-unknown-fuchsia
+x86_64-unknown-illumos
x86_64-unknown-linux-gnu
+x86_64-unknown-linux-gnux32
x86_64-unknown-linux-musl
+x86_64-unknown-netbsd
+x86_64-unknown-none
+x86_64-unknown-redox
+x86_64-unknown-uefi
diff --git a/util/fetch_shas_VERSIONS.txt b/util/fetch_shas_VERSIONS.txt
index 26ef26d..2879094 100644
--- a/util/fetch_shas_VERSIONS.txt
+++ b/util/fetch_shas_VERSIONS.txt
@@ -47,3 +47,15 @@
1.61.0
1.62.0
1.62.1
+1.63.0
+1.64.0
+1.65.0
+1.66.0
+1.66.1
+1.67.0
+1.67.1
+1.68.0
+1.68.1
+1.68.2
+1.69.0
+1.70.0
diff --git a/util/import/3rdparty/BUILD.bazel b/util/import/3rdparty/BUILD.bazel
index cb29b20..cf1a1b0 100644
--- a/util/import/3rdparty/BUILD.bazel
+++ b/util/import/3rdparty/BUILD.bazel
@@ -32,9 +32,9 @@
bzl_library(
name = "bzl_lib",
- srcs = glob(["**/*.bzl"]) + [
- "//util/import/3rdparty/crates:defs.bzl",
+ srcs = [
"//util/import/3rdparty/crates:crates.bzl",
+ "//util/import/3rdparty/crates:defs.bzl",
],
visibility = ["//util/import:__pkg__"],
)
diff --git a/util/import/3rdparty/Cargo.Bazel.lock b/util/import/3rdparty/Cargo.Bazel.lock
index 102e136..86c3023 100644
--- a/util/import/3rdparty/Cargo.Bazel.lock
+++ b/util/import/3rdparty/Cargo.Bazel.lock
@@ -41,9 +41,9 @@
[[package]]
name = "getrandom"
-version = "0.2.7"
+version = "0.2.8"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "4eb1a864a501629691edf6c15a593b7a51eebaa1e8468e9ddc623de7c9b58ec6"
+checksum = "c05aeb6a22b8f62540c194aac980f2115af067bfe15a0734d7277a768d396b31"
dependencies = [
"cfg-if",
"libc",
@@ -58,9 +58,9 @@
[[package]]
name = "libc"
-version = "0.2.126"
+version = "0.2.139"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "349d5a591cd28b49e1d1037471617a32ddcda5731b99419008085f72d5a53836"
+checksum = "201de327520df007757c1f0adce6e827fe8562fbc28bfd9c15571c66ca1f5f79"
[[package]]
name = "log"
@@ -117,9 +117,9 @@
[[package]]
name = "rand_core"
-version = "0.6.3"
+version = "0.6.4"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "d34f1408f55294453790c48b2f1ebbb1c5b4b7563eb1f418bcfcfdbb06ebb4e7"
+checksum = "ec0be4795e2f6a28069bec0b5ff3e2ac9bafc99e6a9a7dc3547996c5c816922c"
dependencies = [
"getrandom",
]
@@ -137,9 +137,9 @@
[[package]]
name = "regex-syntax"
-version = "0.6.27"
+version = "0.6.28"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "a3f87b73ce11b1619a3c6332f45341e0047173771e8b8b73f87bfeefb7b56244"
+checksum = "456c603be3e8d448b072f410900c09faf164fbce2d480456f50eea6e25f9c848"
[[package]]
name = "syn"
@@ -154,9 +154,9 @@
[[package]]
name = "unicode-xid"
-version = "0.2.3"
+version = "0.2.4"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "957e51f3646910546462e67d5f7599b9e4fb8acdd304b087a6494730f9eebf04"
+checksum = "f962df74c8c05a667b5ee8bcf162993134c104e96440b663c8daa176dc772d8c"
[[package]]
name = "wasi"
diff --git a/util/import/3rdparty/crates/BUILD.aho-corasick-0.7.15.bazel b/util/import/3rdparty/crates/BUILD.aho-corasick-0.7.15.bazel
index e502cde..d9067e6 100644
--- a/util/import/3rdparty/crates/BUILD.aho-corasick-0.7.15.bazel
+++ b/util/import/3rdparty/crates/BUILD.aho-corasick-0.7.15.bazel
@@ -3,20 +3,10 @@
# DO NOT MODIFY: This file is auto-generated by a crate_universe tool. To
# regenerate this file, run the following:
#
-# bazel run //util/import/3rdparty:crates_vendor
+# bazel run @//util/import/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(
- "@rules_rust//rust:defs.bzl",
- "rust_library",
-)
+load("@rules_rust//rust:defs.bzl", "rust_library")
package(default_visibility = ["//visibility:public"])
@@ -26,68 +16,68 @@
rust_library(
name = "aho_corasick",
- srcs = glob(
- include = [
- "**/*.rs",
- ],
- exclude = [
- ],
- ),
- aliases = selects.with_or({
- "//conditions:default": {
- },
- }),
+ srcs = glob(["**/*.rs"]),
compile_data = glob(
include = ["**"],
exclude = [
+ "**/* *",
+ ".tmp_git_root/**/*",
"BUILD",
"BUILD.bazel",
"WORKSPACE",
"WORKSPACE.bazel",
],
- ) + select_with_or({
- "//conditions:default": [
- ],
- }),
+ ),
crate_features = [
"default",
"std",
],
crate_root = "src/lib.rs",
- data = select_with_or({
- "//conditions:default": [
- ],
- }),
edition = "2015",
- proc_macro_deps = [
- ] + select_with_or({
- "//conditions:default": [
- ],
- }),
- rustc_env = {
- },
- rustc_env_files = select_with_or({
- "//conditions:default": [
- ],
- }),
- rustc_flags = [
- # In most cases, warnings in 3rd party crates are not interesting as
- # they're out of the control of consumers. The flag here silences
- # warnings. For more details see:
- # https://doc.rust-lang.org/rustc/lints/levels.html
- "--cap-lints=allow",
- ],
+ rustc_flags = ["--cap-lints=allow"],
tags = [
"cargo-bazel",
+ "crate-name=aho-corasick",
"manual",
"noclippy",
"norustfmt",
],
+ target_compatible_with = select({
+ "@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-fuchsia": [],
+ "@rules_rust//rust/platform:aarch64-linux-android": [],
+ "@rules_rust//rust/platform:aarch64-pc-windows-msvc": [],
+ "@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-pc-windows-msvc": [],
+ "@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:riscv32imc-unknown-none-elf": [],
+ "@rules_rust//rust/platform:riscv64gc-unknown-none-elf": [],
+ "@rules_rust//rust/platform:s390x-unknown-linux-gnu": [],
+ "@rules_rust//rust/platform:thumbv7em-none-eabi": [],
+ "@rules_rust//rust/platform:thumbv8m.main-none-eabi": [],
+ "@rules_rust//rust/platform:wasm32-unknown-unknown": [],
+ "@rules_rust//rust/platform:wasm32-wasi": [],
+ "@rules_rust//rust/platform:x86_64-apple-darwin": [],
+ "@rules_rust//rust/platform:x86_64-apple-ios": [],
+ "@rules_rust//rust/platform:x86_64-fuchsia": [],
+ "@rules_rust//rust/platform:x86_64-linux-android": [],
+ "@rules_rust//rust/platform:x86_64-pc-windows-msvc": [],
+ "@rules_rust//rust/platform:x86_64-unknown-freebsd": [],
+ "@rules_rust//rust/platform:x86_64-unknown-linux-gnu": [],
+ "@rules_rust//rust/platform:x86_64-unknown-none": [],
+ "//conditions:default": ["@platforms//:incompatible"],
+ }),
version = "0.7.15",
deps = [
- ] + select_with_or({
- "//conditions:default": [
- "@rules_rust_util_import__memchr-2.5.0//:memchr",
- ],
- }),
+ "@rules_rust_util_import__memchr-2.5.0//:memchr",
+ ],
)
diff --git a/util/import/3rdparty/crates/BUILD.bazel b/util/import/3rdparty/crates/BUILD.bazel
index 4674880..36d3718 100644
--- a/util/import/3rdparty/crates/BUILD.bazel
+++ b/util/import/3rdparty/crates/BUILD.bazel
@@ -3,7 +3,7 @@
# DO NOT MODIFY: This file is auto-generated by a crate_universe tool. To
# regenerate this file, run the following:
#
-# bazel run //util/import/3rdparty:crates_vendor
+# bazel run @//util/import/3rdparty:crates_vendor
###############################################################################
package(default_visibility = ["//visibility:public"])
@@ -11,11 +11,9 @@
exports_files(
[
"cargo-bazel.json",
- "defs.bzl",
"crates.bzl",
- ] + glob([
- "*.bazel",
- ]),
+ "defs.bzl",
+ ] + glob(["*.bazel"]),
)
filegroup(
@@ -62,5 +60,3 @@
actual = "@rules_rust_util_import__syn-1.0.82//:syn",
tags = ["manual"],
)
-
-# Binaries
diff --git a/util/import/3rdparty/crates/BUILD.cfg-if-1.0.0.bazel b/util/import/3rdparty/crates/BUILD.cfg-if-1.0.0.bazel
index 33352ad..7479ade 100644
--- a/util/import/3rdparty/crates/BUILD.cfg-if-1.0.0.bazel
+++ b/util/import/3rdparty/crates/BUILD.cfg-if-1.0.0.bazel
@@ -3,20 +3,10 @@
# DO NOT MODIFY: This file is auto-generated by a crate_universe tool. To
# regenerate this file, run the following:
#
-# bazel run //util/import/3rdparty:crates_vendor
+# bazel run @//util/import/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(
- "@rules_rust//rust:defs.bzl",
- "rust_library",
-)
+load("@rules_rust//rust:defs.bzl", "rust_library")
package(default_visibility = ["//visibility:public"])
@@ -26,65 +16,61 @@
rust_library(
name = "cfg_if",
- srcs = glob(
- include = [
- "**/*.rs",
- ],
- exclude = [
- ],
- ),
- aliases = selects.with_or({
- "//conditions:default": {
- },
- }),
+ srcs = glob(["**/*.rs"]),
compile_data = glob(
include = ["**"],
exclude = [
+ "**/* *",
+ ".tmp_git_root/**/*",
"BUILD",
"BUILD.bazel",
"WORKSPACE",
"WORKSPACE.bazel",
],
- ) + select_with_or({
- "//conditions:default": [
- ],
- }),
- crate_features = [
- ],
+ ),
crate_root = "src/lib.rs",
- data = select_with_or({
- "//conditions:default": [
- ],
- }),
edition = "2018",
- proc_macro_deps = [
- ] + select_with_or({
- "//conditions:default": [
- ],
- }),
- rustc_env = {
- },
- rustc_env_files = select_with_or({
- "//conditions:default": [
- ],
- }),
- rustc_flags = [
- # In most cases, warnings in 3rd party crates are not interesting as
- # they're out of the control of consumers. The flag here silences
- # warnings. For more details see:
- # https://doc.rust-lang.org/rustc/lints/levels.html
- "--cap-lints=allow",
- ],
+ rustc_flags = ["--cap-lints=allow"],
tags = [
"cargo-bazel",
+ "crate-name=cfg-if",
"manual",
"noclippy",
"norustfmt",
],
- version = "1.0.0",
- deps = [
- ] + select_with_or({
- "//conditions:default": [
- ],
+ target_compatible_with = select({
+ "@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-fuchsia": [],
+ "@rules_rust//rust/platform:aarch64-linux-android": [],
+ "@rules_rust//rust/platform:aarch64-pc-windows-msvc": [],
+ "@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-pc-windows-msvc": [],
+ "@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:riscv32imc-unknown-none-elf": [],
+ "@rules_rust//rust/platform:riscv64gc-unknown-none-elf": [],
+ "@rules_rust//rust/platform:s390x-unknown-linux-gnu": [],
+ "@rules_rust//rust/platform:thumbv7em-none-eabi": [],
+ "@rules_rust//rust/platform:thumbv8m.main-none-eabi": [],
+ "@rules_rust//rust/platform:wasm32-unknown-unknown": [],
+ "@rules_rust//rust/platform:wasm32-wasi": [],
+ "@rules_rust//rust/platform:x86_64-apple-darwin": [],
+ "@rules_rust//rust/platform:x86_64-apple-ios": [],
+ "@rules_rust//rust/platform:x86_64-fuchsia": [],
+ "@rules_rust//rust/platform:x86_64-linux-android": [],
+ "@rules_rust//rust/platform:x86_64-pc-windows-msvc": [],
+ "@rules_rust//rust/platform:x86_64-unknown-freebsd": [],
+ "@rules_rust//rust/platform:x86_64-unknown-linux-gnu": [],
+ "@rules_rust//rust/platform:x86_64-unknown-none": [],
+ "//conditions:default": ["@platforms//:incompatible"],
}),
+ version = "1.0.0",
)
diff --git a/util/import/3rdparty/crates/BUILD.env_logger-0.8.4.bazel b/util/import/3rdparty/crates/BUILD.env_logger-0.8.4.bazel
index 4bab83f..f94e8a3 100644
--- a/util/import/3rdparty/crates/BUILD.env_logger-0.8.4.bazel
+++ b/util/import/3rdparty/crates/BUILD.env_logger-0.8.4.bazel
@@ -3,20 +3,10 @@
# DO NOT MODIFY: This file is auto-generated by a crate_universe tool. To
# regenerate this file, run the following:
#
-# bazel run //util/import/3rdparty:crates_vendor
+# bazel run @//util/import/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(
- "@rules_rust//rust:defs.bzl",
- "rust_library",
-)
+load("@rules_rust//rust:defs.bzl", "rust_library")
package(default_visibility = ["//visibility:public"])
@@ -26,68 +16,68 @@
rust_library(
name = "env_logger",
- srcs = glob(
- include = [
- "**/*.rs",
- ],
- exclude = [
- ],
- ),
- aliases = selects.with_or({
- "//conditions:default": {
- },
- }),
+ srcs = glob(["**/*.rs"]),
compile_data = glob(
include = ["**"],
exclude = [
+ "**/* *",
+ ".tmp_git_root/**/*",
"BUILD",
"BUILD.bazel",
"WORKSPACE",
"WORKSPACE.bazel",
],
- ) + select_with_or({
- "//conditions:default": [
- ],
- }),
+ ),
crate_features = [
"regex",
],
crate_root = "src/lib.rs",
- data = select_with_or({
- "//conditions:default": [
- ],
- }),
edition = "2018",
- proc_macro_deps = [
- ] + select_with_or({
- "//conditions:default": [
- ],
- }),
- rustc_env = {
- },
- rustc_env_files = select_with_or({
- "//conditions:default": [
- ],
- }),
- rustc_flags = [
- # In most cases, warnings in 3rd party crates are not interesting as
- # they're out of the control of consumers. The flag here silences
- # warnings. For more details see:
- # https://doc.rust-lang.org/rustc/lints/levels.html
- "--cap-lints=allow",
- ],
+ rustc_flags = ["--cap-lints=allow"],
tags = [
"cargo-bazel",
+ "crate-name=env_logger",
"manual",
"noclippy",
"norustfmt",
],
+ target_compatible_with = select({
+ "@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-fuchsia": [],
+ "@rules_rust//rust/platform:aarch64-linux-android": [],
+ "@rules_rust//rust/platform:aarch64-pc-windows-msvc": [],
+ "@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-pc-windows-msvc": [],
+ "@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:riscv32imc-unknown-none-elf": [],
+ "@rules_rust//rust/platform:riscv64gc-unknown-none-elf": [],
+ "@rules_rust//rust/platform:s390x-unknown-linux-gnu": [],
+ "@rules_rust//rust/platform:thumbv7em-none-eabi": [],
+ "@rules_rust//rust/platform:thumbv8m.main-none-eabi": [],
+ "@rules_rust//rust/platform:wasm32-unknown-unknown": [],
+ "@rules_rust//rust/platform:wasm32-wasi": [],
+ "@rules_rust//rust/platform:x86_64-apple-darwin": [],
+ "@rules_rust//rust/platform:x86_64-apple-ios": [],
+ "@rules_rust//rust/platform:x86_64-fuchsia": [],
+ "@rules_rust//rust/platform:x86_64-linux-android": [],
+ "@rules_rust//rust/platform:x86_64-pc-windows-msvc": [],
+ "@rules_rust//rust/platform:x86_64-unknown-freebsd": [],
+ "@rules_rust//rust/platform:x86_64-unknown-linux-gnu": [],
+ "@rules_rust//rust/platform:x86_64-unknown-none": [],
+ "//conditions:default": ["@platforms//:incompatible"],
+ }),
version = "0.8.4",
deps = [
- ] + select_with_or({
- "//conditions:default": [
- "@rules_rust_util_import__log-0.4.17//:log",
- "@rules_rust_util_import__regex-1.4.6//:regex",
- ],
- }),
+ "@rules_rust_util_import__log-0.4.17//:log",
+ "@rules_rust_util_import__regex-1.4.6//:regex",
+ ],
)
diff --git a/util/import/3rdparty/crates/BUILD.getrandom-0.2.7.bazel b/util/import/3rdparty/crates/BUILD.getrandom-0.2.7.bazel
deleted file mode 100644
index 533dc8c..0000000
--- a/util/import/3rdparty/crates/BUILD.getrandom-0.2.7.bazel
+++ /dev/null
@@ -1,129 +0,0 @@
-###############################################################################
-# @generated
-# DO NOT MODIFY: This file is auto-generated by a crate_universe tool. To
-# regenerate this file, run the following:
-#
-# bazel run //util/import/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(
- "@rules_rust//rust:defs.bzl",
- "rust_library",
-)
-
-package(default_visibility = ["//visibility:public"])
-
-# licenses([
-# "TODO", # MIT OR Apache-2.0
-# ])
-
-rust_library(
- name = "getrandom",
- srcs = glob(
- include = [
- "**/*.rs",
- ],
- exclude = [
- ],
- ),
- aliases = selects.with_or({
- "//conditions:default": {
- },
- }),
- compile_data = glob(
- include = ["**"],
- exclude = [
- "BUILD",
- "BUILD.bazel",
- "WORKSPACE",
- "WORKSPACE.bazel",
- ],
- ) + select_with_or({
- "//conditions:default": [
- ],
- }),
- crate_features = [
- ],
- crate_root = "src/lib.rs",
- data = select_with_or({
- "//conditions:default": [
- ],
- }),
- edition = "2018",
- proc_macro_deps = [
- ] + select_with_or({
- "//conditions:default": [
- ],
- }),
- rustc_env = {
- },
- rustc_env_files = select_with_or({
- "//conditions:default": [
- ],
- }),
- rustc_flags = [
- # In most cases, warnings in 3rd party crates are not interesting as
- # they're out of the control of consumers. The flag here silences
- # warnings. For more details see:
- # https://doc.rust-lang.org/rustc/lints/levels.html
- "--cap-lints=allow",
- ],
- tags = [
- "cargo-bazel",
- "manual",
- "noclippy",
- "norustfmt",
- ],
- version = "0.2.7",
- deps = [
- ] + select_with_or({
- # cfg(target_os = "wasi")
- (
- "@rules_rust//rust/platform:wasm32-wasi",
- ): [
- # Target Deps
- "@rules_rust_util_import__wasi-0.11.0-wasi-snapshot-preview1//:wasi",
-
- # Common Deps
- "@rules_rust_util_import__cfg-if-1.0.0//:cfg_if",
- ],
- # 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_util_import__libc-0.2.126//:libc",
-
- # Common Deps
- "@rules_rust_util_import__cfg-if-1.0.0//:cfg_if",
- ],
- "//conditions:default": [
- "@rules_rust_util_import__cfg-if-1.0.0//:cfg_if",
- ],
- }),
-)
diff --git a/util/import/3rdparty/crates/BUILD.getrandom-0.2.8.bazel b/util/import/3rdparty/crates/BUILD.getrandom-0.2.8.bazel
new file mode 100644
index 0000000..067bd49
--- /dev/null
+++ b/util/import/3rdparty/crates/BUILD.getrandom-0.2.8.bazel
@@ -0,0 +1,147 @@
+###############################################################################
+# @generated
+# DO NOT MODIFY: This file is auto-generated by a crate_universe tool. To
+# regenerate this file, run the following:
+#
+# bazel run @//util/import/3rdparty:crates_vendor
+###############################################################################
+
+load("@rules_rust//rust:defs.bzl", "rust_library")
+
+package(default_visibility = ["//visibility:public"])
+
+# licenses([
+# "TODO", # MIT OR Apache-2.0
+# ])
+
+rust_library(
+ name = "getrandom",
+ srcs = glob(["**/*.rs"]),
+ compile_data = glob(
+ include = ["**"],
+ exclude = [
+ "**/* *",
+ ".tmp_git_root/**/*",
+ "BUILD",
+ "BUILD.bazel",
+ "WORKSPACE",
+ "WORKSPACE.bazel",
+ ],
+ ),
+ crate_root = "src/lib.rs",
+ edition = "2018",
+ rustc_flags = ["--cap-lints=allow"],
+ tags = [
+ "cargo-bazel",
+ "crate-name=getrandom",
+ "manual",
+ "noclippy",
+ "norustfmt",
+ ],
+ target_compatible_with = select({
+ "@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-fuchsia": [],
+ "@rules_rust//rust/platform:aarch64-linux-android": [],
+ "@rules_rust//rust/platform:aarch64-pc-windows-msvc": [],
+ "@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-pc-windows-msvc": [],
+ "@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:riscv32imc-unknown-none-elf": [],
+ "@rules_rust//rust/platform:riscv64gc-unknown-none-elf": [],
+ "@rules_rust//rust/platform:s390x-unknown-linux-gnu": [],
+ "@rules_rust//rust/platform:thumbv7em-none-eabi": [],
+ "@rules_rust//rust/platform:thumbv8m.main-none-eabi": [],
+ "@rules_rust//rust/platform:wasm32-unknown-unknown": [],
+ "@rules_rust//rust/platform:wasm32-wasi": [],
+ "@rules_rust//rust/platform:x86_64-apple-darwin": [],
+ "@rules_rust//rust/platform:x86_64-apple-ios": [],
+ "@rules_rust//rust/platform:x86_64-fuchsia": [],
+ "@rules_rust//rust/platform:x86_64-linux-android": [],
+ "@rules_rust//rust/platform:x86_64-pc-windows-msvc": [],
+ "@rules_rust//rust/platform:x86_64-unknown-freebsd": [],
+ "@rules_rust//rust/platform:x86_64-unknown-linux-gnu": [],
+ "@rules_rust//rust/platform:x86_64-unknown-none": [],
+ "//conditions:default": ["@platforms//:incompatible"],
+ }),
+ version = "0.2.8",
+ deps = [
+ "@rules_rust_util_import__cfg-if-1.0.0//:cfg_if",
+ ] + select({
+ "@rules_rust//rust/platform:aarch64-apple-darwin": [
+ "@rules_rust_util_import__libc-0.2.139//:libc", # cfg(unix)
+ ],
+ "@rules_rust//rust/platform:aarch64-apple-ios": [
+ "@rules_rust_util_import__libc-0.2.139//:libc", # cfg(unix)
+ ],
+ "@rules_rust//rust/platform:aarch64-apple-ios-sim": [
+ "@rules_rust_util_import__libc-0.2.139//:libc", # cfg(unix)
+ ],
+ "@rules_rust//rust/platform:aarch64-fuchsia": [
+ "@rules_rust_util_import__libc-0.2.139//:libc", # cfg(unix)
+ ],
+ "@rules_rust//rust/platform:aarch64-linux-android": [
+ "@rules_rust_util_import__libc-0.2.139//:libc", # cfg(unix)
+ ],
+ "@rules_rust//rust/platform:aarch64-unknown-linux-gnu": [
+ "@rules_rust_util_import__libc-0.2.139//:libc", # cfg(unix)
+ ],
+ "@rules_rust//rust/platform:arm-unknown-linux-gnueabi": [
+ "@rules_rust_util_import__libc-0.2.139//:libc", # cfg(unix)
+ ],
+ "@rules_rust//rust/platform:armv7-linux-androideabi": [
+ "@rules_rust_util_import__libc-0.2.139//:libc", # cfg(unix)
+ ],
+ "@rules_rust//rust/platform:armv7-unknown-linux-gnueabi": [
+ "@rules_rust_util_import__libc-0.2.139//:libc", # cfg(unix)
+ ],
+ "@rules_rust//rust/platform:i686-apple-darwin": [
+ "@rules_rust_util_import__libc-0.2.139//:libc", # cfg(unix)
+ ],
+ "@rules_rust//rust/platform:i686-linux-android": [
+ "@rules_rust_util_import__libc-0.2.139//:libc", # cfg(unix)
+ ],
+ "@rules_rust//rust/platform:i686-unknown-freebsd": [
+ "@rules_rust_util_import__libc-0.2.139//:libc", # cfg(unix)
+ ],
+ "@rules_rust//rust/platform:i686-unknown-linux-gnu": [
+ "@rules_rust_util_import__libc-0.2.139//:libc", # cfg(unix)
+ ],
+ "@rules_rust//rust/platform:powerpc-unknown-linux-gnu": [
+ "@rules_rust_util_import__libc-0.2.139//:libc", # cfg(unix)
+ ],
+ "@rules_rust//rust/platform:s390x-unknown-linux-gnu": [
+ "@rules_rust_util_import__libc-0.2.139//:libc", # cfg(unix)
+ ],
+ "@rules_rust//rust/platform:wasm32-wasi": [
+ "@rules_rust_util_import__wasi-0.11.0-wasi-snapshot-preview1//:wasi", # cfg(target_os = "wasi")
+ ],
+ "@rules_rust//rust/platform:x86_64-apple-darwin": [
+ "@rules_rust_util_import__libc-0.2.139//:libc", # cfg(unix)
+ ],
+ "@rules_rust//rust/platform:x86_64-apple-ios": [
+ "@rules_rust_util_import__libc-0.2.139//:libc", # cfg(unix)
+ ],
+ "@rules_rust//rust/platform:x86_64-fuchsia": [
+ "@rules_rust_util_import__libc-0.2.139//:libc", # cfg(unix)
+ ],
+ "@rules_rust//rust/platform:x86_64-linux-android": [
+ "@rules_rust_util_import__libc-0.2.139//:libc", # cfg(unix)
+ ],
+ "@rules_rust//rust/platform:x86_64-unknown-freebsd": [
+ "@rules_rust_util_import__libc-0.2.139//:libc", # cfg(unix)
+ ],
+ "@rules_rust//rust/platform:x86_64-unknown-linux-gnu": [
+ "@rules_rust_util_import__libc-0.2.139//:libc", # cfg(unix)
+ ],
+ "//conditions:default": [],
+ }),
+)
diff --git a/util/import/3rdparty/crates/BUILD.lazy_static-1.4.0.bazel b/util/import/3rdparty/crates/BUILD.lazy_static-1.4.0.bazel
index 9c7761e..1dd6f33 100644
--- a/util/import/3rdparty/crates/BUILD.lazy_static-1.4.0.bazel
+++ b/util/import/3rdparty/crates/BUILD.lazy_static-1.4.0.bazel
@@ -3,20 +3,10 @@
# DO NOT MODIFY: This file is auto-generated by a crate_universe tool. To
# regenerate this file, run the following:
#
-# bazel run //util/import/3rdparty:crates_vendor
+# bazel run @//util/import/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(
- "@rules_rust//rust:defs.bzl",
- "rust_library",
-)
+load("@rules_rust//rust:defs.bzl", "rust_library")
package(default_visibility = ["//visibility:public"])
@@ -26,65 +16,61 @@
rust_library(
name = "lazy_static",
- srcs = glob(
- include = [
- "**/*.rs",
- ],
- exclude = [
- ],
- ),
- aliases = selects.with_or({
- "//conditions:default": {
- },
- }),
+ srcs = glob(["**/*.rs"]),
compile_data = glob(
include = ["**"],
exclude = [
+ "**/* *",
+ ".tmp_git_root/**/*",
"BUILD",
"BUILD.bazel",
"WORKSPACE",
"WORKSPACE.bazel",
],
- ) + select_with_or({
- "//conditions:default": [
- ],
- }),
- crate_features = [
- ],
+ ),
crate_root = "src/lib.rs",
- data = select_with_or({
- "//conditions:default": [
- ],
- }),
edition = "2015",
- proc_macro_deps = [
- ] + select_with_or({
- "//conditions:default": [
- ],
- }),
- rustc_env = {
- },
- rustc_env_files = select_with_or({
- "//conditions:default": [
- ],
- }),
- rustc_flags = [
- # In most cases, warnings in 3rd party crates are not interesting as
- # they're out of the control of consumers. The flag here silences
- # warnings. For more details see:
- # https://doc.rust-lang.org/rustc/lints/levels.html
- "--cap-lints=allow",
- ],
+ rustc_flags = ["--cap-lints=allow"],
tags = [
"cargo-bazel",
+ "crate-name=lazy_static",
"manual",
"noclippy",
"norustfmt",
],
- version = "1.4.0",
- deps = [
- ] + select_with_or({
- "//conditions:default": [
- ],
+ target_compatible_with = select({
+ "@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-fuchsia": [],
+ "@rules_rust//rust/platform:aarch64-linux-android": [],
+ "@rules_rust//rust/platform:aarch64-pc-windows-msvc": [],
+ "@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-pc-windows-msvc": [],
+ "@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:riscv32imc-unknown-none-elf": [],
+ "@rules_rust//rust/platform:riscv64gc-unknown-none-elf": [],
+ "@rules_rust//rust/platform:s390x-unknown-linux-gnu": [],
+ "@rules_rust//rust/platform:thumbv7em-none-eabi": [],
+ "@rules_rust//rust/platform:thumbv8m.main-none-eabi": [],
+ "@rules_rust//rust/platform:wasm32-unknown-unknown": [],
+ "@rules_rust//rust/platform:wasm32-wasi": [],
+ "@rules_rust//rust/platform:x86_64-apple-darwin": [],
+ "@rules_rust//rust/platform:x86_64-apple-ios": [],
+ "@rules_rust//rust/platform:x86_64-fuchsia": [],
+ "@rules_rust//rust/platform:x86_64-linux-android": [],
+ "@rules_rust//rust/platform:x86_64-pc-windows-msvc": [],
+ "@rules_rust//rust/platform:x86_64-unknown-freebsd": [],
+ "@rules_rust//rust/platform:x86_64-unknown-linux-gnu": [],
+ "@rules_rust//rust/platform:x86_64-unknown-none": [],
+ "//conditions:default": ["@platforms//:incompatible"],
}),
+ version = "1.4.0",
)
diff --git a/util/import/3rdparty/crates/BUILD.libc-0.2.126.bazel b/util/import/3rdparty/crates/BUILD.libc-0.2.126.bazel
deleted file mode 100644
index 723908e..0000000
--- a/util/import/3rdparty/crates/BUILD.libc-0.2.126.bazel
+++ /dev/null
@@ -1,174 +0,0 @@
-###############################################################################
-# @generated
-# DO NOT MODIFY: This file is auto-generated by a crate_universe tool. To
-# regenerate this file, run the following:
-#
-# bazel run //util/import/3rdparty:crates_vendor
-###############################################################################
-
-load(
- "@bazel_skylib//lib:selects.bzl",
- "selects",
-)
-load(
- "@rules_rust//cargo:defs.bzl",
- "cargo_build_script",
-)
-
-# buildifier: disable=bzl-visibility
-load("@rules_rust//crate_universe/private:selects.bzl", "select_with_or")
-load(
- "@rules_rust//rust:defs.bzl",
- "rust_library",
-)
-
-package(default_visibility = ["//visibility:public"])
-
-# licenses([
-# "TODO", # MIT OR Apache-2.0
-# ])
-
-rust_library(
- name = "libc",
- srcs = glob(
- include = [
- "**/*.rs",
- ],
- exclude = [
- ],
- ),
- aliases = selects.with_or({
- "//conditions:default": {
- },
- }),
- compile_data = glob(
- include = ["**"],
- exclude = [
- "BUILD",
- "BUILD.bazel",
- "WORKSPACE",
- "WORKSPACE.bazel",
- ],
- ) + select_with_or({
- "//conditions:default": [
- ],
- }),
- crate_features = [
- ],
- crate_root = "src/lib.rs",
- data = select_with_or({
- "//conditions:default": [
- ],
- }),
- edition = "2015",
- proc_macro_deps = [
- ] + select_with_or({
- "//conditions:default": [
- ],
- }),
- rustc_env = {
- },
- rustc_env_files = select_with_or({
- "//conditions:default": [
- ],
- }),
- rustc_flags = [
- # In most cases, warnings in 3rd party crates are not interesting as
- # they're out of the control of consumers. The flag here silences
- # warnings. For more details see:
- # https://doc.rust-lang.org/rustc/lints/levels.html
- "--cap-lints=allow",
- ],
- tags = [
- "cargo-bazel",
- "manual",
- "noclippy",
- "norustfmt",
- ],
- version = "0.2.126",
- deps = [
- ] + select_with_or({
- "//conditions:default": [
- "@rules_rust_util_import__libc-0.2.126//:build_script_build",
- ],
- }),
-)
-
-cargo_build_script(
- # See comment associated with alias. Do not change this name
- name = "libc_build_script",
- srcs = glob(
- include = [
- "**/*.rs",
- ],
- exclude = [
- ],
- ),
- aliases = selects.with_or({
- "//conditions:default": {
- },
- }),
- build_script_env = {
- },
- compile_data = select_with_or({
- "//conditions:default": [
- ],
- }),
- crate_features = [
- ],
- crate_name = "build_script_build",
- crate_root = "build.rs",
- data = glob(["**"]) + select_with_or({
- "//conditions:default": [
- ],
- }),
- edition = "2015",
- proc_macro_deps = [
- ] + select_with_or({
- "//conditions:default": [
- ],
- }),
- rustc_env = {
- },
- rustc_env_files = select_with_or({
- "//conditions:default": [
- ],
- }),
- rustc_flags = [
- # In most cases, warnings in 3rd party crates are not interesting as
- # they're out of the control of consumers. The flag here silences
- # warnings. For more details see:
- # https://doc.rust-lang.org/rustc/lints/levels.html
- "--cap-lints=allow",
- ],
- tags = [
- "cargo-bazel",
- "manual",
- "noclippy",
- "norustfmt",
- ],
- tools = select_with_or({
- "//conditions:default": [
- ],
- }),
- version = "0.2.126",
- visibility = ["//visibility:private"],
- deps = [
- ] + select_with_or({
- "//conditions:default": [
- ],
- }),
-)
-
-alias(
- # Because `cargo_build_script` does some invisible target name mutating to
- # determine the package and crate name for a build script, the Bazel
- # target namename of any build script cannot be the Cargo canonical name
- # of `build_script_build` without losing out on having certain Cargo
- # environment variables set.
- name = "build_script_build",
- actual = "libc_build_script",
- tags = [
- "manual",
- ],
-)
diff --git a/util/import/3rdparty/crates/BUILD.libc-0.2.139.bazel b/util/import/3rdparty/crates/BUILD.libc-0.2.139.bazel
new file mode 100644
index 0000000..11a4f8e
--- /dev/null
+++ b/util/import/3rdparty/crates/BUILD.libc-0.2.139.bazel
@@ -0,0 +1,117 @@
+###############################################################################
+# @generated
+# DO NOT MODIFY: This file is auto-generated by a crate_universe tool. To
+# regenerate this file, run the following:
+#
+# bazel run @//util/import/3rdparty:crates_vendor
+###############################################################################
+
+load("@rules_rust//cargo:defs.bzl", "cargo_build_script")
+load("@rules_rust//rust:defs.bzl", "rust_library")
+
+package(default_visibility = ["//visibility:public"])
+
+# licenses([
+# "TODO", # MIT OR Apache-2.0
+# ])
+
+rust_library(
+ name = "libc",
+ srcs = glob(["**/*.rs"]),
+ compile_data = glob(
+ include = ["**"],
+ exclude = [
+ "**/* *",
+ ".tmp_git_root/**/*",
+ "BUILD",
+ "BUILD.bazel",
+ "WORKSPACE",
+ "WORKSPACE.bazel",
+ ],
+ ),
+ crate_root = "src/lib.rs",
+ edition = "2015",
+ rustc_flags = ["--cap-lints=allow"],
+ tags = [
+ "cargo-bazel",
+ "crate-name=libc",
+ "manual",
+ "noclippy",
+ "norustfmt",
+ ],
+ target_compatible_with = select({
+ "@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-fuchsia": [],
+ "@rules_rust//rust/platform:aarch64-linux-android": [],
+ "@rules_rust//rust/platform:aarch64-pc-windows-msvc": [],
+ "@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-pc-windows-msvc": [],
+ "@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:riscv32imc-unknown-none-elf": [],
+ "@rules_rust//rust/platform:riscv64gc-unknown-none-elf": [],
+ "@rules_rust//rust/platform:s390x-unknown-linux-gnu": [],
+ "@rules_rust//rust/platform:thumbv7em-none-eabi": [],
+ "@rules_rust//rust/platform:thumbv8m.main-none-eabi": [],
+ "@rules_rust//rust/platform:wasm32-unknown-unknown": [],
+ "@rules_rust//rust/platform:wasm32-wasi": [],
+ "@rules_rust//rust/platform:x86_64-apple-darwin": [],
+ "@rules_rust//rust/platform:x86_64-apple-ios": [],
+ "@rules_rust//rust/platform:x86_64-fuchsia": [],
+ "@rules_rust//rust/platform:x86_64-linux-android": [],
+ "@rules_rust//rust/platform:x86_64-pc-windows-msvc": [],
+ "@rules_rust//rust/platform:x86_64-unknown-freebsd": [],
+ "@rules_rust//rust/platform:x86_64-unknown-linux-gnu": [],
+ "@rules_rust//rust/platform:x86_64-unknown-none": [],
+ "//conditions:default": ["@platforms//:incompatible"],
+ }),
+ version = "0.2.139",
+ deps = [
+ "@rules_rust_util_import__libc-0.2.139//:build_script_build",
+ ],
+)
+
+cargo_build_script(
+ name = "libc_build_script",
+ srcs = glob(["**/*.rs"]),
+ crate_name = "build_script_build",
+ crate_root = "build.rs",
+ data = glob(
+ include = ["**"],
+ exclude = [
+ "**/* *",
+ ".tmp_git_root/**/*",
+ "BUILD",
+ "BUILD.bazel",
+ "WORKSPACE",
+ "WORKSPACE.bazel",
+ ],
+ ),
+ edition = "2015",
+ rustc_flags = [
+ "--cap-lints=allow",
+ ],
+ tags = [
+ "cargo-bazel",
+ "crate-name=libc",
+ "manual",
+ "noclippy",
+ "norustfmt",
+ ],
+ version = "0.2.139",
+ visibility = ["//visibility:private"],
+)
+
+alias(
+ name = "build_script_build",
+ actual = "libc_build_script",
+ tags = ["manual"],
+)
diff --git a/util/import/3rdparty/crates/BUILD.log-0.4.17.bazel b/util/import/3rdparty/crates/BUILD.log-0.4.17.bazel
index a9f2f72..fa16107 100644
--- a/util/import/3rdparty/crates/BUILD.log-0.4.17.bazel
+++ b/util/import/3rdparty/crates/BUILD.log-0.4.17.bazel
@@ -3,24 +3,11 @@
# DO NOT MODIFY: This file is auto-generated by a crate_universe tool. To
# regenerate this file, run the following:
#
-# bazel run //util/import/3rdparty:crates_vendor
+# bazel run @//util/import/3rdparty:crates_vendor
###############################################################################
-load(
- "@bazel_skylib//lib:selects.bzl",
- "selects",
-)
-load(
- "@rules_rust//cargo:defs.bzl",
- "cargo_build_script",
-)
-
-# buildifier: disable=bzl-visibility
-load("@rules_rust//crate_universe/private:selects.bzl", "select_with_or")
-load(
- "@rules_rust//rust:defs.bzl",
- "rust_library",
-)
+load("@rules_rust//cargo:defs.bzl", "cargo_build_script")
+load("@rules_rust//rust:defs.bzl", "rust_library")
package(default_visibility = ["//visibility:public"])
@@ -30,148 +17,108 @@
rust_library(
name = "log",
- srcs = glob(
- include = [
- "**/*.rs",
- ],
- exclude = [
- ],
- ),
- aliases = selects.with_or({
- "//conditions:default": {
- },
- }),
+ srcs = glob(["**/*.rs"]),
compile_data = glob(
include = ["**"],
exclude = [
+ "**/* *",
+ ".tmp_git_root/**/*",
"BUILD",
"BUILD.bazel",
"WORKSPACE",
"WORKSPACE.bazel",
],
- ) + select_with_or({
- "//conditions:default": [
- ],
- }),
+ ),
crate_features = [
"std",
],
crate_root = "src/lib.rs",
- data = select_with_or({
- "//conditions:default": [
- ],
- }),
edition = "2015",
- proc_macro_deps = [
- ] + select_with_or({
- "//conditions:default": [
- ],
- }),
- rustc_env = {
- },
- rustc_env_files = select_with_or({
- "//conditions:default": [
- ],
- }),
- rustc_flags = [
- # In most cases, warnings in 3rd party crates are not interesting as
- # they're out of the control of consumers. The flag here silences
- # warnings. For more details see:
- # https://doc.rust-lang.org/rustc/lints/levels.html
- "--cap-lints=allow",
- ],
+ rustc_flags = ["--cap-lints=allow"],
tags = [
"cargo-bazel",
+ "crate-name=log",
"manual",
"noclippy",
"norustfmt",
],
+ target_compatible_with = select({
+ "@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-fuchsia": [],
+ "@rules_rust//rust/platform:aarch64-linux-android": [],
+ "@rules_rust//rust/platform:aarch64-pc-windows-msvc": [],
+ "@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-pc-windows-msvc": [],
+ "@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:riscv32imc-unknown-none-elf": [],
+ "@rules_rust//rust/platform:riscv64gc-unknown-none-elf": [],
+ "@rules_rust//rust/platform:s390x-unknown-linux-gnu": [],
+ "@rules_rust//rust/platform:thumbv7em-none-eabi": [],
+ "@rules_rust//rust/platform:thumbv8m.main-none-eabi": [],
+ "@rules_rust//rust/platform:wasm32-unknown-unknown": [],
+ "@rules_rust//rust/platform:wasm32-wasi": [],
+ "@rules_rust//rust/platform:x86_64-apple-darwin": [],
+ "@rules_rust//rust/platform:x86_64-apple-ios": [],
+ "@rules_rust//rust/platform:x86_64-fuchsia": [],
+ "@rules_rust//rust/platform:x86_64-linux-android": [],
+ "@rules_rust//rust/platform:x86_64-pc-windows-msvc": [],
+ "@rules_rust//rust/platform:x86_64-unknown-freebsd": [],
+ "@rules_rust//rust/platform:x86_64-unknown-linux-gnu": [],
+ "@rules_rust//rust/platform:x86_64-unknown-none": [],
+ "//conditions:default": ["@platforms//:incompatible"],
+ }),
version = "0.4.17",
deps = [
- ] + select_with_or({
- "//conditions:default": [
- "@rules_rust_util_import__cfg-if-1.0.0//:cfg_if",
- "@rules_rust_util_import__log-0.4.17//:build_script_build",
- ],
- }),
+ "@rules_rust_util_import__cfg-if-1.0.0//:cfg_if",
+ "@rules_rust_util_import__log-0.4.17//:build_script_build",
+ ],
)
cargo_build_script(
- # See comment associated with alias. Do not change this name
name = "log_build_script",
- srcs = glob(
- include = [
- "**/*.rs",
- ],
- exclude = [
- ],
- ),
- aliases = selects.with_or({
- "//conditions:default": {
- },
- }),
- build_script_env = {
- },
- compile_data = select_with_or({
- "//conditions:default": [
- ],
- }),
+ srcs = glob(["**/*.rs"]),
crate_features = [
"std",
],
crate_name = "build_script_build",
crate_root = "build.rs",
- data = glob(["**"]) + select_with_or({
- "//conditions:default": [
+ data = glob(
+ include = ["**"],
+ exclude = [
+ "**/* *",
+ ".tmp_git_root/**/*",
+ "BUILD",
+ "BUILD.bazel",
+ "WORKSPACE",
+ "WORKSPACE.bazel",
],
- }),
+ ),
edition = "2015",
- proc_macro_deps = [
- ] + select_with_or({
- "//conditions:default": [
- ],
- }),
- rustc_env = {
- },
- rustc_env_files = select_with_or({
- "//conditions:default": [
- ],
- }),
rustc_flags = [
- # In most cases, warnings in 3rd party crates are not interesting as
- # they're out of the control of consumers. The flag here silences
- # warnings. For more details see:
- # https://doc.rust-lang.org/rustc/lints/levels.html
"--cap-lints=allow",
],
tags = [
"cargo-bazel",
+ "crate-name=log",
"manual",
"noclippy",
"norustfmt",
],
- tools = select_with_or({
- "//conditions:default": [
- ],
- }),
version = "0.4.17",
visibility = ["//visibility:private"],
- deps = [
- ] + select_with_or({
- "//conditions:default": [
- ],
- }),
)
alias(
- # Because `cargo_build_script` does some invisible target name mutating to
- # determine the package and crate name for a build script, the Bazel
- # target namename of any build script cannot be the Cargo canonical name
- # of `build_script_build` without losing out on having certain Cargo
- # environment variables set.
name = "build_script_build",
actual = "log_build_script",
- tags = [
- "manual",
- ],
+ tags = ["manual"],
)
diff --git a/util/import/3rdparty/crates/BUILD.memchr-2.5.0.bazel b/util/import/3rdparty/crates/BUILD.memchr-2.5.0.bazel
index 4880289..26787ce 100644
--- a/util/import/3rdparty/crates/BUILD.memchr-2.5.0.bazel
+++ b/util/import/3rdparty/crates/BUILD.memchr-2.5.0.bazel
@@ -3,24 +3,11 @@
# DO NOT MODIFY: This file is auto-generated by a crate_universe tool. To
# regenerate this file, run the following:
#
-# bazel run //util/import/3rdparty:crates_vendor
+# bazel run @//util/import/3rdparty:crates_vendor
###############################################################################
-load(
- "@bazel_skylib//lib:selects.bzl",
- "selects",
-)
-load(
- "@rules_rust//cargo:defs.bzl",
- "cargo_build_script",
-)
-
-# buildifier: disable=bzl-visibility
-load("@rules_rust//crate_universe/private:selects.bzl", "select_with_or")
-load(
- "@rules_rust//rust:defs.bzl",
- "rust_library",
-)
+load("@rules_rust//cargo:defs.bzl", "cargo_build_script")
+load("@rules_rust//rust:defs.bzl", "rust_library")
package(default_visibility = ["//visibility:public"])
@@ -30,93 +17,76 @@
rust_library(
name = "memchr",
- srcs = glob(
- include = [
- "**/*.rs",
- ],
- exclude = [
- ],
- ),
- aliases = selects.with_or({
- "//conditions:default": {
- },
- }),
+ srcs = glob(["**/*.rs"]),
compile_data = glob(
include = ["**"],
exclude = [
+ "**/* *",
+ ".tmp_git_root/**/*",
"BUILD",
"BUILD.bazel",
"WORKSPACE",
"WORKSPACE.bazel",
],
- ) + select_with_or({
- "//conditions:default": [
- ],
- }),
+ ),
crate_features = [
"default",
"std",
"use_std",
],
crate_root = "src/lib.rs",
- data = select_with_or({
- "//conditions:default": [
- ],
- }),
edition = "2018",
- proc_macro_deps = [
- ] + select_with_or({
- "//conditions:default": [
- ],
- }),
- rustc_env = {
- },
- rustc_env_files = select_with_or({
- "//conditions:default": [
- ],
- }),
- rustc_flags = [
- # In most cases, warnings in 3rd party crates are not interesting as
- # they're out of the control of consumers. The flag here silences
- # warnings. For more details see:
- # https://doc.rust-lang.org/rustc/lints/levels.html
- "--cap-lints=allow",
- ],
+ rustc_flags = ["--cap-lints=allow"],
tags = [
"cargo-bazel",
+ "crate-name=memchr",
"manual",
"noclippy",
"norustfmt",
],
+ target_compatible_with = select({
+ "@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-fuchsia": [],
+ "@rules_rust//rust/platform:aarch64-linux-android": [],
+ "@rules_rust//rust/platform:aarch64-pc-windows-msvc": [],
+ "@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-pc-windows-msvc": [],
+ "@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:riscv32imc-unknown-none-elf": [],
+ "@rules_rust//rust/platform:riscv64gc-unknown-none-elf": [],
+ "@rules_rust//rust/platform:s390x-unknown-linux-gnu": [],
+ "@rules_rust//rust/platform:thumbv7em-none-eabi": [],
+ "@rules_rust//rust/platform:thumbv8m.main-none-eabi": [],
+ "@rules_rust//rust/platform:wasm32-unknown-unknown": [],
+ "@rules_rust//rust/platform:wasm32-wasi": [],
+ "@rules_rust//rust/platform:x86_64-apple-darwin": [],
+ "@rules_rust//rust/platform:x86_64-apple-ios": [],
+ "@rules_rust//rust/platform:x86_64-fuchsia": [],
+ "@rules_rust//rust/platform:x86_64-linux-android": [],
+ "@rules_rust//rust/platform:x86_64-pc-windows-msvc": [],
+ "@rules_rust//rust/platform:x86_64-unknown-freebsd": [],
+ "@rules_rust//rust/platform:x86_64-unknown-linux-gnu": [],
+ "@rules_rust//rust/platform:x86_64-unknown-none": [],
+ "//conditions:default": ["@platforms//:incompatible"],
+ }),
version = "2.5.0",
deps = [
- ] + select_with_or({
- "//conditions:default": [
- "@rules_rust_util_import__memchr-2.5.0//:build_script_build",
- ],
- }),
+ "@rules_rust_util_import__memchr-2.5.0//:build_script_build",
+ ],
)
cargo_build_script(
- # See comment associated with alias. Do not change this name
name = "memchr_build_script",
- srcs = glob(
- include = [
- "**/*.rs",
- ],
- exclude = [
- ],
- ),
- aliases = selects.with_or({
- "//conditions:default": {
- },
- }),
- build_script_env = {
- },
- compile_data = select_with_or({
- "//conditions:default": [
- ],
- }),
+ srcs = glob(["**/*.rs"]),
crate_features = [
"default",
"std",
@@ -124,57 +94,34 @@
],
crate_name = "build_script_build",
crate_root = "build.rs",
- data = glob(["**"]) + select_with_or({
- "//conditions:default": [
+ data = glob(
+ include = ["**"],
+ exclude = [
+ "**/* *",
+ ".tmp_git_root/**/*",
+ "BUILD",
+ "BUILD.bazel",
+ "WORKSPACE",
+ "WORKSPACE.bazel",
],
- }),
+ ),
edition = "2018",
- proc_macro_deps = [
- ] + select_with_or({
- "//conditions:default": [
- ],
- }),
- rustc_env = {
- },
- rustc_env_files = select_with_or({
- "//conditions:default": [
- ],
- }),
rustc_flags = [
- # In most cases, warnings in 3rd party crates are not interesting as
- # they're out of the control of consumers. The flag here silences
- # warnings. For more details see:
- # https://doc.rust-lang.org/rustc/lints/levels.html
"--cap-lints=allow",
],
tags = [
"cargo-bazel",
+ "crate-name=memchr",
"manual",
"noclippy",
"norustfmt",
],
- tools = select_with_or({
- "//conditions:default": [
- ],
- }),
version = "2.5.0",
visibility = ["//visibility:private"],
- deps = [
- ] + select_with_or({
- "//conditions:default": [
- ],
- }),
)
alias(
- # Because `cargo_build_script` does some invisible target name mutating to
- # determine the package and crate name for a build script, the Bazel
- # target namename of any build script cannot be the Cargo canonical name
- # of `build_script_build` without losing out on having certain Cargo
- # environment variables set.
name = "build_script_build",
actual = "memchr_build_script",
- tags = [
- "manual",
- ],
+ tags = ["manual"],
)
diff --git a/util/import/3rdparty/crates/BUILD.proc-macro2-1.0.33.bazel b/util/import/3rdparty/crates/BUILD.proc-macro2-1.0.33.bazel
index 85ab9a4..0a0f7c0 100644
--- a/util/import/3rdparty/crates/BUILD.proc-macro2-1.0.33.bazel
+++ b/util/import/3rdparty/crates/BUILD.proc-macro2-1.0.33.bazel
@@ -3,24 +3,11 @@
# DO NOT MODIFY: This file is auto-generated by a crate_universe tool. To
# regenerate this file, run the following:
#
-# bazel run //util/import/3rdparty:crates_vendor
+# bazel run @//util/import/3rdparty:crates_vendor
###############################################################################
-load(
- "@bazel_skylib//lib:selects.bzl",
- "selects",
-)
-load(
- "@rules_rust//cargo:defs.bzl",
- "cargo_build_script",
-)
-
-# buildifier: disable=bzl-visibility
-load("@rules_rust//crate_universe/private:selects.bzl", "select_with_or")
-load(
- "@rules_rust//rust:defs.bzl",
- "rust_library",
-)
+load("@rules_rust//cargo:defs.bzl", "cargo_build_script")
+load("@rules_rust//rust:defs.bzl", "rust_library")
package(default_visibility = ["//visibility:public"])
@@ -30,150 +17,110 @@
rust_library(
name = "proc_macro2",
- srcs = glob(
- include = [
- "**/*.rs",
- ],
- exclude = [
- ],
- ),
- aliases = selects.with_or({
- "//conditions:default": {
- },
- }),
+ srcs = glob(["**/*.rs"]),
compile_data = glob(
include = ["**"],
exclude = [
+ "**/* *",
+ ".tmp_git_root/**/*",
"BUILD",
"BUILD.bazel",
"WORKSPACE",
"WORKSPACE.bazel",
],
- ) + select_with_or({
- "//conditions:default": [
- ],
- }),
+ ),
crate_features = [
"default",
"proc-macro",
],
crate_root = "src/lib.rs",
- data = select_with_or({
- "//conditions:default": [
- ],
- }),
edition = "2018",
- proc_macro_deps = [
- ] + select_with_or({
- "//conditions:default": [
- ],
- }),
- rustc_env = {
- },
- rustc_env_files = select_with_or({
- "//conditions:default": [
- ],
- }),
- rustc_flags = [
- # In most cases, warnings in 3rd party crates are not interesting as
- # they're out of the control of consumers. The flag here silences
- # warnings. For more details see:
- # https://doc.rust-lang.org/rustc/lints/levels.html
- "--cap-lints=allow",
- ],
+ rustc_flags = ["--cap-lints=allow"],
tags = [
"cargo-bazel",
+ "crate-name=proc-macro2",
"manual",
"noclippy",
"norustfmt",
],
+ target_compatible_with = select({
+ "@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-fuchsia": [],
+ "@rules_rust//rust/platform:aarch64-linux-android": [],
+ "@rules_rust//rust/platform:aarch64-pc-windows-msvc": [],
+ "@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-pc-windows-msvc": [],
+ "@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:riscv32imc-unknown-none-elf": [],
+ "@rules_rust//rust/platform:riscv64gc-unknown-none-elf": [],
+ "@rules_rust//rust/platform:s390x-unknown-linux-gnu": [],
+ "@rules_rust//rust/platform:thumbv7em-none-eabi": [],
+ "@rules_rust//rust/platform:thumbv8m.main-none-eabi": [],
+ "@rules_rust//rust/platform:wasm32-unknown-unknown": [],
+ "@rules_rust//rust/platform:wasm32-wasi": [],
+ "@rules_rust//rust/platform:x86_64-apple-darwin": [],
+ "@rules_rust//rust/platform:x86_64-apple-ios": [],
+ "@rules_rust//rust/platform:x86_64-fuchsia": [],
+ "@rules_rust//rust/platform:x86_64-linux-android": [],
+ "@rules_rust//rust/platform:x86_64-pc-windows-msvc": [],
+ "@rules_rust//rust/platform:x86_64-unknown-freebsd": [],
+ "@rules_rust//rust/platform:x86_64-unknown-linux-gnu": [],
+ "@rules_rust//rust/platform:x86_64-unknown-none": [],
+ "//conditions:default": ["@platforms//:incompatible"],
+ }),
version = "1.0.33",
deps = [
- ] + select_with_or({
- "//conditions:default": [
- "@rules_rust_util_import__proc-macro2-1.0.33//:build_script_build",
- "@rules_rust_util_import__unicode-xid-0.2.3//:unicode_xid",
- ],
- }),
+ "@rules_rust_util_import__proc-macro2-1.0.33//:build_script_build",
+ "@rules_rust_util_import__unicode-xid-0.2.4//:unicode_xid",
+ ],
)
cargo_build_script(
- # See comment associated with alias. Do not change this name
name = "proc-macro2_build_script",
- srcs = glob(
- include = [
- "**/*.rs",
- ],
- exclude = [
- ],
- ),
- aliases = selects.with_or({
- "//conditions:default": {
- },
- }),
- build_script_env = {
- },
- compile_data = select_with_or({
- "//conditions:default": [
- ],
- }),
+ srcs = glob(["**/*.rs"]),
crate_features = [
"default",
"proc-macro",
],
crate_name = "build_script_build",
crate_root = "build.rs",
- data = glob(["**"]) + select_with_or({
- "//conditions:default": [
+ data = glob(
+ include = ["**"],
+ exclude = [
+ "**/* *",
+ ".tmp_git_root/**/*",
+ "BUILD",
+ "BUILD.bazel",
+ "WORKSPACE",
+ "WORKSPACE.bazel",
],
- }),
+ ),
edition = "2018",
- proc_macro_deps = [
- ] + select_with_or({
- "//conditions:default": [
- ],
- }),
- rustc_env = {
- },
- rustc_env_files = select_with_or({
- "//conditions:default": [
- ],
- }),
rustc_flags = [
- # In most cases, warnings in 3rd party crates are not interesting as
- # they're out of the control of consumers. The flag here silences
- # warnings. For more details see:
- # https://doc.rust-lang.org/rustc/lints/levels.html
"--cap-lints=allow",
],
tags = [
"cargo-bazel",
+ "crate-name=proc-macro2",
"manual",
"noclippy",
"norustfmt",
],
- tools = select_with_or({
- "//conditions:default": [
- ],
- }),
version = "1.0.33",
visibility = ["//visibility:private"],
- deps = [
- ] + select_with_or({
- "//conditions:default": [
- ],
- }),
)
alias(
- # Because `cargo_build_script` does some invisible target name mutating to
- # determine the package and crate name for a build script, the Bazel
- # target namename of any build script cannot be the Cargo canonical name
- # of `build_script_build` without losing out on having certain Cargo
- # environment variables set.
name = "build_script_build",
actual = "proc-macro2_build_script",
- tags = [
- "manual",
- ],
+ tags = ["manual"],
)
diff --git a/util/import/3rdparty/crates/BUILD.quickcheck-1.0.3.bazel b/util/import/3rdparty/crates/BUILD.quickcheck-1.0.3.bazel
index d516d60..f679468 100644
--- a/util/import/3rdparty/crates/BUILD.quickcheck-1.0.3.bazel
+++ b/util/import/3rdparty/crates/BUILD.quickcheck-1.0.3.bazel
@@ -3,20 +3,10 @@
# DO NOT MODIFY: This file is auto-generated by a crate_universe tool. To
# regenerate this file, run the following:
#
-# bazel run //util/import/3rdparty:crates_vendor
+# bazel run @//util/import/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(
- "@rules_rust//rust:defs.bzl",
- "rust_library",
-)
+load("@rules_rust//rust:defs.bzl", "rust_library")
package(default_visibility = ["//visibility:public"])
@@ -26,29 +16,18 @@
rust_library(
name = "quickcheck",
- srcs = glob(
- include = [
- "**/*.rs",
- ],
- exclude = [
- ],
- ),
- aliases = selects.with_or({
- "//conditions:default": {
- },
- }),
+ srcs = glob(["**/*.rs"]),
compile_data = glob(
include = ["**"],
exclude = [
+ "**/* *",
+ ".tmp_git_root/**/*",
"BUILD",
"BUILD.bazel",
"WORKSPACE",
"WORKSPACE.bazel",
],
- ) + select_with_or({
- "//conditions:default": [
- ],
- }),
+ ),
crate_features = [
"default",
"env_logger",
@@ -57,42 +36,53 @@
"use_logging",
],
crate_root = "src/lib.rs",
- data = select_with_or({
- "//conditions:default": [
- ],
- }),
edition = "2018",
- proc_macro_deps = [
- ] + select_with_or({
- "//conditions:default": [
- ],
- }),
- rustc_env = {
- },
- rustc_env_files = select_with_or({
- "//conditions:default": [
- ],
- }),
- rustc_flags = [
- # In most cases, warnings in 3rd party crates are not interesting as
- # they're out of the control of consumers. The flag here silences
- # warnings. For more details see:
- # https://doc.rust-lang.org/rustc/lints/levels.html
- "--cap-lints=allow",
- ],
+ rustc_flags = ["--cap-lints=allow"],
tags = [
"cargo-bazel",
+ "crate-name=quickcheck",
"manual",
"noclippy",
"norustfmt",
],
+ target_compatible_with = select({
+ "@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-fuchsia": [],
+ "@rules_rust//rust/platform:aarch64-linux-android": [],
+ "@rules_rust//rust/platform:aarch64-pc-windows-msvc": [],
+ "@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-pc-windows-msvc": [],
+ "@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:riscv32imc-unknown-none-elf": [],
+ "@rules_rust//rust/platform:riscv64gc-unknown-none-elf": [],
+ "@rules_rust//rust/platform:s390x-unknown-linux-gnu": [],
+ "@rules_rust//rust/platform:thumbv7em-none-eabi": [],
+ "@rules_rust//rust/platform:thumbv8m.main-none-eabi": [],
+ "@rules_rust//rust/platform:wasm32-unknown-unknown": [],
+ "@rules_rust//rust/platform:wasm32-wasi": [],
+ "@rules_rust//rust/platform:x86_64-apple-darwin": [],
+ "@rules_rust//rust/platform:x86_64-apple-ios": [],
+ "@rules_rust//rust/platform:x86_64-fuchsia": [],
+ "@rules_rust//rust/platform:x86_64-linux-android": [],
+ "@rules_rust//rust/platform:x86_64-pc-windows-msvc": [],
+ "@rules_rust//rust/platform:x86_64-unknown-freebsd": [],
+ "@rules_rust//rust/platform:x86_64-unknown-linux-gnu": [],
+ "@rules_rust//rust/platform:x86_64-unknown-none": [],
+ "//conditions:default": ["@platforms//:incompatible"],
+ }),
version = "1.0.3",
deps = [
- ] + select_with_or({
- "//conditions:default": [
- "@rules_rust_util_import__env_logger-0.8.4//:env_logger",
- "@rules_rust_util_import__log-0.4.17//:log",
- "@rules_rust_util_import__rand-0.8.5//:rand",
- ],
- }),
+ "@rules_rust_util_import__env_logger-0.8.4//:env_logger",
+ "@rules_rust_util_import__log-0.4.17//:log",
+ "@rules_rust_util_import__rand-0.8.5//:rand",
+ ],
)
diff --git a/util/import/3rdparty/crates/BUILD.quote-1.0.10.bazel b/util/import/3rdparty/crates/BUILD.quote-1.0.10.bazel
index c94b5b5..aac4f42 100644
--- a/util/import/3rdparty/crates/BUILD.quote-1.0.10.bazel
+++ b/util/import/3rdparty/crates/BUILD.quote-1.0.10.bazel
@@ -3,20 +3,10 @@
# DO NOT MODIFY: This file is auto-generated by a crate_universe tool. To
# regenerate this file, run the following:
#
-# bazel run //util/import/3rdparty:crates_vendor
+# bazel run @//util/import/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(
- "@rules_rust//rust:defs.bzl",
- "rust_library",
-)
+load("@rules_rust//rust:defs.bzl", "rust_library")
package(default_visibility = ["//visibility:public"])
@@ -26,68 +16,68 @@
rust_library(
name = "quote",
- srcs = glob(
- include = [
- "**/*.rs",
- ],
- exclude = [
- ],
- ),
- aliases = selects.with_or({
- "//conditions:default": {
- },
- }),
+ srcs = glob(["**/*.rs"]),
compile_data = glob(
include = ["**"],
exclude = [
+ "**/* *",
+ ".tmp_git_root/**/*",
"BUILD",
"BUILD.bazel",
"WORKSPACE",
"WORKSPACE.bazel",
],
- ) + select_with_or({
- "//conditions:default": [
- ],
- }),
+ ),
crate_features = [
"default",
"proc-macro",
],
crate_root = "src/lib.rs",
- data = select_with_or({
- "//conditions:default": [
- ],
- }),
edition = "2018",
- proc_macro_deps = [
- ] + select_with_or({
- "//conditions:default": [
- ],
- }),
- rustc_env = {
- },
- rustc_env_files = select_with_or({
- "//conditions:default": [
- ],
- }),
- rustc_flags = [
- # In most cases, warnings in 3rd party crates are not interesting as
- # they're out of the control of consumers. The flag here silences
- # warnings. For more details see:
- # https://doc.rust-lang.org/rustc/lints/levels.html
- "--cap-lints=allow",
- ],
+ rustc_flags = ["--cap-lints=allow"],
tags = [
"cargo-bazel",
+ "crate-name=quote",
"manual",
"noclippy",
"norustfmt",
],
+ target_compatible_with = select({
+ "@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-fuchsia": [],
+ "@rules_rust//rust/platform:aarch64-linux-android": [],
+ "@rules_rust//rust/platform:aarch64-pc-windows-msvc": [],
+ "@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-pc-windows-msvc": [],
+ "@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:riscv32imc-unknown-none-elf": [],
+ "@rules_rust//rust/platform:riscv64gc-unknown-none-elf": [],
+ "@rules_rust//rust/platform:s390x-unknown-linux-gnu": [],
+ "@rules_rust//rust/platform:thumbv7em-none-eabi": [],
+ "@rules_rust//rust/platform:thumbv8m.main-none-eabi": [],
+ "@rules_rust//rust/platform:wasm32-unknown-unknown": [],
+ "@rules_rust//rust/platform:wasm32-wasi": [],
+ "@rules_rust//rust/platform:x86_64-apple-darwin": [],
+ "@rules_rust//rust/platform:x86_64-apple-ios": [],
+ "@rules_rust//rust/platform:x86_64-fuchsia": [],
+ "@rules_rust//rust/platform:x86_64-linux-android": [],
+ "@rules_rust//rust/platform:x86_64-pc-windows-msvc": [],
+ "@rules_rust//rust/platform:x86_64-unknown-freebsd": [],
+ "@rules_rust//rust/platform:x86_64-unknown-linux-gnu": [],
+ "@rules_rust//rust/platform:x86_64-unknown-none": [],
+ "//conditions:default": ["@platforms//:incompatible"],
+ }),
version = "1.0.10",
deps = [
- ] + select_with_or({
- "//conditions:default": [
- "@rules_rust_util_import__proc-macro2-1.0.33//:proc_macro2",
- ],
- }),
+ "@rules_rust_util_import__proc-macro2-1.0.33//:proc_macro2",
+ ],
)
diff --git a/util/import/3rdparty/crates/BUILD.rand-0.8.5.bazel b/util/import/3rdparty/crates/BUILD.rand-0.8.5.bazel
index 890cfd6..97d6b78 100644
--- a/util/import/3rdparty/crates/BUILD.rand-0.8.5.bazel
+++ b/util/import/3rdparty/crates/BUILD.rand-0.8.5.bazel
@@ -3,20 +3,10 @@
# DO NOT MODIFY: This file is auto-generated by a crate_universe tool. To
# regenerate this file, run the following:
#
-# bazel run //util/import/3rdparty:crates_vendor
+# bazel run @//util/import/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(
- "@rules_rust//rust:defs.bzl",
- "rust_library",
-)
+load("@rules_rust//rust:defs.bzl", "rust_library")
package(default_visibility = ["//visibility:public"])
@@ -26,68 +16,68 @@
rust_library(
name = "rand",
- srcs = glob(
- include = [
- "**/*.rs",
- ],
- exclude = [
- ],
- ),
- aliases = selects.with_or({
- "//conditions:default": {
- },
- }),
+ srcs = glob(["**/*.rs"]),
compile_data = glob(
include = ["**"],
exclude = [
+ "**/* *",
+ ".tmp_git_root/**/*",
"BUILD",
"BUILD.bazel",
"WORKSPACE",
"WORKSPACE.bazel",
],
- ) + select_with_or({
- "//conditions:default": [
- ],
- }),
+ ),
crate_features = [
"getrandom",
"small_rng",
],
crate_root = "src/lib.rs",
- data = select_with_or({
- "//conditions:default": [
- ],
- }),
edition = "2018",
- proc_macro_deps = [
- ] + select_with_or({
- "//conditions:default": [
- ],
- }),
- rustc_env = {
- },
- rustc_env_files = select_with_or({
- "//conditions:default": [
- ],
- }),
- rustc_flags = [
- # In most cases, warnings in 3rd party crates are not interesting as
- # they're out of the control of consumers. The flag here silences
- # warnings. For more details see:
- # https://doc.rust-lang.org/rustc/lints/levels.html
- "--cap-lints=allow",
- ],
+ rustc_flags = ["--cap-lints=allow"],
tags = [
"cargo-bazel",
+ "crate-name=rand",
"manual",
"noclippy",
"norustfmt",
],
+ target_compatible_with = select({
+ "@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-fuchsia": [],
+ "@rules_rust//rust/platform:aarch64-linux-android": [],
+ "@rules_rust//rust/platform:aarch64-pc-windows-msvc": [],
+ "@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-pc-windows-msvc": [],
+ "@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:riscv32imc-unknown-none-elf": [],
+ "@rules_rust//rust/platform:riscv64gc-unknown-none-elf": [],
+ "@rules_rust//rust/platform:s390x-unknown-linux-gnu": [],
+ "@rules_rust//rust/platform:thumbv7em-none-eabi": [],
+ "@rules_rust//rust/platform:thumbv8m.main-none-eabi": [],
+ "@rules_rust//rust/platform:wasm32-unknown-unknown": [],
+ "@rules_rust//rust/platform:wasm32-wasi": [],
+ "@rules_rust//rust/platform:x86_64-apple-darwin": [],
+ "@rules_rust//rust/platform:x86_64-apple-ios": [],
+ "@rules_rust//rust/platform:x86_64-fuchsia": [],
+ "@rules_rust//rust/platform:x86_64-linux-android": [],
+ "@rules_rust//rust/platform:x86_64-pc-windows-msvc": [],
+ "@rules_rust//rust/platform:x86_64-unknown-freebsd": [],
+ "@rules_rust//rust/platform:x86_64-unknown-linux-gnu": [],
+ "@rules_rust//rust/platform:x86_64-unknown-none": [],
+ "//conditions:default": ["@platforms//:incompatible"],
+ }),
version = "0.8.5",
deps = [
- ] + select_with_or({
- "//conditions:default": [
- "@rules_rust_util_import__rand_core-0.6.3//:rand_core",
- ],
- }),
+ "@rules_rust_util_import__rand_core-0.6.4//:rand_core",
+ ],
)
diff --git a/util/import/3rdparty/crates/BUILD.rand_core-0.6.3.bazel b/util/import/3rdparty/crates/BUILD.rand_core-0.6.3.bazel
deleted file mode 100644
index 6376096..0000000
--- a/util/import/3rdparty/crates/BUILD.rand_core-0.6.3.bazel
+++ /dev/null
@@ -1,92 +0,0 @@
-###############################################################################
-# @generated
-# DO NOT MODIFY: This file is auto-generated by a crate_universe tool. To
-# regenerate this file, run the following:
-#
-# bazel run //util/import/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(
- "@rules_rust//rust:defs.bzl",
- "rust_library",
-)
-
-package(default_visibility = ["//visibility:public"])
-
-# licenses([
-# "TODO", # MIT OR Apache-2.0
-# ])
-
-rust_library(
- name = "rand_core",
- srcs = glob(
- include = [
- "**/*.rs",
- ],
- exclude = [
- ],
- ),
- aliases = selects.with_or({
- "//conditions:default": {
- },
- }),
- compile_data = glob(
- include = ["**"],
- exclude = [
- "BUILD",
- "BUILD.bazel",
- "WORKSPACE",
- "WORKSPACE.bazel",
- ],
- ) + select_with_or({
- "//conditions:default": [
- ],
- }),
- crate_features = [
- "getrandom",
- ],
- crate_root = "src/lib.rs",
- data = select_with_or({
- "//conditions:default": [
- ],
- }),
- edition = "2018",
- proc_macro_deps = [
- ] + select_with_or({
- "//conditions:default": [
- ],
- }),
- rustc_env = {
- },
- rustc_env_files = select_with_or({
- "//conditions:default": [
- ],
- }),
- rustc_flags = [
- # In most cases, warnings in 3rd party crates are not interesting as
- # they're out of the control of consumers. The flag here silences
- # warnings. For more details see:
- # https://doc.rust-lang.org/rustc/lints/levels.html
- "--cap-lints=allow",
- ],
- tags = [
- "cargo-bazel",
- "manual",
- "noclippy",
- "norustfmt",
- ],
- version = "0.6.3",
- deps = [
- ] + select_with_or({
- "//conditions:default": [
- "@rules_rust_util_import__getrandom-0.2.7//:getrandom",
- ],
- }),
-)
diff --git a/util/import/3rdparty/crates/BUILD.rand_core-0.6.4.bazel b/util/import/3rdparty/crates/BUILD.rand_core-0.6.4.bazel
new file mode 100644
index 0000000..a2d153a
--- /dev/null
+++ b/util/import/3rdparty/crates/BUILD.rand_core-0.6.4.bazel
@@ -0,0 +1,82 @@
+###############################################################################
+# @generated
+# DO NOT MODIFY: This file is auto-generated by a crate_universe tool. To
+# regenerate this file, run the following:
+#
+# bazel run @//util/import/3rdparty:crates_vendor
+###############################################################################
+
+load("@rules_rust//rust:defs.bzl", "rust_library")
+
+package(default_visibility = ["//visibility:public"])
+
+# licenses([
+# "TODO", # MIT OR Apache-2.0
+# ])
+
+rust_library(
+ name = "rand_core",
+ srcs = glob(["**/*.rs"]),
+ compile_data = glob(
+ include = ["**"],
+ exclude = [
+ "**/* *",
+ ".tmp_git_root/**/*",
+ "BUILD",
+ "BUILD.bazel",
+ "WORKSPACE",
+ "WORKSPACE.bazel",
+ ],
+ ),
+ crate_features = [
+ "getrandom",
+ ],
+ crate_root = "src/lib.rs",
+ edition = "2018",
+ rustc_flags = ["--cap-lints=allow"],
+ tags = [
+ "cargo-bazel",
+ "crate-name=rand_core",
+ "manual",
+ "noclippy",
+ "norustfmt",
+ ],
+ target_compatible_with = select({
+ "@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-fuchsia": [],
+ "@rules_rust//rust/platform:aarch64-linux-android": [],
+ "@rules_rust//rust/platform:aarch64-pc-windows-msvc": [],
+ "@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-pc-windows-msvc": [],
+ "@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:riscv32imc-unknown-none-elf": [],
+ "@rules_rust//rust/platform:riscv64gc-unknown-none-elf": [],
+ "@rules_rust//rust/platform:s390x-unknown-linux-gnu": [],
+ "@rules_rust//rust/platform:thumbv7em-none-eabi": [],
+ "@rules_rust//rust/platform:thumbv8m.main-none-eabi": [],
+ "@rules_rust//rust/platform:wasm32-unknown-unknown": [],
+ "@rules_rust//rust/platform:wasm32-wasi": [],
+ "@rules_rust//rust/platform:x86_64-apple-darwin": [],
+ "@rules_rust//rust/platform:x86_64-apple-ios": [],
+ "@rules_rust//rust/platform:x86_64-fuchsia": [],
+ "@rules_rust//rust/platform:x86_64-linux-android": [],
+ "@rules_rust//rust/platform:x86_64-pc-windows-msvc": [],
+ "@rules_rust//rust/platform:x86_64-unknown-freebsd": [],
+ "@rules_rust//rust/platform:x86_64-unknown-linux-gnu": [],
+ "@rules_rust//rust/platform:x86_64-unknown-none": [],
+ "//conditions:default": ["@platforms//:incompatible"],
+ }),
+ version = "0.6.4",
+ deps = [
+ "@rules_rust_util_import__getrandom-0.2.8//:getrandom",
+ ],
+)
diff --git a/util/import/3rdparty/crates/BUILD.regex-1.4.6.bazel b/util/import/3rdparty/crates/BUILD.regex-1.4.6.bazel
index 4968002..8ff5008 100644
--- a/util/import/3rdparty/crates/BUILD.regex-1.4.6.bazel
+++ b/util/import/3rdparty/crates/BUILD.regex-1.4.6.bazel
@@ -3,20 +3,10 @@
# DO NOT MODIFY: This file is auto-generated by a crate_universe tool. To
# regenerate this file, run the following:
#
-# bazel run //util/import/3rdparty:crates_vendor
+# bazel run @//util/import/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(
- "@rules_rust//rust:defs.bzl",
- "rust_library",
-)
+load("@rules_rust//rust:defs.bzl", "rust_library")
package(default_visibility = ["//visibility:public"])
@@ -26,29 +16,18 @@
rust_library(
name = "regex",
- srcs = glob(
- include = [
- "**/*.rs",
- ],
- exclude = [
- ],
- ),
- aliases = selects.with_or({
- "//conditions:default": {
- },
- }),
+ srcs = glob(["**/*.rs"]),
compile_data = glob(
include = ["**"],
exclude = [
+ "**/* *",
+ ".tmp_git_root/**/*",
"BUILD",
"BUILD.bazel",
"WORKSPACE",
"WORKSPACE.bazel",
],
- ) + select_with_or({
- "//conditions:default": [
- ],
- }),
+ ),
crate_features = [
"aho-corasick",
"memchr",
@@ -60,42 +39,53 @@
"std",
],
crate_root = "src/lib.rs",
- data = select_with_or({
- "//conditions:default": [
- ],
- }),
edition = "2015",
- proc_macro_deps = [
- ] + select_with_or({
- "//conditions:default": [
- ],
- }),
- rustc_env = {
- },
- rustc_env_files = select_with_or({
- "//conditions:default": [
- ],
- }),
- rustc_flags = [
- # In most cases, warnings in 3rd party crates are not interesting as
- # they're out of the control of consumers. The flag here silences
- # warnings. For more details see:
- # https://doc.rust-lang.org/rustc/lints/levels.html
- "--cap-lints=allow",
- ],
+ rustc_flags = ["--cap-lints=allow"],
tags = [
"cargo-bazel",
+ "crate-name=regex",
"manual",
"noclippy",
"norustfmt",
],
+ target_compatible_with = select({
+ "@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-fuchsia": [],
+ "@rules_rust//rust/platform:aarch64-linux-android": [],
+ "@rules_rust//rust/platform:aarch64-pc-windows-msvc": [],
+ "@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-pc-windows-msvc": [],
+ "@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:riscv32imc-unknown-none-elf": [],
+ "@rules_rust//rust/platform:riscv64gc-unknown-none-elf": [],
+ "@rules_rust//rust/platform:s390x-unknown-linux-gnu": [],
+ "@rules_rust//rust/platform:thumbv7em-none-eabi": [],
+ "@rules_rust//rust/platform:thumbv8m.main-none-eabi": [],
+ "@rules_rust//rust/platform:wasm32-unknown-unknown": [],
+ "@rules_rust//rust/platform:wasm32-wasi": [],
+ "@rules_rust//rust/platform:x86_64-apple-darwin": [],
+ "@rules_rust//rust/platform:x86_64-apple-ios": [],
+ "@rules_rust//rust/platform:x86_64-fuchsia": [],
+ "@rules_rust//rust/platform:x86_64-linux-android": [],
+ "@rules_rust//rust/platform:x86_64-pc-windows-msvc": [],
+ "@rules_rust//rust/platform:x86_64-unknown-freebsd": [],
+ "@rules_rust//rust/platform:x86_64-unknown-linux-gnu": [],
+ "@rules_rust//rust/platform:x86_64-unknown-none": [],
+ "//conditions:default": ["@platforms//:incompatible"],
+ }),
version = "1.4.6",
deps = [
- ] + select_with_or({
- "//conditions:default": [
- "@rules_rust_util_import__aho-corasick-0.7.15//:aho_corasick",
- "@rules_rust_util_import__memchr-2.5.0//:memchr",
- "@rules_rust_util_import__regex-syntax-0.6.27//:regex_syntax",
- ],
- }),
+ "@rules_rust_util_import__aho-corasick-0.7.15//:aho_corasick",
+ "@rules_rust_util_import__memchr-2.5.0//:memchr",
+ "@rules_rust_util_import__regex-syntax-0.6.28//:regex_syntax",
+ ],
)
diff --git a/util/import/3rdparty/crates/BUILD.regex-syntax-0.6.27.bazel b/util/import/3rdparty/crates/BUILD.regex-syntax-0.6.27.bazel
deleted file mode 100644
index cadf7fe..0000000
--- a/util/import/3rdparty/crates/BUILD.regex-syntax-0.6.27.bazel
+++ /dev/null
@@ -1,90 +0,0 @@
-###############################################################################
-# @generated
-# DO NOT MODIFY: This file is auto-generated by a crate_universe tool. To
-# regenerate this file, run the following:
-#
-# bazel run //util/import/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(
- "@rules_rust//rust:defs.bzl",
- "rust_library",
-)
-
-package(default_visibility = ["//visibility:public"])
-
-# licenses([
-# "TODO", # MIT OR Apache-2.0
-# ])
-
-rust_library(
- name = "regex_syntax",
- srcs = glob(
- include = [
- "**/*.rs",
- ],
- exclude = [
- ],
- ),
- aliases = selects.with_or({
- "//conditions:default": {
- },
- }),
- compile_data = glob(
- include = ["**"],
- exclude = [
- "BUILD",
- "BUILD.bazel",
- "WORKSPACE",
- "WORKSPACE.bazel",
- ],
- ) + select_with_or({
- "//conditions:default": [
- ],
- }),
- crate_features = [
- ],
- crate_root = "src/lib.rs",
- data = select_with_or({
- "//conditions:default": [
- ],
- }),
- edition = "2018",
- proc_macro_deps = [
- ] + select_with_or({
- "//conditions:default": [
- ],
- }),
- rustc_env = {
- },
- rustc_env_files = select_with_or({
- "//conditions:default": [
- ],
- }),
- rustc_flags = [
- # In most cases, warnings in 3rd party crates are not interesting as
- # they're out of the control of consumers. The flag here silences
- # warnings. For more details see:
- # https://doc.rust-lang.org/rustc/lints/levels.html
- "--cap-lints=allow",
- ],
- tags = [
- "cargo-bazel",
- "manual",
- "noclippy",
- "norustfmt",
- ],
- version = "0.6.27",
- deps = [
- ] + select_with_or({
- "//conditions:default": [
- ],
- }),
-)
diff --git a/util/import/3rdparty/crates/BUILD.regex-syntax-0.6.28.bazel b/util/import/3rdparty/crates/BUILD.regex-syntax-0.6.28.bazel
new file mode 100644
index 0000000..aab3168
--- /dev/null
+++ b/util/import/3rdparty/crates/BUILD.regex-syntax-0.6.28.bazel
@@ -0,0 +1,76 @@
+###############################################################################
+# @generated
+# DO NOT MODIFY: This file is auto-generated by a crate_universe tool. To
+# regenerate this file, run the following:
+#
+# bazel run @//util/import/3rdparty:crates_vendor
+###############################################################################
+
+load("@rules_rust//rust:defs.bzl", "rust_library")
+
+package(default_visibility = ["//visibility:public"])
+
+# licenses([
+# "TODO", # MIT OR Apache-2.0
+# ])
+
+rust_library(
+ name = "regex_syntax",
+ srcs = glob(["**/*.rs"]),
+ compile_data = glob(
+ include = ["**"],
+ exclude = [
+ "**/* *",
+ ".tmp_git_root/**/*",
+ "BUILD",
+ "BUILD.bazel",
+ "WORKSPACE",
+ "WORKSPACE.bazel",
+ ],
+ ),
+ crate_root = "src/lib.rs",
+ edition = "2018",
+ rustc_flags = ["--cap-lints=allow"],
+ tags = [
+ "cargo-bazel",
+ "crate-name=regex-syntax",
+ "manual",
+ "noclippy",
+ "norustfmt",
+ ],
+ target_compatible_with = select({
+ "@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-fuchsia": [],
+ "@rules_rust//rust/platform:aarch64-linux-android": [],
+ "@rules_rust//rust/platform:aarch64-pc-windows-msvc": [],
+ "@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-pc-windows-msvc": [],
+ "@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:riscv32imc-unknown-none-elf": [],
+ "@rules_rust//rust/platform:riscv64gc-unknown-none-elf": [],
+ "@rules_rust//rust/platform:s390x-unknown-linux-gnu": [],
+ "@rules_rust//rust/platform:thumbv7em-none-eabi": [],
+ "@rules_rust//rust/platform:thumbv8m.main-none-eabi": [],
+ "@rules_rust//rust/platform:wasm32-unknown-unknown": [],
+ "@rules_rust//rust/platform:wasm32-wasi": [],
+ "@rules_rust//rust/platform:x86_64-apple-darwin": [],
+ "@rules_rust//rust/platform:x86_64-apple-ios": [],
+ "@rules_rust//rust/platform:x86_64-fuchsia": [],
+ "@rules_rust//rust/platform:x86_64-linux-android": [],
+ "@rules_rust//rust/platform:x86_64-pc-windows-msvc": [],
+ "@rules_rust//rust/platform:x86_64-unknown-freebsd": [],
+ "@rules_rust//rust/platform:x86_64-unknown-linux-gnu": [],
+ "@rules_rust//rust/platform:x86_64-unknown-none": [],
+ "//conditions:default": ["@platforms//:incompatible"],
+ }),
+ version = "0.6.28",
+)
diff --git a/util/import/3rdparty/crates/BUILD.syn-1.0.82.bazel b/util/import/3rdparty/crates/BUILD.syn-1.0.82.bazel
index c2cc5c8..db5084b 100644
--- a/util/import/3rdparty/crates/BUILD.syn-1.0.82.bazel
+++ b/util/import/3rdparty/crates/BUILD.syn-1.0.82.bazel
@@ -3,24 +3,11 @@
# DO NOT MODIFY: This file is auto-generated by a crate_universe tool. To
# regenerate this file, run the following:
#
-# bazel run //util/import/3rdparty:crates_vendor
+# bazel run @//util/import/3rdparty:crates_vendor
###############################################################################
-load(
- "@bazel_skylib//lib:selects.bzl",
- "selects",
-)
-load(
- "@rules_rust//cargo:defs.bzl",
- "cargo_build_script",
-)
-
-# buildifier: disable=bzl-visibility
-load("@rules_rust//crate_universe/private:selects.bzl", "select_with_or")
-load(
- "@rules_rust//rust:defs.bzl",
- "rust_library",
-)
+load("@rules_rust//cargo:defs.bzl", "cargo_build_script")
+load("@rules_rust//rust:defs.bzl", "rust_library")
package(default_visibility = ["//visibility:public"])
@@ -30,29 +17,18 @@
rust_library(
name = "syn",
- srcs = glob(
- include = [
- "**/*.rs",
- ],
- exclude = [
- ],
- ),
- aliases = selects.with_or({
- "//conditions:default": {
- },
- }),
+ srcs = glob(["**/*.rs"]),
compile_data = glob(
include = ["**"],
exclude = [
+ "**/* *",
+ ".tmp_git_root/**/*",
"BUILD",
"BUILD.bazel",
"WORKSPACE",
"WORKSPACE.bazel",
],
- ) + select_with_or({
- "//conditions:default": [
- ],
- }),
+ ),
crate_features = [
"clone-impls",
"default",
@@ -63,67 +39,61 @@
"quote",
],
crate_root = "src/lib.rs",
- data = select_with_or({
- "//conditions:default": [
- ],
- }),
edition = "2018",
- proc_macro_deps = [
- ] + select_with_or({
- "//conditions:default": [
- ],
- }),
- rustc_env = {
- },
- rustc_env_files = select_with_or({
- "//conditions:default": [
- ],
- }),
- rustc_flags = [
- # In most cases, warnings in 3rd party crates are not interesting as
- # they're out of the control of consumers. The flag here silences
- # warnings. For more details see:
- # https://doc.rust-lang.org/rustc/lints/levels.html
- "--cap-lints=allow",
- ],
+ rustc_flags = ["--cap-lints=allow"],
tags = [
"cargo-bazel",
+ "crate-name=syn",
"manual",
"noclippy",
"norustfmt",
],
+ target_compatible_with = select({
+ "@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-fuchsia": [],
+ "@rules_rust//rust/platform:aarch64-linux-android": [],
+ "@rules_rust//rust/platform:aarch64-pc-windows-msvc": [],
+ "@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-pc-windows-msvc": [],
+ "@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:riscv32imc-unknown-none-elf": [],
+ "@rules_rust//rust/platform:riscv64gc-unknown-none-elf": [],
+ "@rules_rust//rust/platform:s390x-unknown-linux-gnu": [],
+ "@rules_rust//rust/platform:thumbv7em-none-eabi": [],
+ "@rules_rust//rust/platform:thumbv8m.main-none-eabi": [],
+ "@rules_rust//rust/platform:wasm32-unknown-unknown": [],
+ "@rules_rust//rust/platform:wasm32-wasi": [],
+ "@rules_rust//rust/platform:x86_64-apple-darwin": [],
+ "@rules_rust//rust/platform:x86_64-apple-ios": [],
+ "@rules_rust//rust/platform:x86_64-fuchsia": [],
+ "@rules_rust//rust/platform:x86_64-linux-android": [],
+ "@rules_rust//rust/platform:x86_64-pc-windows-msvc": [],
+ "@rules_rust//rust/platform:x86_64-unknown-freebsd": [],
+ "@rules_rust//rust/platform:x86_64-unknown-linux-gnu": [],
+ "@rules_rust//rust/platform:x86_64-unknown-none": [],
+ "//conditions:default": ["@platforms//:incompatible"],
+ }),
version = "1.0.82",
deps = [
- ] + select_with_or({
- "//conditions:default": [
- "@rules_rust_util_import__proc-macro2-1.0.33//:proc_macro2",
- "@rules_rust_util_import__quote-1.0.10//:quote",
- "@rules_rust_util_import__syn-1.0.82//:build_script_build",
- "@rules_rust_util_import__unicode-xid-0.2.3//:unicode_xid",
- ],
- }),
+ "@rules_rust_util_import__proc-macro2-1.0.33//:proc_macro2",
+ "@rules_rust_util_import__quote-1.0.10//:quote",
+ "@rules_rust_util_import__syn-1.0.82//:build_script_build",
+ "@rules_rust_util_import__unicode-xid-0.2.4//:unicode_xid",
+ ],
)
cargo_build_script(
- # See comment associated with alias. Do not change this name
name = "syn_build_script",
- srcs = glob(
- include = [
- "**/*.rs",
- ],
- exclude = [
- ],
- ),
- aliases = selects.with_or({
- "//conditions:default": {
- },
- }),
- build_script_env = {
- },
- compile_data = select_with_or({
- "//conditions:default": [
- ],
- }),
+ srcs = glob(["**/*.rs"]),
crate_features = [
"clone-impls",
"default",
@@ -135,57 +105,34 @@
],
crate_name = "build_script_build",
crate_root = "build.rs",
- data = glob(["**"]) + select_with_or({
- "//conditions:default": [
+ data = glob(
+ include = ["**"],
+ exclude = [
+ "**/* *",
+ ".tmp_git_root/**/*",
+ "BUILD",
+ "BUILD.bazel",
+ "WORKSPACE",
+ "WORKSPACE.bazel",
],
- }),
+ ),
edition = "2018",
- proc_macro_deps = [
- ] + select_with_or({
- "//conditions:default": [
- ],
- }),
- rustc_env = {
- },
- rustc_env_files = select_with_or({
- "//conditions:default": [
- ],
- }),
rustc_flags = [
- # In most cases, warnings in 3rd party crates are not interesting as
- # they're out of the control of consumers. The flag here silences
- # warnings. For more details see:
- # https://doc.rust-lang.org/rustc/lints/levels.html
"--cap-lints=allow",
],
tags = [
"cargo-bazel",
+ "crate-name=syn",
"manual",
"noclippy",
"norustfmt",
],
- tools = select_with_or({
- "//conditions:default": [
- ],
- }),
version = "1.0.82",
visibility = ["//visibility:private"],
- deps = [
- ] + select_with_or({
- "//conditions:default": [
- ],
- }),
)
alias(
- # Because `cargo_build_script` does some invisible target name mutating to
- # determine the package and crate name for a build script, the Bazel
- # target namename of any build script cannot be the Cargo canonical name
- # of `build_script_build` without losing out on having certain Cargo
- # environment variables set.
name = "build_script_build",
actual = "syn_build_script",
- tags = [
- "manual",
- ],
+ tags = ["manual"],
)
diff --git a/util/import/3rdparty/crates/BUILD.unicode-xid-0.2.3.bazel b/util/import/3rdparty/crates/BUILD.unicode-xid-0.2.3.bazel
deleted file mode 100644
index 5405857..0000000
--- a/util/import/3rdparty/crates/BUILD.unicode-xid-0.2.3.bazel
+++ /dev/null
@@ -1,91 +0,0 @@
-###############################################################################
-# @generated
-# DO NOT MODIFY: This file is auto-generated by a crate_universe tool. To
-# regenerate this file, run the following:
-#
-# bazel run //util/import/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(
- "@rules_rust//rust:defs.bzl",
- "rust_library",
-)
-
-package(default_visibility = ["//visibility:public"])
-
-# licenses([
-# "TODO", # MIT OR Apache-2.0
-# ])
-
-rust_library(
- name = "unicode_xid",
- srcs = glob(
- include = [
- "**/*.rs",
- ],
- exclude = [
- ],
- ),
- aliases = selects.with_or({
- "//conditions:default": {
- },
- }),
- compile_data = glob(
- include = ["**"],
- exclude = [
- "BUILD",
- "BUILD.bazel",
- "WORKSPACE",
- "WORKSPACE.bazel",
- ],
- ) + select_with_or({
- "//conditions:default": [
- ],
- }),
- crate_features = [
- "default",
- ],
- crate_root = "src/lib.rs",
- data = select_with_or({
- "//conditions:default": [
- ],
- }),
- edition = "2015",
- proc_macro_deps = [
- ] + select_with_or({
- "//conditions:default": [
- ],
- }),
- rustc_env = {
- },
- rustc_env_files = select_with_or({
- "//conditions:default": [
- ],
- }),
- rustc_flags = [
- # In most cases, warnings in 3rd party crates are not interesting as
- # they're out of the control of consumers. The flag here silences
- # warnings. For more details see:
- # https://doc.rust-lang.org/rustc/lints/levels.html
- "--cap-lints=allow",
- ],
- tags = [
- "cargo-bazel",
- "manual",
- "noclippy",
- "norustfmt",
- ],
- version = "0.2.3",
- deps = [
- ] + select_with_or({
- "//conditions:default": [
- ],
- }),
-)
diff --git a/util/import/3rdparty/crates/BUILD.unicode-xid-0.2.4.bazel b/util/import/3rdparty/crates/BUILD.unicode-xid-0.2.4.bazel
new file mode 100644
index 0000000..4fc289b
--- /dev/null
+++ b/util/import/3rdparty/crates/BUILD.unicode-xid-0.2.4.bazel
@@ -0,0 +1,79 @@
+###############################################################################
+# @generated
+# DO NOT MODIFY: This file is auto-generated by a crate_universe tool. To
+# regenerate this file, run the following:
+#
+# bazel run @//util/import/3rdparty:crates_vendor
+###############################################################################
+
+load("@rules_rust//rust:defs.bzl", "rust_library")
+
+package(default_visibility = ["//visibility:public"])
+
+# licenses([
+# "TODO", # MIT OR Apache-2.0
+# ])
+
+rust_library(
+ name = "unicode_xid",
+ srcs = glob(["**/*.rs"]),
+ compile_data = glob(
+ include = ["**"],
+ exclude = [
+ "**/* *",
+ ".tmp_git_root/**/*",
+ "BUILD",
+ "BUILD.bazel",
+ "WORKSPACE",
+ "WORKSPACE.bazel",
+ ],
+ ),
+ crate_features = [
+ "default",
+ ],
+ crate_root = "src/lib.rs",
+ edition = "2015",
+ rustc_flags = ["--cap-lints=allow"],
+ tags = [
+ "cargo-bazel",
+ "crate-name=unicode-xid",
+ "manual",
+ "noclippy",
+ "norustfmt",
+ ],
+ target_compatible_with = select({
+ "@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-fuchsia": [],
+ "@rules_rust//rust/platform:aarch64-linux-android": [],
+ "@rules_rust//rust/platform:aarch64-pc-windows-msvc": [],
+ "@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-pc-windows-msvc": [],
+ "@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:riscv32imc-unknown-none-elf": [],
+ "@rules_rust//rust/platform:riscv64gc-unknown-none-elf": [],
+ "@rules_rust//rust/platform:s390x-unknown-linux-gnu": [],
+ "@rules_rust//rust/platform:thumbv7em-none-eabi": [],
+ "@rules_rust//rust/platform:thumbv8m.main-none-eabi": [],
+ "@rules_rust//rust/platform:wasm32-unknown-unknown": [],
+ "@rules_rust//rust/platform:wasm32-wasi": [],
+ "@rules_rust//rust/platform:x86_64-apple-darwin": [],
+ "@rules_rust//rust/platform:x86_64-apple-ios": [],
+ "@rules_rust//rust/platform:x86_64-fuchsia": [],
+ "@rules_rust//rust/platform:x86_64-linux-android": [],
+ "@rules_rust//rust/platform:x86_64-pc-windows-msvc": [],
+ "@rules_rust//rust/platform:x86_64-unknown-freebsd": [],
+ "@rules_rust//rust/platform:x86_64-unknown-linux-gnu": [],
+ "@rules_rust//rust/platform:x86_64-unknown-none": [],
+ "//conditions:default": ["@platforms//:incompatible"],
+ }),
+ version = "0.2.4",
+)
diff --git a/util/import/3rdparty/crates/BUILD.wasi-0.11.0+wasi-snapshot-preview1.bazel b/util/import/3rdparty/crates/BUILD.wasi-0.11.0+wasi-snapshot-preview1.bazel
index 02de946..e236728 100644
--- a/util/import/3rdparty/crates/BUILD.wasi-0.11.0+wasi-snapshot-preview1.bazel
+++ b/util/import/3rdparty/crates/BUILD.wasi-0.11.0+wasi-snapshot-preview1.bazel
@@ -3,20 +3,10 @@
# DO NOT MODIFY: This file is auto-generated by a crate_universe tool. To
# regenerate this file, run the following:
#
-# bazel run //util/import/3rdparty:crates_vendor
+# bazel run @//util/import/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(
- "@rules_rust//rust:defs.bzl",
- "rust_library",
-)
+load("@rules_rust//rust:defs.bzl", "rust_library")
package(default_visibility = ["//visibility:public"])
@@ -26,67 +16,65 @@
rust_library(
name = "wasi",
- srcs = glob(
- include = [
- "**/*.rs",
- ],
- exclude = [
- ],
- ),
- aliases = selects.with_or({
- "//conditions:default": {
- },
- }),
+ srcs = glob(["**/*.rs"]),
compile_data = glob(
include = ["**"],
exclude = [
+ "**/* *",
+ ".tmp_git_root/**/*",
"BUILD",
"BUILD.bazel",
"WORKSPACE",
"WORKSPACE.bazel",
],
- ) + select_with_or({
- "//conditions:default": [
- ],
- }),
+ ),
crate_features = [
"default",
"std",
],
crate_root = "src/lib.rs",
- data = select_with_or({
- "//conditions:default": [
- ],
- }),
edition = "2018",
- proc_macro_deps = [
- ] + select_with_or({
- "//conditions:default": [
- ],
- }),
- rustc_env = {
- },
- rustc_env_files = select_with_or({
- "//conditions:default": [
- ],
- }),
- rustc_flags = [
- # In most cases, warnings in 3rd party crates are not interesting as
- # they're out of the control of consumers. The flag here silences
- # warnings. For more details see:
- # https://doc.rust-lang.org/rustc/lints/levels.html
- "--cap-lints=allow",
- ],
+ rustc_flags = ["--cap-lints=allow"],
tags = [
"cargo-bazel",
+ "crate-name=wasi",
"manual",
"noclippy",
"norustfmt",
],
- version = "0.11.0+wasi-snapshot-preview1",
- deps = [
- ] + select_with_or({
- "//conditions:default": [
- ],
+ target_compatible_with = select({
+ "@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-fuchsia": [],
+ "@rules_rust//rust/platform:aarch64-linux-android": [],
+ "@rules_rust//rust/platform:aarch64-pc-windows-msvc": [],
+ "@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-pc-windows-msvc": [],
+ "@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:riscv32imc-unknown-none-elf": [],
+ "@rules_rust//rust/platform:riscv64gc-unknown-none-elf": [],
+ "@rules_rust//rust/platform:s390x-unknown-linux-gnu": [],
+ "@rules_rust//rust/platform:thumbv7em-none-eabi": [],
+ "@rules_rust//rust/platform:thumbv8m.main-none-eabi": [],
+ "@rules_rust//rust/platform:wasm32-unknown-unknown": [],
+ "@rules_rust//rust/platform:wasm32-wasi": [],
+ "@rules_rust//rust/platform:x86_64-apple-darwin": [],
+ "@rules_rust//rust/platform:x86_64-apple-ios": [],
+ "@rules_rust//rust/platform:x86_64-fuchsia": [],
+ "@rules_rust//rust/platform:x86_64-linux-android": [],
+ "@rules_rust//rust/platform:x86_64-pc-windows-msvc": [],
+ "@rules_rust//rust/platform:x86_64-unknown-freebsd": [],
+ "@rules_rust//rust/platform:x86_64-unknown-linux-gnu": [],
+ "@rules_rust//rust/platform:x86_64-unknown-none": [],
+ "//conditions:default": ["@platforms//:incompatible"],
}),
+ version = "0.11.0+wasi-snapshot-preview1",
)
diff --git a/util/import/3rdparty/crates/defs.bzl b/util/import/3rdparty/crates/defs.bzl
index 8bf2778..d58e83c 100644
--- a/util/import/3rdparty/crates/defs.bzl
+++ b/util/import/3rdparty/crates/defs.bzl
@@ -3,7 +3,7 @@
# DO NOT MODIFY: This file is auto-generated by a crate_universe tool. To
# regenerate this file, run the following:
#
-# bazel run //util/import/3rdparty:crates_vendor
+# bazel run @//util/import/3rdparty:crates_vendor
###############################################################################
"""
# `crates_repository` API
@@ -37,7 +37,7 @@
# name of the workspace this file is defined in.
"workspace_member_package": {
- # Not all dependnecies are supported for all platforms.
+ # Not all dependencies are supported for all platforms.
# the condition key is the condition required to be true
# on the host platform.
"condition": {
@@ -153,7 +153,7 @@
Args:
normal (bool, optional): If True, normal dependencies are included in the
output list.
- normal_dev (bool, optional): If True, normla dev dependencies will be
+ normal_dev (bool, optional): If True, normal dev dependencies will be
included in the output list..
proc_macro (bool, optional): If True, proc_macro dependencies are included
in the output list.
@@ -202,7 +202,10 @@
crate_deps = list(dependencies.pop(_COMMON_CONDITION, {}).values())
for condition, deps in dependencies.items():
- crate_deps += selects.with_or({_CONDITIONS[condition]: deps.values()})
+ crate_deps += selects.with_or({
+ tuple(_CONDITIONS[condition]): deps.values(),
+ "//conditions:default": [],
+ })
return crate_deps
@@ -222,7 +225,7 @@
Args:
normal (bool, optional): If True, normal dependencies are included in the
output list.
- normal_dev (bool, optional): If True, normla dev dependencies will be
+ normal_dev (bool, optional): If True, normal dev dependencies will be
included in the output list..
proc_macro (bool, optional): If True, proc_macro dependencies are included
in the output list.
@@ -274,15 +277,16 @@
# Build a single select statement where each conditional has accounted for the
# common set of aliases.
- crate_aliases = {"//conditions:default": common_items}
+ crate_aliases = {"//conditions:default": dict(common_items)}
for condition, deps in aliases.items():
condition_triples = _CONDITIONS[condition]
- if condition_triples in crate_aliases:
- crate_aliases[condition_triples].update(deps)
- else:
- crate_aliases.update({_CONDITIONS[condition]: dict(deps.items() + common_items)})
+ for triple in condition_triples:
+ if triple in crate_aliases:
+ crate_aliases[triple].update(deps)
+ else:
+ crate_aliases.update({triple: dict(deps.items() + common_items)})
- return selects.with_or(crate_aliases)
+ return select(crate_aliases)
###############################################################################
# WORKSPACE MEMBER DEPS AND ALIASES
@@ -359,8 +363,8 @@
}
_CONDITIONS = {
- "cfg(target_os = \"wasi\")": ["wasm32-wasi"],
- "cfg(unix)": ["aarch64-apple-darwin", "aarch64-apple-ios", "aarch64-apple-ios-sim", "aarch64-linux-android", "aarch64-unknown-linux-gnu", "arm-unknown-linux-gnueabi", "armv7-linux-androideabi", "armv7-unknown-linux-gnueabi", "i686-apple-darwin", "i686-linux-android", "i686-unknown-freebsd", "i686-unknown-linux-gnu", "powerpc-unknown-linux-gnu", "s390x-unknown-linux-gnu", "x86_64-apple-darwin", "x86_64-apple-ios", "x86_64-linux-android", "x86_64-unknown-freebsd", "x86_64-unknown-linux-gnu"],
+ "cfg(target_os = \"wasi\")": ["@rules_rust//rust/platform:wasm32-wasi"],
+ "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-fuchsia", "@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-fuchsia", "@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"],
}
###############################################################################
@@ -399,12 +403,12 @@
maybe(
http_archive,
- name = "rules_rust_util_import__getrandom-0.2.7",
- sha256 = "4eb1a864a501629691edf6c15a593b7a51eebaa1e8468e9ddc623de7c9b58ec6",
+ name = "rules_rust_util_import__getrandom-0.2.8",
+ sha256 = "c05aeb6a22b8f62540c194aac980f2115af067bfe15a0734d7277a768d396b31",
type = "tar.gz",
- urls = ["https://crates.io/api/v1/crates/getrandom/0.2.7/download"],
- strip_prefix = "getrandom-0.2.7",
- build_file = Label("@rules_rust//util/import/3rdparty/crates:BUILD.getrandom-0.2.7.bazel"),
+ urls = ["https://crates.io/api/v1/crates/getrandom/0.2.8/download"],
+ strip_prefix = "getrandom-0.2.8",
+ build_file = Label("@rules_rust//util/import/3rdparty/crates:BUILD.getrandom-0.2.8.bazel"),
)
maybe(
@@ -419,12 +423,12 @@
maybe(
http_archive,
- name = "rules_rust_util_import__libc-0.2.126",
- sha256 = "349d5a591cd28b49e1d1037471617a32ddcda5731b99419008085f72d5a53836",
+ name = "rules_rust_util_import__libc-0.2.139",
+ sha256 = "201de327520df007757c1f0adce6e827fe8562fbc28bfd9c15571c66ca1f5f79",
type = "tar.gz",
- urls = ["https://crates.io/api/v1/crates/libc/0.2.126/download"],
- strip_prefix = "libc-0.2.126",
- build_file = Label("@rules_rust//util/import/3rdparty/crates:BUILD.libc-0.2.126.bazel"),
+ urls = ["https://crates.io/api/v1/crates/libc/0.2.139/download"],
+ strip_prefix = "libc-0.2.139",
+ build_file = Label("@rules_rust//util/import/3rdparty/crates:BUILD.libc-0.2.139.bazel"),
)
maybe(
@@ -489,12 +493,12 @@
maybe(
http_archive,
- name = "rules_rust_util_import__rand_core-0.6.3",
- sha256 = "d34f1408f55294453790c48b2f1ebbb1c5b4b7563eb1f418bcfcfdbb06ebb4e7",
+ name = "rules_rust_util_import__rand_core-0.6.4",
+ sha256 = "ec0be4795e2f6a28069bec0b5ff3e2ac9bafc99e6a9a7dc3547996c5c816922c",
type = "tar.gz",
- urls = ["https://crates.io/api/v1/crates/rand_core/0.6.3/download"],
- strip_prefix = "rand_core-0.6.3",
- build_file = Label("@rules_rust//util/import/3rdparty/crates:BUILD.rand_core-0.6.3.bazel"),
+ urls = ["https://crates.io/api/v1/crates/rand_core/0.6.4/download"],
+ strip_prefix = "rand_core-0.6.4",
+ build_file = Label("@rules_rust//util/import/3rdparty/crates:BUILD.rand_core-0.6.4.bazel"),
)
maybe(
@@ -509,12 +513,12 @@
maybe(
http_archive,
- name = "rules_rust_util_import__regex-syntax-0.6.27",
- sha256 = "a3f87b73ce11b1619a3c6332f45341e0047173771e8b8b73f87bfeefb7b56244",
+ name = "rules_rust_util_import__regex-syntax-0.6.28",
+ sha256 = "456c603be3e8d448b072f410900c09faf164fbce2d480456f50eea6e25f9c848",
type = "tar.gz",
- urls = ["https://crates.io/api/v1/crates/regex-syntax/0.6.27/download"],
- strip_prefix = "regex-syntax-0.6.27",
- build_file = Label("@rules_rust//util/import/3rdparty/crates:BUILD.regex-syntax-0.6.27.bazel"),
+ urls = ["https://crates.io/api/v1/crates/regex-syntax/0.6.28/download"],
+ strip_prefix = "regex-syntax-0.6.28",
+ build_file = Label("@rules_rust//util/import/3rdparty/crates:BUILD.regex-syntax-0.6.28.bazel"),
)
maybe(
@@ -529,12 +533,12 @@
maybe(
http_archive,
- name = "rules_rust_util_import__unicode-xid-0.2.3",
- sha256 = "957e51f3646910546462e67d5f7599b9e4fb8acdd304b087a6494730f9eebf04",
+ name = "rules_rust_util_import__unicode-xid-0.2.4",
+ sha256 = "f962df74c8c05a667b5ee8bcf162993134c104e96440b663c8daa176dc772d8c",
type = "tar.gz",
- urls = ["https://crates.io/api/v1/crates/unicode-xid/0.2.3/download"],
- strip_prefix = "unicode-xid-0.2.3",
- build_file = Label("@rules_rust//util/import/3rdparty/crates:BUILD.unicode-xid-0.2.3.bazel"),
+ urls = ["https://crates.io/api/v1/crates/unicode-xid/0.2.4/download"],
+ strip_prefix = "unicode-xid-0.2.4",
+ build_file = Label("@rules_rust//util/import/3rdparty/crates:BUILD.unicode-xid-0.2.4.bazel"),
)
maybe(
diff --git a/util/import/BUILD.bazel b/util/import/BUILD.bazel
index 898a82f..5e83a6c 100644
--- a/util/import/BUILD.bazel
+++ b/util/import/BUILD.bazel
@@ -42,6 +42,8 @@
name = "import_internal_test",
crate = ":import_internal",
edition = "2018",
+ # TODO: https://github.com/bazelbuild/rules_rust/issues/1672
+ tags = ["manual"],
deps = [
"//util/import/3rdparty/crates:quickcheck",
],
diff --git a/util/import/import_internal.rs b/util/import/import_internal.rs
index 8b6e061..eb4350c 100644
--- a/util/import/import_internal.rs
+++ b/util/import/import_internal.rs
@@ -21,8 +21,8 @@
/// A special case of label::Label, which must be absolute and must not specify
/// a repository.
-#[derive(Debug, PartialEq)]
-struct AbsoluteLabel<'s> {
+#[derive(Debug, PartialEq, Eq)]
+pub struct AbsoluteLabel<'s> {
package_name: &'s str,
name: &'s str,
}
@@ -30,7 +30,7 @@
impl<'s> AbsoluteLabel<'s> {
/// Parses a string as an absolute Bazel label. Labels must be for the
/// current repository.
- fn parse(label: &'s str, span: &'s Span) -> Result<Self> {
+ pub fn parse(label: &'s str, span: &'s Span) -> Result<Self> {
if let Ok(label::Label {
repository_name: None,
package_name: Some(package_name),
@@ -63,7 +63,7 @@
}
/// Returns the full crate name, encoded if necessary.
- fn crate_name(&self, mode: &Mode) -> String {
+ pub fn crate_name(&self, mode: &Mode) -> String {
if self.should_rename(mode) {
encode(&format!("{}:{}", self.package_name, self.name))
} else {
diff --git a/util/label/label.rs b/util/label/label.rs
index 22d2bb4..fc6469d 100644
--- a/util/label/label.rs
+++ b/util/label/label.rs
@@ -26,7 +26,7 @@
Ok(Label::new(repository_name, package_name, name))
}
-#[derive(Debug, PartialEq)]
+#[derive(Debug, PartialEq, Eq)]
pub struct Label<'s> {
pub repository_name: Option<&'s str>,
pub package_name: Option<&'s str>,
@@ -148,11 +148,12 @@
|| c == '('
|| c == ')'
|| c == '_'
+ || c == '+'
}) {
return Err(LabelError(err(
label,
"package names may contain only A-Z, \
- a-z, 0-9, '/', '-', '.', ' ', '$', '(', ')' and '_'.",
+ a-z, 0-9, '/', '-', '.', ' ', '$', '(', ')', '_', and '+'.",
)));
}
if package_name.ends_with('/') {
@@ -338,7 +339,7 @@
analyze("//bar#:baz"),
Err(LabelError(
"//bar#:baz must be a legal label; package names may contain only A-Z, \
- a-z, 0-9, '/', '-', '.', ' ', '$', '(', ')' and '_'."
+ a-z, 0-9, '/', '-', '.', ' ', '$', '(', ')', '_', and '+'."
.to_string()
))
);
@@ -421,6 +422,12 @@
vec!["foo", "bar"]
);
+ // Plus (+) is valid in packages
+ assert_eq!(
+ analyze("@repo//foo/bar+baz:qaz")?.packages(),
+ vec!["foo", "bar+baz"]
+ );
+
Ok(())
}
}
diff --git a/util/label/label_error.rs b/util/label/label_error.rs
index b1d7199..ae55b76 100644
--- a/util/label/label_error.rs
+++ b/util/label/label_error.rs
@@ -1,4 +1,4 @@
-#[derive(Debug, PartialEq)]
+#[derive(Debug, PartialEq, Eq)]
pub struct LabelError(pub String);
impl std::fmt::Display for LabelError {
diff --git a/util/process_wrapper/flags.rs b/util/process_wrapper/flags.rs
index d3d6fe5..dca3a14 100644
--- a/util/process_wrapper/flags.rs
+++ b/util/process_wrapper/flags.rs
@@ -30,10 +30,10 @@
impl fmt::Display for FlagParseError {
fn fmt(&self, f: &mut fmt::Formatter) -> fmt::Result {
match self {
- Self::UnknownFlag(ref flag) => write!(f, "unknown flag \"{}\"", flag),
- Self::ValueMissing(ref flag) => write!(f, "flag \"{}\" missing parameter(s)", flag),
+ Self::UnknownFlag(ref flag) => write!(f, "unknown flag \"{flag}\""),
+ Self::ValueMissing(ref flag) => write!(f, "flag \"{flag}\" missing parameter(s)"),
Self::ProvidedMultipleTimes(ref flag) => {
- write!(f, "flag \"{}\" can only appear once", flag)
+ write!(f, "flag \"{flag}\" can only appear once")
}
Self::ProgramNameMissing => {
write!(f, "program name (argv[0]) missing")
@@ -133,12 +133,11 @@
let mut help_text = String::new();
writeln!(
&mut help_text,
- "Help for {}: [options] -- [extra arguments]",
- program_name
+ "Help for {program_name}: [options] -- [extra arguments]"
)
.unwrap();
for line in all {
- writeln!(&mut help_text, "\t{}", line).unwrap();
+ writeln!(&mut help_text, "\t{line}").unwrap();
}
help_text
}
diff --git a/util/process_wrapper/options.rs b/util/process_wrapper/options.rs
index 869b5c3..472c4f4 100644
--- a/util/process_wrapper/options.rs
+++ b/util/process_wrapper/options.rs
@@ -1,6 +1,8 @@
use std::collections::HashMap;
use std::env;
use std::fmt;
+use std::fs::File;
+use std::io::{self, Write};
use std::process::exit;
use crate::flags::{FlagParseError, Flags, ParseOutcome};
@@ -16,8 +18,8 @@
impl fmt::Display for OptionError {
fn fmt(&self, f: &mut fmt::Formatter) -> fmt::Result {
match self {
- Self::FlagError(e) => write!(f, "error parsing flags: {}", e),
- Self::Generic(s) => write!(f, "{}", s),
+ Self::FlagError(e) => write!(f, "error parsing flags: {e}"),
+ Self::Generic(s) => write!(f, "{s}"),
}
}
}
@@ -110,13 +112,13 @@
.map_err(OptionError::FlagError)?
{
ParseOutcome::Help(help) => {
- eprintln!("{}", help);
+ eprintln!("{help}");
exit(0);
}
ParseOutcome::Parsed(p) => p,
};
let current_dir = std::env::current_dir()
- .map_err(|e| OptionError::Generic(format!("failed to get current directory: {}", e)))?
+ .map_err(|e| OptionError::Generic(format!("failed to get current directory: {e}")))?
.to_str()
.ok_or_else(|| OptionError::Generic("current directory not utf-8".to_owned()))?
.to_owned();
@@ -125,7 +127,7 @@
.into_iter()
.map(|arg| {
let (key, val) = arg.split_once('=').ok_or_else(|| {
- OptionError::Generic(format!("empty key for substitution '{}'", arg))
+ OptionError::Generic(format!("empty key for substitution '{arg}'"))
})?;
let v = if val == "${pwd}" {
current_dir.as_str()
@@ -155,8 +157,7 @@
let copy_dest = &co[1];
if copy_source == copy_dest {
return Err(OptionError::Generic(format!(
- "\"--copy-output\" source ({}) and dest ({}) need to be different.",
- copy_source, copy_dest
+ "\"--copy-output\" source ({copy_source}) and dest ({copy_dest}) need to be different.",
)));
}
Ok((copy_source.to_owned(), copy_dest.to_owned()))
@@ -169,8 +170,7 @@
"json" => Ok(rustc::ErrorFormat::Json),
"rendered" => Ok(rustc::ErrorFormat::Rendered),
_ => Err(OptionError::Generic(format!(
- "invalid --rustc-output-format '{}'",
- v
+ "invalid --rustc-output-format '{v}'",
))),
})
.transpose()?;
@@ -185,7 +185,7 @@
);
// Append all the arguments fetched from files to those provided via command line.
child_args.append(&mut file_arguments);
- let child_args = prepare_args(child_args, &subst_mappings);
+ let child_args = prepare_args(child_args, &subst_mappings)?;
// Split the executable path from the rest of the arguments.
let (exec_path, args) = child_args.split_first().ok_or_else(|| {
OptionError::Generic(
@@ -234,15 +234,66 @@
Ok(env_vars)
}
-fn prepare_args(mut args: Vec<String>, subst_mappings: &[(String, String)]) -> Vec<String> {
+fn prepare_arg(mut arg: String, subst_mappings: &[(String, String)]) -> String {
for (f, replace_with) in subst_mappings {
- for arg in args.iter_mut() {
- let from = format!("${{{}}}", f);
- let new = arg.replace(from.as_str(), replace_with);
- *arg = new;
- }
+ let from = format!("${{{f}}}");
+ arg = arg.replace(&from, replace_with);
}
- args
+ arg
+}
+
+/// Apply substitutions to the given param file. Returns the new filename.
+fn prepare_param_file(
+ filename: &str,
+ subst_mappings: &[(String, String)],
+) -> Result<String, OptionError> {
+ let expanded_file = format!("{filename}.expanded");
+ let format_err = |err: io::Error| {
+ OptionError::Generic(format!(
+ "{} writing path: {:?}, current directory: {:?}",
+ err,
+ expanded_file,
+ std::env::current_dir()
+ ))
+ };
+ let mut out = io::BufWriter::new(File::create(&expanded_file).map_err(format_err)?);
+ fn process_file(
+ filename: &str,
+ out: &mut io::BufWriter<File>,
+ subst_mappings: &[(String, String)],
+ format_err: &impl Fn(io::Error) -> OptionError,
+ ) -> Result<(), OptionError> {
+ for arg in read_file_to_array(filename).map_err(OptionError::Generic)? {
+ let arg = prepare_arg(arg, subst_mappings);
+ if let Some(arg_file) = arg.strip_prefix('@') {
+ process_file(arg_file, out, subst_mappings, format_err)?;
+ } else {
+ writeln!(out, "{arg}").map_err(format_err)?;
+ }
+ }
+ Ok(())
+ }
+ process_file(filename, &mut out, subst_mappings, &format_err)?;
+ Ok(expanded_file)
+}
+
+/// Apply substitutions to the provided arguments, recursing into param files.
+fn prepare_args(
+ args: Vec<String>,
+ subst_mappings: &[(String, String)],
+) -> Result<Vec<String>, OptionError> {
+ args.into_iter()
+ .map(|arg| {
+ let arg = prepare_arg(arg, subst_mappings);
+ if let Some(param_file) = arg.strip_prefix('@') {
+ // Note that substitutions may also apply to the param file path!
+ prepare_param_file(param_file, subst_mappings)
+ .map(|filename| format!("@{filename}"))
+ } else {
+ Ok(arg)
+ }
+ })
+ .collect()
}
fn environment_block(
@@ -260,14 +311,14 @@
environment_variables.extend(environment_file_block.into_iter());
for (f, replace_with) in &[stable_stamp_mappings, volatile_stamp_mappings].concat() {
for value in environment_variables.values_mut() {
- let from = format!("{{{}}}", f);
+ let from = format!("{{{f}}}");
let new = value.replace(from.as_str(), replace_with);
*value = new;
}
}
for (f, replace_with) in subst_mappings {
for value in environment_variables.values_mut() {
- let from = format!("${{{}}}", f);
+ let from = format!("${{{f}}}");
let new = value.replace(from.as_str(), replace_with);
*value = new;
}
diff --git a/util/process_wrapper/rustc.rs b/util/process_wrapper/rustc.rs
index ca79680..67b75f9 100644
--- a/util/process_wrapper/rustc.rs
+++ b/util/process_wrapper/rustc.rs
@@ -66,9 +66,12 @@
/// according to the original --error-format supplied.
/// Only messages are returned, emits are ignored.
pub(crate) fn process_json(line: String, error_format: ErrorFormat) -> LineOutput {
- let parsed: JsonValue = line
- .parse()
- .expect("process wrapper error: expected json messages in pipeline mode");
+ let parsed: JsonValue = line.parse().unwrap_or_else(|_| {
+ panic!(
+ "process wrapper error: expected json messages in pipeline mode while parsing: {:?}",
+ &line
+ )
+ });
match parsed.try_into() {
Ok(RustcMessage::Message(msg)) => match error_format {
// If the output should be json, we just forward the messages as-is
@@ -91,10 +94,12 @@
error_format: ErrorFormat,
kill: &mut bool,
) -> LineOutput {
- let parsed: JsonValue = line
- .parse()
- .expect("process wrapper error: expected json messages in pipeline mode");
-
+ let parsed: JsonValue = line.parse().unwrap_or_else(|_| {
+ panic!(
+ "process wrapper error: expected json messages in pipeline mode while parsing: {:?}",
+ &line
+ )
+ });
match parsed.try_into() {
Ok(RustcMessage::Emit(emit)) if emit == "metadata" => {
*kill = true;
diff --git a/util/process_wrapper/util.rs b/util/process_wrapper/util.rs
index 89f2ded..9bb6693 100644
--- a/util/process_wrapper/util.rs
+++ b/util/process_wrapper/util.rs
@@ -72,7 +72,7 @@
.map(|l| {
let (s1, s2) = l
.split_once(' ')
- .ok_or_else(|| format!("wrong workspace status file format for \"{}\"", l))?;
+ .ok_or_else(|| format!("wrong workspace status file format for \"{l}\""))?;
Ok((s1.to_owned(), s2.to_owned()))
})
.collect()