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/rust/private/repository_utils.bzl b/rust/private/repository_utils.bzl
index 86d3f78..1f5a01a 100644
--- a/rust/private/repository_utils.bzl
+++ b/rust/private/repository_utils.bzl
@@ -7,11 +7,22 @@
"system_to_dylib_ext",
"system_to_staticlib_ext",
"system_to_stdlib_linkflags",
- "triple_to_system",
)
+load("//rust/private:common.bzl", "DEFAULT_NIGHTLY_ISO_DATE")
DEFAULT_TOOLCHAIN_NAME_PREFIX = "toolchain_for"
DEFAULT_STATIC_RUST_URL_TEMPLATES = ["https://static.rust-lang.org/dist/{}.tar.gz"]
+DEFAULT_NIGHTLY_VERSION = "nightly/{}".format(DEFAULT_NIGHTLY_ISO_DATE)
+DEFAULT_EXTRA_TARGET_TRIPLES = ["wasm32-unknown-unknown", "wasm32-wasi"]
+
+TINYJSON_KWARGS = dict(
+ name = "rules_rust_tinyjson",
+ sha256 = "9ab95735ea2c8fd51154d01e39cf13912a78071c2d89abc49a7ef102a7dd725a",
+ url = "https://crates.io/api/v1/crates/tinyjson/2.5.1/download",
+ strip_prefix = "tinyjson-2.5.1",
+ type = "tar.gz",
+ build_file = "@rules_rust//util/process_wrapper:BUILD.tinyjson.bazel",
+)
_build_file_for_compiler_template = """\
filegroup(
@@ -51,12 +62,11 @@
Returns:
str: The contents of a BUILD file
"""
- system = triple_to_system(target_triple)
return _build_file_for_compiler_template.format(
- binary_ext = system_to_binary_ext(system),
- staticlib_ext = system_to_staticlib_ext(system),
- dylib_ext = system_to_dylib_ext(system),
- target_triple = target_triple,
+ binary_ext = system_to_binary_ext(target_triple.system),
+ staticlib_ext = system_to_staticlib_ext(target_triple.system),
+ dylib_ext = system_to_dylib_ext(target_triple.system),
+ target_triple = target_triple.str,
)
_build_file_for_cargo_template = """\
@@ -75,9 +85,8 @@
Returns:
str: The contents of a BUILD file
"""
- system = triple_to_system(target_triple)
return _build_file_for_cargo_template.format(
- binary_ext = system_to_binary_ext(system),
+ binary_ext = system_to_binary_ext(target_triple.system),
)
_build_file_for_rustfmt_template = """\
@@ -103,9 +112,8 @@
Returns:
str: The contents of a BUILD file
"""
- system = triple_to_system(target_triple)
return _build_file_for_rustfmt_template.format(
- binary_ext = system_to_binary_ext(system),
+ binary_ext = system_to_binary_ext(target_triple.system),
)
_build_file_for_clippy_template = """\
@@ -116,6 +124,26 @@
)
"""
+_build_file_for_rust_analyzer_proc_macro_srv = """\
+filegroup(
+ name = "rust_analyzer_proc_macro_srv",
+ srcs = ["libexec/rust-analyzer-proc-macro-srv{binary_ext}"],
+ visibility = ["//visibility:public"],
+)
+"""
+
+def BUILD_for_rust_analyzer_proc_macro_srv(exec_triple):
+ """Emits a BUILD file the rust_analyzer_proc_macro_srv archive.
+
+ Args:
+ exec_triple (str): The triple of the exec platform
+ Returns:
+ str: The contents of a BUILD file
+ """
+ return _build_file_for_rust_analyzer_proc_macro_srv.format(
+ binary_ext = system_to_binary_ext(exec_triple.system),
+ )
+
def BUILD_for_clippy(target_triple):
"""Emits a BUILD file the clippy archive.
@@ -125,8 +153,9 @@
Returns:
str: The contents of a BUILD file
"""
- system = triple_to_system(target_triple)
- return _build_file_for_clippy_template.format(binary_ext = system_to_binary_ext(system))
+ return _build_file_for_clippy_template.format(
+ binary_ext = system_to_binary_ext(target_triple.system),
+ )
_build_file_for_llvm_tools = """\
filegroup(
@@ -146,15 +175,14 @@
"""Emits a BUILD file the llvm-tools binaries.
Args:
- target_triple (str): The triple of the target platform
+ target_triple (struct): The triple of the target platform
Returns:
str: The contents of a BUILD file
"""
- system = triple_to_system(target_triple)
return _build_file_for_llvm_tools.format(
- binary_ext = system_to_binary_ext(system),
- target_triple = target_triple,
+ binary_ext = system_to_binary_ext(target_triple.system),
+ target_triple = target_triple.str,
)
_build_file_for_stdlib_template = """\
@@ -187,17 +215,16 @@
"""Emits a BUILD file the stdlib archive.
Args:
- target_triple (str): The triple of the target platform
+ target_triple (triple): The triple of the target platform
Returns:
str: The contents of a BUILD file
"""
- system = triple_to_system(target_triple)
return _build_file_for_stdlib_template.format(
- binary_ext = system_to_binary_ext(system),
- staticlib_ext = system_to_staticlib_ext(system),
- dylib_ext = system_to_dylib_ext(system),
- target_triple = target_triple,
+ binary_ext = system_to_binary_ext(target_triple.system),
+ staticlib_ext = system_to_staticlib_ext(target_triple.system),
+ dylib_ext = system_to_dylib_ext(target_triple.system),
+ target_triple = target_triple.str,
)
_build_file_for_rust_toolchain_template = """\
@@ -205,95 +232,98 @@
rust_toolchain(
name = "{toolchain_name}",
- rust_doc = "@{workspace_name}//:rustdoc",
- rust_std = "@{workspace_name}//:rust_std-{target_triple}",
- rustc = "@{workspace_name}//:rustc",
+ rust_doc = "//:rustdoc",
+ rust_std = "//:rust_std-{target_triple}",
+ rustc = "//:rustc",
rustfmt = {rustfmt_label},
- cargo = "@{workspace_name}//:cargo",
- clippy_driver = "@{workspace_name}//:clippy_driver_bin",
+ cargo = "//:cargo",
+ clippy_driver = "//:clippy_driver_bin",
llvm_cov = {llvm_cov_label},
llvm_profdata = {llvm_profdata_label},
- rustc_lib = "@{workspace_name}//:rustc_lib",
- rustc_srcs = {rustc_srcs},
+ rustc_lib = "//:rustc_lib",
allocator_library = {allocator_library},
+ global_allocator_library = {global_allocator_library},
binary_ext = "{binary_ext}",
staticlib_ext = "{staticlib_ext}",
dylib_ext = "{dylib_ext}",
stdlib_linkflags = [{stdlib_linkflags}],
- os = "{system}",
default_edition = "{default_edition}",
exec_triple = "{exec_triple}",
target_triple = "{target_triple}",
visibility = ["//visibility:public"],
+ extra_rustc_flags = {extra_rustc_flags},
+ extra_exec_rustc_flags = {extra_exec_rustc_flags},
)
"""
def BUILD_for_rust_toolchain(
- workspace_name,
name,
exec_triple,
target_triple,
- include_rustc_srcs,
allocator_library,
+ global_allocator_library,
default_edition,
include_rustfmt,
include_llvm_tools,
- stdlib_linkflags = None):
+ stdlib_linkflags = None,
+ extra_rustc_flags = None,
+ extra_exec_rustc_flags = None):
"""Emits a toolchain declaration to match an existing compiler and stdlib.
Args:
- workspace_name (str): The name of the workspace that this toolchain resides in
name (str): The name of the toolchain declaration
- exec_triple (str): The rust-style target that this compiler runs on
- target_triple (str): The rust-style target triple of the tool
- include_rustc_srcs (bool, optional): Whether to download rustc's src code. This is required in order to use rust-analyzer support. Defaults to False.
+ exec_triple (triple): The rust-style target that this compiler runs on
+ target_triple (triple): The rust-style target triple of the tool
allocator_library (str, optional): Target that provides allocator functions when rust_library targets are embedded in a cc_binary.
+ global_allocator_library (str, optional): Target that provides allocator functions when a global allocator is used with cc_common_link.
+ This target is only used in the target configuration; exec builds still use the symbols provided
+ by the `allocator_library` target.
default_edition (str): Default Rust edition.
include_rustfmt (bool): Whether rustfmt is present in the toolchain.
include_llvm_tools (bool): Whether llvm-tools are present in the toolchain.
stdlib_linkflags (list, optional): Overriden flags needed for linking to rust
stdlib, akin to BAZEL_LINKLIBS. Defaults to
None.
-
+ extra_rustc_flags (list, optional): Extra flags to pass to rustc in non-exec configuration.
+ extra_exec_rustc_flags (list, optional): Extra flags to pass to rustc in exec configuration.
Returns:
str: A rendered template of a `rust_toolchain` declaration
"""
- system = triple_to_system(target_triple)
if stdlib_linkflags == None:
- stdlib_linkflags = ", ".join(['"%s"' % x for x in system_to_stdlib_linkflags(system)])
+ stdlib_linkflags = ", ".join(['"%s"' % x for x in system_to_stdlib_linkflags(target_triple.system)])
- rustc_srcs = "None"
- if include_rustc_srcs:
- rustc_srcs = "\"@{workspace_name}//lib/rustlib/src:rustc_srcs\"".format(workspace_name = workspace_name)
rustfmt_label = "None"
if include_rustfmt:
- rustfmt_label = "\"@{workspace_name}//:rustfmt_bin\"".format(workspace_name = workspace_name)
+ rustfmt_label = "\"//:rustfmt_bin\""
llvm_cov_label = "None"
llvm_profdata_label = "None"
if include_llvm_tools:
- llvm_cov_label = "\"@{workspace_name}//:llvm_cov_bin\"".format(workspace_name = workspace_name)
- llvm_profdata_label = "\"@{workspace_name}//:llvm_profdata_bin\"".format(workspace_name = workspace_name)
+ llvm_cov_label = "\"//:llvm_cov_bin\""
+ llvm_profdata_label = "\"//:llvm_profdata_bin\""
allocator_library_label = "None"
if allocator_library:
allocator_library_label = "\"{allocator_library}\"".format(allocator_library = allocator_library)
+ global_allocator_library_label = "None"
+ if global_allocator_library:
+ global_allocator_library_label = "\"{global_allocator_library}\"".format(global_allocator_library = global_allocator_library)
return _build_file_for_rust_toolchain_template.format(
toolchain_name = name,
- workspace_name = workspace_name,
- binary_ext = system_to_binary_ext(system),
- staticlib_ext = system_to_staticlib_ext(system),
- dylib_ext = system_to_dylib_ext(system),
- rustc_srcs = rustc_srcs,
+ binary_ext = system_to_binary_ext(target_triple.system),
+ staticlib_ext = system_to_staticlib_ext(target_triple.system),
+ dylib_ext = system_to_dylib_ext(target_triple.system),
allocator_library = allocator_library_label,
+ global_allocator_library = global_allocator_library_label,
stdlib_linkflags = stdlib_linkflags,
- system = system,
default_edition = default_edition,
- exec_triple = exec_triple,
- target_triple = target_triple,
+ exec_triple = exec_triple.str,
+ target_triple = target_triple.str,
rustfmt_label = rustfmt_label,
llvm_cov_label = llvm_cov_label,
llvm_profdata_label = llvm_profdata_label,
+ extra_rustc_flags = extra_rustc_flags,
+ extra_exec_rustc_flags = extra_exec_rustc_flags,
)
_build_file_for_toolchain_template = """\
@@ -303,6 +333,7 @@
target_compatible_with = {target_constraint_sets_serialized},
toolchain = "{toolchain}",
toolchain_type = "{toolchain_type}",
+ {target_settings}
)
"""
@@ -310,133 +341,149 @@
name,
toolchain,
toolchain_type,
+ target_settings,
target_compatible_with,
exec_compatible_with):
+ target_settings_value = "target_settings = {},".format(json.encode(target_settings)) if target_settings else "# target_settings = []"
+
return _build_file_for_toolchain_template.format(
name = name,
- exec_constraint_sets_serialized = exec_compatible_with,
- target_constraint_sets_serialized = target_compatible_with,
+ exec_constraint_sets_serialized = json.encode(exec_compatible_with),
+ target_constraint_sets_serialized = json.encode(target_compatible_with),
toolchain = toolchain,
toolchain_type = toolchain_type,
+ target_settings = target_settings_value,
)
-def load_rustfmt(ctx):
+def load_rustfmt(ctx, target_triple, version, iso_date):
"""Loads a rustfmt binary and yields corresponding BUILD for it
Args:
- ctx (repository_ctx): The repository rule's context object
+ ctx (repository_ctx): The repository rule's context object.
+ target_triple (struct): The platform triple to download rustfmt for.
+ version (str): The version or channel of rustfmt.
+ iso_date (str): The date of the tool (or None, if the version is a specific version).
Returns:
str: The BUILD file contents for this rustfmt binary
"""
- target_triple = ctx.attr.exec_triple
load_arbitrary_tool(
ctx,
- iso_date = ctx.attr.iso_date,
+ iso_date = iso_date,
target_triple = target_triple,
tool_name = "rustfmt",
tool_subdirectories = ["rustfmt-preview"],
- version = ctx.attr.rustfmt_version,
+ version = version,
)
return BUILD_for_rustfmt(target_triple)
-def load_rust_compiler(ctx):
+def load_rust_compiler(ctx, iso_date, target_triple, version):
"""Loads a rust compiler and yields corresponding BUILD for it
Args:
ctx (repository_ctx): A repository_ctx.
+ iso_date (str): The date of the tool (or None, if the version is a specific version).
+ target_triple (struct): The Rust-style target that this compiler runs on.
+ version (str): The version of the tool among \"nightly\", \"beta\", or an exact version.
Returns:
str: The BUILD file contents for this compiler and compiler library
"""
- target_triple = ctx.attr.exec_triple
load_arbitrary_tool(
ctx,
- iso_date = ctx.attr.iso_date,
+ iso_date = iso_date,
target_triple = target_triple,
tool_name = "rustc",
tool_subdirectories = ["rustc"],
- version = ctx.attr.version,
+ version = version,
)
return BUILD_for_compiler(target_triple)
-def load_clippy(ctx):
+def load_clippy(ctx, iso_date, target_triple, version):
"""Loads Clippy and yields corresponding BUILD for it
Args:
ctx (repository_ctx): A repository_ctx.
+ iso_date (str): The date of the tool (or None, if the version is a specific version).
+ target_triple (struct): The Rust-style target that this compiler runs on.
+ version (str): The version of the tool among \"nightly\", \"beta\", or an exact version.
Returns:
str: The BUILD file contents for Clippy
"""
-
- target_triple = ctx.attr.exec_triple
load_arbitrary_tool(
ctx,
- iso_date = ctx.attr.iso_date,
+ iso_date = iso_date,
target_triple = target_triple,
tool_name = "clippy",
tool_subdirectories = ["clippy-preview"],
- version = ctx.attr.version,
+ version = version,
)
return BUILD_for_clippy(target_triple)
-def load_cargo(ctx):
+def load_cargo(ctx, iso_date, target_triple, version):
"""Loads Cargo and yields corresponding BUILD for it
Args:
ctx (repository_ctx): A repository_ctx.
+ iso_date (str): The date of the tool (or None, if the version is a specific version).
+ target_triple (struct): The Rust-style target that this compiler runs on.
+ version (str): The version of the tool among \"nightly\", \"beta\", or an exact version.
Returns:
str: The BUILD file contents for Cargo
"""
- target_triple = ctx.attr.exec_triple
load_arbitrary_tool(
ctx,
- iso_date = ctx.attr.iso_date,
+ iso_date = iso_date,
target_triple = target_triple,
tool_name = "cargo",
tool_subdirectories = ["cargo"],
- version = ctx.attr.version,
+ version = version,
)
return BUILD_for_cargo(target_triple)
-def should_include_rustc_srcs(repository_ctx):
- """Determing whether or not to include rustc sources in the toolchain.
+def includes_rust_analyzer_proc_macro_srv(version, iso_date):
+ """Determine whether or not the rust_analyzer_proc_macro_srv binary in available in the given version of Rust.
Args:
- repository_ctx (repository_ctx): The repository rule's context object
+ version (str): The version of the tool among \"nightly\", \"beta\", or an exact version.
+ iso_date (str): The date of the tool (or None, if the version is a specific version).
Returns:
- bool: Whether or not to include rustc source files in a `rustc_toolchain`
+ bool: Whether or not the binary is expected to be included
"""
- # The environment variable will always take precedence over the attribute.
- include_rustc_srcs_env = repository_ctx.os.environ.get("RULES_RUST_TOOLCHAIN_INCLUDE_RUSTC_SRCS")
- if include_rustc_srcs_env != None:
- return include_rustc_srcs_env.lower() in ["true", "1"]
+ if version == "nightly":
+ return iso_date >= "2022-09-21"
+ elif version == "beta":
+ return False
+ elif version >= "1.64.0":
+ return True
- return getattr(repository_ctx.attr, "include_rustc_srcs", False)
+ return False
-def load_rust_src(ctx, sha256 = ""):
+def load_rust_src(ctx, iso_date, version, sha256 = ""):
"""Loads the rust source code. Used by the rust-analyzer rust-project.json generator.
Args:
ctx (ctx): A repository_ctx.
+ version (str): The version of the tool among "nightly", "beta', or an exact version.
+ iso_date (str): The date of the tool (or None, if the version is a specific version).
sha256 (str): The sha256 value for the `rust-src` artifact
"""
- tool_suburl = produce_tool_suburl("rust-src", None, ctx.attr.version, ctx.attr.iso_date)
+ tool_suburl = produce_tool_suburl("rust-src", None, version, iso_date)
url = ctx.attr.urls[0].format(tool_suburl)
- tool_path = produce_tool_path("rust-src", None, ctx.attr.version)
- archive_path = tool_path + _get_tool_extension(ctx)
+ tool_path = produce_tool_path("rust-src", version, None)
+ archive_path = tool_path + _get_tool_extension(getattr(ctx.attr, "urls", None))
sha256 = sha256 or getattr(ctx.attr, "sha256s", {}).get(archive_path) or FILE_KEY_TO_SHA.get(archive_path) or ""
ctx.download_and_extract(
url,
@@ -460,14 +507,38 @@
rust_analyzer_toolchain(
name = "{name}",
+ proc_macro_srv = {proc_macro_srv},
+ rustc = "{rustc}",
rustc_srcs = "//lib/rustlib/src:rustc_srcs",
visibility = ["//visibility:public"],
)
"""
-def BUILD_for_rust_analyzer_toolchain(name):
+def BUILD_for_rust_analyzer_toolchain(name, rustc, proc_macro_srv):
return _build_file_for_rust_analyzer_toolchain_template.format(
name = name,
+ rustc = rustc,
+ proc_macro_srv = repr(proc_macro_srv),
+ )
+
+_build_file_for_rustfmt_toolchain_template = """\
+load("@rules_rust//rust:toolchain.bzl", "rustfmt_toolchain")
+
+rustfmt_toolchain(
+ name = "{name}",
+ rustfmt = "{rustfmt}",
+ rustc = "{rustc}",
+ rustc_lib = "{rustc_lib}",
+ visibility = ["//visibility:public"],
+)
+"""
+
+def BUILD_for_rustfmt_toolchain(name, rustfmt, rustc, rustc_lib):
+ return _build_file_for_rustfmt_toolchain_template.format(
+ name = name,
+ rustfmt = rustfmt,
+ rustc = rustc,
+ rustc_lib = rustc_lib,
)
def load_rust_stdlib(ctx, target_triple):
@@ -475,7 +546,7 @@
Args:
ctx (repository_ctx): A repository_ctx.
- target_triple (str): The rust-style target triple of the tool
+ target_triple (struct): The rust-style target triple of the tool
Returns:
str: The BUILD file contents for this stdlib
@@ -486,7 +557,7 @@
iso_date = ctx.attr.iso_date,
target_triple = target_triple,
tool_name = "rust-std",
- tool_subdirectories = ["rust-std-{}".format(target_triple)],
+ tool_subdirectories = ["rust-std-{}".format(target_triple.str)],
version = ctx.attr.version,
)
@@ -550,24 +621,24 @@
"""Produces a fully qualified Rust tool name for URL
Args:
- tool_name: The name of the tool per static.rust-lang.org
- target_triple: The rust-style target triple of the tool
- version: The version of the tool among "nightly", "beta', or an exact version.
- iso_date: The date of the tool (or None, if the version is a specific version).
+ tool_name (str): The name of the tool per `static.rust-lang.org`.
+ target_triple (struct): The rust-style target triple of the tool.
+ version (str): The version of the tool among "nightly", "beta', or an exact version.
+ iso_date (str): The date of the tool (or None, if the version is a specific version).
Returns:
str: The fully qualified url path for the specified tool.
"""
- path = produce_tool_path(tool_name, target_triple, version)
+ path = produce_tool_path(tool_name, version, target_triple)
return iso_date + "/" + path if (iso_date and version in ("beta", "nightly")) else path
-def produce_tool_path(tool_name, target_triple, version):
+def produce_tool_path(tool_name, version, target_triple = None):
"""Produces a qualified Rust tool name
Args:
- tool_name: The name of the tool per static.rust-lang.org
- target_triple: The rust-style target triple of the tool
- version: The version of the tool among "nightly", "beta', or an exact version.
+ tool_name (str): The name of the tool per static.rust-lang.org
+ version (str): The version of the tool among "nightly", "beta', or an exact version.
+ target_triple (struct, optional): The rust-style target triple of the tool
Returns:
str: The qualified path for the specified tool.
@@ -576,7 +647,37 @@
fail("No tool name was provided")
if not version:
fail("No tool version was provided")
- return "-".join([e for e in [tool_name, version, target_triple] if e])
+
+ # Not all tools require a triple. E.g. `rustc_src` (Rust source files for rust-analyzer).
+ platform_triple = None
+ if target_triple:
+ platform_triple = target_triple.str
+
+ return "-".join([e for e in [tool_name, version, platform_triple] if e])
+
+def lookup_tool_sha256(ctx, tool_name, target_triple, version, iso_date, sha256):
+ """Looks up the sha256 hash of a specific tool archive.
+
+ The lookup order is:
+
+ 1. The sha256s dict in the context attributes;
+ 2. The list of sha256 hashes populated in //rust:known_shas.bzl;
+ 3. The sha256 argument to the function
+
+ Args:
+ ctx (repository_ctx): A repository_ctx (no attrs required).
+ tool_name (str): The name of the given tool per the archive naming.
+ target_triple (struct): The rust-style target triple of the tool.
+ version (str): The version of the tool among "nightly", "beta', or an exact version.
+ iso_date (str): The date of the tool (ignored if the version is a specific version).
+ sha256 (str): The expected hash of hash of the Rust tool.
+
+ Returns:
+ str: The sha256 of the tool archive, or an empty string if the hash could not be found.
+ """
+ tool_suburl = produce_tool_suburl(tool_name, target_triple, version, iso_date)
+ archive_path = tool_suburl + _get_tool_extension(getattr(ctx.attr, "urls", None))
+ return getattr(ctx.attr, "sha256s", dict()).get(archive_path) or FILE_KEY_TO_SHA.get(archive_path) or sha256
def load_arbitrary_tool(ctx, tool_name, tool_subdirectories, version, iso_date, target_triple, sha256 = ""):
"""Loads a Rust tool, downloads, and extracts into the common workspace.
@@ -603,7 +704,7 @@
tool_subdirectories = ["clippy-preview", "rustc"]
version (str): The version of the tool among "nightly", "beta', or an exact version.
iso_date (str): The date of the tool (ignored if the version is a specific version).
- target_triple (str): The rust-style target triple of the tool
+ target_triple (struct): The rust-style target triple of the tool.
sha256 (str, optional): The expected hash of hash of the Rust tool. Defaults to "".
"""
check_version_valid(version, iso_date, param_prefix = tool_name + "_")
@@ -618,9 +719,9 @@
if new_url not in urls:
urls.append(new_url)
- tool_path = produce_tool_path(tool_name, target_triple, version)
- archive_path = tool_path + _get_tool_extension(ctx)
- sha256 = getattr(ctx.attr, "sha256s", dict()).get(archive_path) or FILE_KEY_TO_SHA.get(archive_path) or sha256
+ tool_path = produce_tool_path(tool_name, version, target_triple)
+
+ sha256 = lookup_tool_sha256(ctx, tool_name, target_triple, version, iso_date, sha256)
for subdirectory in tool_subdirectories:
# As long as the sha256 value is consistent accross calls here the
@@ -646,11 +747,118 @@
ret[url] = auth
return ret
-def _get_tool_extension(ctx):
- urls = getattr(ctx.attr, "urls", DEFAULT_STATIC_RUST_URL_TEMPLATES)
+def _get_tool_extension(urls = None):
+ if urls == None:
+ urls = DEFAULT_STATIC_RUST_URL_TEMPLATES
if urls[0][-7:] == ".tar.gz":
return ".tar.gz"
elif urls[0][-7:] == ".tar.xz":
return ".tar.xz"
else:
return ""
+
+def select_rust_version(versions):
+ """Select the highest priorty version for a list of Rust versions
+
+ Priority order: `stable > nightly > beta`
+
+ Note that duplicate channels are unexpected in `versions`.
+
+ Args:
+ versions (list): A list of Rust versions. E.g. [`1.66.0`, `nightly/2022-12-15`]
+
+ Returns:
+ str: The highest ranking value from `versions`
+ """
+ if not versions:
+ fail("No versions were provided")
+
+ current = versions[0]
+
+ for ver in versions:
+ if ver.startswith("beta"):
+ if current[0].isdigit() or current.startswith("nightly"):
+ continue
+ if current.startswith("beta") and ver > current:
+ current = ver
+ continue
+
+ current = ver
+ elif ver.startswith("nightly"):
+ if current[0].isdigit():
+ continue
+ if current.startswith("nightly") and ver > current:
+ current = ver
+ continue
+
+ current = ver
+
+ else:
+ current = ver
+
+ return current
+
+_build_file_for_toolchain_hub_template = """
+toolchain(
+ name = "{name}",
+ exec_compatible_with = {exec_constraint_sets_serialized},
+ target_compatible_with = {target_constraint_sets_serialized},
+ toolchain = "{toolchain}",
+ toolchain_type = "{toolchain_type}",
+ visibility = ["//visibility:public"],
+)
+"""
+
+def BUILD_for_toolchain_hub(
+ toolchain_names,
+ toolchain_labels,
+ toolchain_types,
+ target_compatible_with,
+ exec_compatible_with):
+ return "\n".join([_build_file_for_toolchain_hub_template.format(
+ name = toolchain_name,
+ exec_constraint_sets_serialized = json.encode(exec_compatible_with[toolchain_name]),
+ target_constraint_sets_serialized = json.encode(target_compatible_with[toolchain_name]),
+ toolchain = toolchain_labels[toolchain_name],
+ toolchain_type = toolchain_types[toolchain_name],
+ ) for toolchain_name in toolchain_names])
+
+def _toolchain_repository_hub_impl(repository_ctx):
+ repository_ctx.file("WORKSPACE.bazel", """workspace(name = "{}")""".format(
+ repository_ctx.name,
+ ))
+
+ repository_ctx.file("BUILD.bazel", BUILD_for_toolchain_hub(
+ toolchain_names = repository_ctx.attr.toolchain_names,
+ toolchain_labels = repository_ctx.attr.toolchain_labels,
+ toolchain_types = repository_ctx.attr.toolchain_types,
+ target_compatible_with = repository_ctx.attr.target_compatible_with,
+ exec_compatible_with = repository_ctx.attr.exec_compatible_with,
+ ))
+
+toolchain_repository_hub = repository_rule(
+ doc = (
+ "Generates a toolchain-bearing repository that declares a set of other toolchains from other " +
+ "repositories. This exists to allow registering a set of toolchains in one go with the `:all` target."
+ ),
+ attrs = {
+ "exec_compatible_with": attr.string_list_dict(
+ doc = "A list of constraints for the execution platform for this toolchain, keyed by toolchain name.",
+ mandatory = True,
+ ),
+ "target_compatible_with": attr.string_list_dict(
+ doc = "A list of constraints for the target platform for this toolchain, keyed by toolchain name.",
+ mandatory = True,
+ ),
+ "toolchain_labels": attr.string_dict(
+ doc = "The name of the toolchain implementation target, keyed by toolchain name.",
+ mandatory = True,
+ ),
+ "toolchain_names": attr.string_list(mandatory = True),
+ "toolchain_types": attr.string_dict(
+ doc = "The toolchain type of the toolchain to declare, keyed by toolchain name.",
+ mandatory = True,
+ ),
+ },
+ implementation = _toolchain_repository_hub_impl,
+)