Skip to content

fix: hack around libsysroot instead of libtest #12088

New issue

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

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

Already on GitHub? # to your account

Merged
merged 1 commit into from
May 5, 2023

Conversation

weihanglo
Copy link
Member

@weihanglo weihanglo commented May 5, 2023

This fix should be available starting from toolchain nightly-2023-05-05.

What does this PR try to resolve?

This is a fix in response to rust-lang/rust#108865.

Cargo -Zbuild-std now use sysroot crate to resolve cargo features instead
of the old hack around libtest. sysroot is just a dummy crate depending on
other standard library crates.

@rustbot rustbot added the S-waiting-on-review Status: Awaiting review from the assignee but also interested parties. label May 5, 2023
@epage
Copy link
Contributor

epage commented May 5, 2023

@bors r+

@bors
Copy link
Contributor

bors commented May 5, 2023

📌 Commit 3df35ed has been approved by epage

It is now in the queue for this repository.

@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 5, 2023
@bors
Copy link
Contributor

bors commented May 5, 2023

⌛ Testing commit 3df35ed with merge b0f118f...

@bors
Copy link
Contributor

bors commented May 5, 2023

☀️ Test successful - checks-actions
Approved by: epage
Pushing b0f118f to master...

@bors bors merged commit b0f118f into rust-lang:master May 5, 2023
@weihanglo weihanglo deleted the build-std-fix branch May 5, 2023 15:01
bors added a commit to rust-lang-ci/rust that referenced this pull request May 5, 2023
Update cargo

10 commits in ac84010322a31f4a581dafe26258aa4ac8dea9cd..569b648b5831ae8a515e90c80843a5287c3304ef
2023-05-02 13:41:16 +0000 to 2023-05-05 15:49:44 +0000
- xtask-unpublished: output a markdown table (rust-lang/cargo#12085)
- fix: hack around `libsysroot` instead of `libtest` (rust-lang/cargo#12088)
- Optimize usage under rustup. (rust-lang/cargo#11917)
- Update lock to normalize `home` dep (rust-lang/cargo#12084)
- fix:  doc-test failures (rust-lang/cargo#12055)
- feat(cargo-metadata): add `workspace_default_members` (rust-lang/cargo#11978)
- doc: clarify implications of `cargo-yank` (rust-lang/cargo#11862)
- chore: Use `[workspace.dependencies]` (rust-lang/cargo#12057)
- support for shallow clones and fetches with `gitoxide` (rust-lang/cargo#11840)
- Build by PackageIdSpec, not name, to avoid ambiguity (rust-lang/cargo#12015)

r? `@ghost`
@ehuss ehuss added this to the 1.71.0 milestone May 5, 2023
@mqudsi
Copy link

mqudsi commented May 6, 2023

Why not drop all of cargo/tests/testsuite/mock-std/library/test?

@weihanglo
Copy link
Member Author

Why not drop all of cargo/tests/testsuite/mock-std/library/test?

Why drop? We're trying to mock std here, and it makes the build depends on panic_unwind.

# for free to join this conversation on GitHub. Already have an account? # 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