Skip to content

Commit c7c5980

Browse files
authored
Rollup merge of #97228 - jonhoo:patch-1, r=bjorn3
Omit stdarch workspace from rust-src The path `library/stdarch/crates/Cargo.toml` does not exist. In Rust 1.61.0, `rust-src` still includes `src/rust/library/stdarch/Cargo.toml` (but not `stdarch-verify`), which includes ```toml [workspace] members = [ "crates/stdarch-verify" ``` This didn't show up when testing with `-Zbuild-std` in #94907 since the [standard list of crates](https://github.com/rust-lang/cargo/blob/f624095e1c98228a74a165ddb702078c0dd8b81e/src/cargo/core/compiler/standard_lib.rs#L26-L30) to include when building `std` does not include `stdarch`, but it will show up if a user explicitly requests `stdarch`. Or, perhaps more importantly, because of #95736, many editors (like IntelliJ) won't treat the root of `rust-src` as a workspace, and will instead recurse into all the sub-crates directly, which then includes `stdarch`. Also related to #94906.
2 parents d22ebf0 + 8812603 commit c7c5980

File tree

1 file changed

+1
-1
lines changed

1 file changed

+1
-1
lines changed

src/bootstrap/dist.rs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -814,7 +814,7 @@ impl Step for Src {
814814
"library/backtrace/crates",
815815
// these are 30MB combined and aren't necessary for building
816816
// the standard library.
817-
"library/stdarch/crates/Cargo.toml",
817+
"library/stdarch/Cargo.toml",
818818
"library/stdarch/crates/stdarch-verify",
819819
"library/stdarch/crates/intrinsic-test",
820820
],

0 commit comments

Comments
 (0)