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

fix: std Cargo.lock moved to library dir #14370

Merged
merged 1 commit into from
Aug 8, 2024
Merged

Conversation

weihanglo
Copy link
Member

@weihanglo weihanglo commented Aug 8, 2024

#14358 didn't check the correct Cargo.lock existence
Perhaps it was there so the test passed,
but after a new nightly is out it is gone.

    Blocking waiting for file lock on package cache
error: "/home/user/.rustup/toolchains/nightly-aarch64-apple-darwin/lib/rustlib/src/rust/Cargo.lock" does not exist, unable to build with the standard library, try:
        rustup component add rust-src --toolchain nightly-aarch64-apple-darwin

note: run with `RUST_BACKTRACE=1` environment variable to display a backtrace

Fixes rust-lang/rust#128808

How to test the change:

The current nightly cargo 1.82.0-nightly (94977cb1f 2024-08-06) would fail when running

cargo +nightly build -Zbuild-std --target <host-triple>

After this fix, it should just work

RUSTC=~/.rustup/toolchains/nightly-<host-triple>/bin/rustc ./target/debug/cargo build -Zbuild-std --target <host-triple>

@weihanglo weihanglo added the Z-build-std Nightly: build-std label Aug 8, 2024
@rustbot
Copy link
Collaborator

rustbot commented Aug 8, 2024

r? @epage

rustbot has assigned @epage.
They will have a look at your PR within the next two weeks and either review your PR or reassign to another reviewer.

Use r? to explicitly pick a reviewer

@rustbot rustbot added the S-waiting-on-review Status: Awaiting review from the assignee but also interested parties. label Aug 8, 2024
rust-lang#14358 didn't check the correct Cargo.lock existence
Perhaps it was there so the test passed, but after a new nightly
is out it is gone.

```
    Blocking waiting for file lock on package cache
error: "/home/user/.rustup/toolchains/nightly-aarch64-apple-darwin/lib/rustlib/src/rust/Cargo.lock" does not exist, unable to build with the standard library, try:
        rustup component add rust-src --toolchain nightly-aarch64-apple-darwin

note: run with `RUST_BACKTRACE=1` environment variable to display a backtrace
```
@Muscraft
Copy link
Member

Muscraft commented Aug 8, 2024

@bors r+

@bors
Copy link
Collaborator

bors commented Aug 8, 2024

📌 Commit 50237f4 has been approved by Muscraft

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 Aug 8, 2024
@bors
Copy link
Collaborator

bors commented Aug 8, 2024

⌛ Testing commit 50237f4 with merge 0d8d22f...

@bors
Copy link
Collaborator

bors commented Aug 8, 2024

☀️ Test successful - checks-actions
Approved by: Muscraft
Pushing 0d8d22f to master...

@bors bors merged commit 0d8d22f into rust-lang:master Aug 8, 2024
22 checks passed
@weihanglo weihanglo deleted the build-std branch August 8, 2024 13:53
bors added a commit to rust-lang-ci/rust that referenced this pull request Aug 8, 2024
Update cargo

3 commits in 94977cb1fab003d45eb5bb108cb5e2fa0149672a..0d8d22f83b066503f6b2b755925197e959e58b4f
2024-08-06 21:42:10 +0000 to 2024-08-08 12:54:24 +0000
- fix: std Cargo.lock moved to `library` dir (rust-lang/cargo#14370)
- fix(vendor): Strip excluded build targets (rust-lang/cargo#14367)
- Infer registry (rust-lang/cargo#14340)

r? ghost
@rustbot rustbot added this to the 1.82.0 milestone Aug 9, 2024
github-merge-queue bot pushed a commit to model-checking/kani that referenced this pull request Aug 28, 2024
Upgrades toolchain to 08/28

Culprit upstream changes:
1. rust-lang/rust#128812
2. rust-lang/rust#128703
3. rust-lang/rust#127679
4. rust-lang/rust-clippy#12993
5. rust-lang/cargo#14370
6. rust-lang/rust#128806

Resolves #3429
By submitting this pull request, I confirm that my contribution is made
under the terms of the Apache 2.0 and MIT licenses.
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. Z-build-std Nightly: build-std
Projects
None yet
Development

Successfully merging this pull request may close these issues.

Can't -Zbuild-std in rustc 1.82.0-nightly (8b3870784 2024-08-07).
5 participants