Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Omit stdarch workspace from rust-src #97228

Merged
merged 1 commit into from
May 22, 2022
Merged

Omit stdarch workspace from rust-src #97228

merged 1 commit into from
May 22, 2022

Conversation

jonhoo
Copy link
Contributor

@jonhoo jonhoo commented May 20, 2022

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

[workspace]
members = [
  "crates/stdarch-verify"

This didn't show up when testing with -Zbuild-std in #94907 since the standard list of crates 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.

The path `library/stdarch/crates/Cargo.toml` does not exist.

This was introduced in rust-lang#94907.
@rust-highfive
Copy link
Collaborator

r? @Mark-Simulacrum

(rust-highfive has picked a reviewer for you, use r? to override)

@rust-highfive rust-highfive added the S-waiting-on-review Status: Awaiting review from the assignee but also interested parties. label May 20, 2022
@jonhoo
Copy link
Contributor Author

jonhoo commented May 20, 2022

Ah, should probably have filed this as a stable-to-stable regression, though it's likely to be very low impact I suspect.

@jonhoo
Copy link
Contributor Author

jonhoo commented May 21, 2022

r? @bjorn3

@bjorn3
Copy link
Member

bjorn3 commented May 21, 2022

@bors r+

@bors
Copy link
Contributor

bors commented May 21, 2022

📌 Commit 8812603 has been approved by bjorn3

@bors bors added S-waiting-on-bors Status: Waiting on bors to run and complete tests. Bors will change the label on completion. and removed S-waiting-on-review Status: Awaiting review from the assignee but also interested parties. labels May 21, 2022
bors added a commit to rust-lang-ci/rust that referenced this pull request May 22, 2022
Rollup of 6 pull requests

Successful merges:

 - rust-lang#97144 (Fix rusty grammar in `std::error::Reporter` docs)
 - rust-lang#97225 (Fix `Display` for `cell::{Ref,RefMut}`)
 - rust-lang#97228 (Omit stdarch workspace from rust-src)
 - rust-lang#97236 (Recover when resolution did not resolve lifetimes.)
 - rust-lang#97245 (Fix typo in futex RwLock::write_contended.)
 - rust-lang#97259 (Fix typo in Mir phase docs)

Failed merges:

r? `@ghost`
`@rustbot` modify labels: rollup
@bors bors merged commit c7c5980 into rust-lang:master May 22, 2022
@rustbot rustbot added this to the 1.63.0 milestone May 22, 2022
@jonhoo jonhoo deleted the patch-1 branch May 26, 2022 16:38
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
S-waiting-on-bors Status: Waiting on bors to run and complete tests. Bors will change the label on completion.
Projects
None yet
Development

Successfully merging this pull request may close these issues.

6 participants