Skip to content

Update lock to normalize home dep#12084

Merged
bors merged 1 commit into
rust-lang:masterfrom
ehuss:update-lock
May 4, 2023
Merged

Update lock to normalize home dep#12084
bors merged 1 commit into
rust-lang:masterfrom
ehuss:update-lock

Conversation

@ehuss

@ehuss ehuss commented May 4, 2023

Copy link
Copy Markdown
Contributor

I'm not sure what happened, but in #11840 Cargo.lock was updated in such a way that the home dependency had a qualified source, even though it was equivalent to crates.io. This should only happen if there is some ambiguity (like if something had a path source to the in-tree home).

This causes the Cargo.lock file to be modified whenever running cargo commands locally. This doesn't fail --locked because the resolve is equivalent, pointing to the the same source.

Closes #12082

@rustbot

rustbot commented May 4, 2023

Copy link
Copy Markdown
Collaborator

r? @epage

(rustbot has picked a reviewer for you, use r? to override)

@rustbot rustbot added the S-waiting-on-review Status: Awaiting review from the assignee but also interested parties. label May 4, 2023
@weihanglo

Copy link
Copy Markdown
Member

Thanks!

@bors r+

@bors

bors commented May 4, 2023

Copy link
Copy Markdown
Contributor

📌 Commit 5c99dc4 has been approved by weihanglo

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 4, 2023
@bors

bors commented May 4, 2023

Copy link
Copy Markdown
Contributor

⌛ Testing commit 5c99dc4 with merge 7d11844...

@bors

bors commented May 4, 2023

Copy link
Copy Markdown
Contributor

☀️ Test successful - checks-actions
Approved by: weihanglo
Pushing 7d11844 to master...

@bors bors merged commit 7d11844 into rust-lang:master May 4, 2023
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
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.

Cargo's CI is not validating that the Cargo.lock is up-to-date correctly.

5 participants