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.

Sign up for GitHub

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

Jump to bottom

feat: make lockfile v4 the default #14595

Merged
merged 3 commits into from
Sep 25, 2024
Merged

feat: make lockfile v4 the default #14595

merged 3 commits into from
Sep 25, 2024
+92 −108

Conversation

weihanglo
Copy link
Member

What does this PR try to resolve?

This commit makes lockfile version 4 the default version when Cargo
tries to write to a lockfile.

The lockfile version 4 has been stabilized since 1.78.0,
and will become default in 1.83.0.
the length of transition period is pretty similar as before.

One caveat is that in other output from Cargo,
e.g., cargo metatada, status messages,
SourceID will display in the v4 URL encoded format.
This shouldn't affect the majority of Rust users,
as SourceId representation should be opaque to them,
unless comparing SourceId across different version of toolchains.

How should we test and review this PR?

Some of those tests don't really need to be version = 4.
They were updated for consistency.

Additional information

This was discussed in Cargo meeting on 2024-09-24.

@rustbot
Copy link
Collaborator

rustbot commented Sep 25, 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 A-dependency-resolution Area: dependency resolution and the resolver A-git Area: anything dealing with git A-manifest Area: Cargo.toml issues S-waiting-on-review Status: Awaiting review from the assignee but also interested parties. labels Sep 25, 2024
@weihanglo weihanglo added the A-lockfile Area: Cargo.lock issues label Sep 25, 2024
@weihanglo
feat: make lockfile v4 the default
5dfdd59 
This commit makes lockfile version 4 the default version when Cargo
tries to write to a lockfile.

The lockfile version 4 has been stabilized since 1.78.0,
and will become default in 1.83.0.
the length of transition period is pretty similar as before.

One caveat is that in other output from Cargo,
e.g., `cargo metatada`, status messages,
`SourceID` will display in the v4 URL encoded format.
This shouldn't affect the majority of Rust users,
as `SourceId` representation should be opaque to them,
unless comparing `SourceId` across different version of toolchains.
epage
epage approved these changes Sep 25, 2024
View reviewed changes
tests/testsuite/git.rs Show resolved Hide resolved
@epage
Copy link
Contributor

epage commented Sep 25, 2024

Also important to call out that we respect MSRV for this so we don't generate a lockfile you can't use.

@bors r+

@bors
Copy link
Contributor

bors commented Sep 25, 2024

📌 Commit 5dfdd59 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 Sep 25, 2024
bors added a commit that referenced this pull request Sep 25, 2024
@bors
Auto merge of #14595 - weihanglo:lockfile-v4, r=epage
5626292 
feat: make lockfile v4 the default

### What does this PR try to resolve?

This commit makes lockfile version 4 the default version when Cargo
tries to write to a lockfile.

The lockfile version 4 has been stabilized since 1.78.0,
and will become default in 1.83.0.
the length of transition period is pretty similar as before.

One caveat is that in other output from Cargo,
e.g., `cargo metatada`, status messages,
`SourceID` will display in the v4 URL encoded format.
This shouldn't affect the majority of Rust users,
as `SourceId` representation should be opaque to them,
unless comparing `SourceId` across different version of toolchains.

### How should we test and review this PR?

Some of those tests don't really need to be `version = 4`.
They were updated for consistency.

### Additional information

This was discussed in Cargo meeting on 2024-09-24.
@bors
Copy link
Contributor

bors commented Sep 25, 2024

⌛ Testing commit 5dfdd59 with merge 5626292...

@bors
Copy link
Contributor

bors commented Sep 25, 2024

💔 Test failed - checks-actions

@bors bors added S-waiting-on-review Status: Awaiting review from the assignee but also interested parties. and removed S-waiting-on-bors Status: Waiting on bors to run and complete tests. Bors will change the label on completion. labels Sep 25, 2024
@weihanglo
Copy link
Member Author 

curl: (28) Failed to connect to github.com port 443 after 135371 ms: Connection timed out

gzip: stdin: unexpected end of file
tar: Child returned status 1
tar: Error is not recoverable: exiting now

Network error.

@bors retry

@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 Sep 25, 2024
@bors
Copy link
Contributor

bors commented Sep 25, 2024

⌛ Testing commit 5dfdd59 with merge cf781da...

@bors
Copy link
Contributor

bors commented Sep 25, 2024

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

@bors bors merged commit cf781da into rust-lang:master Sep 25, 2024
24 checks passed
@weihanglo weihanglo mentioned this pull request Sep 27, 2024
Merged
bors added a commit to rust-lang-ci/rust that referenced this pull request Sep 28, 2024
@bors
Auto merge of rust-lang#130929 - weihanglo:update-cargo, r=weihanglo
1b6d674 
Update cargo

19 commits in eaee77dc1584be45949b75e4c4c9a841605e3a4b..80d82ca22abbee5fb7b51fa1abeb1ae34e99e88a
2024-09-19 21:10:23 +0000 to 2024-09-27 17:56:01 +0000
- Update cc to 1.1.22 (rust-lang/cargo#14607)
- feat: lockfile path implies --locked on cargo install (rust-lang/cargo#14556)
- feat(toml): Add `autolib` (rust-lang/cargo#14591)
- fix: correct error count for `cargo check --message-format json` (rust-lang/cargo#14598)
- test: relax panic output assertion (rust-lang/cargo#14602)
- feat(timings): support dark color scheme in HTML output (rust-lang/cargo#14588)
- feat: add CARGO_MANIFEST_PATH env variable (rust-lang/cargo#14404)
- fix(config): Don't double-warn about `$CARGO_HOME/config` (rust-lang/cargo#14579)
- fix(cargo-rustc): give trailing flags higher precedence on nightly (rust-lang/cargo#14587)
- feat: make lockfile v4 the default (rust-lang/cargo#14595)
- perf: Improve quality of completion performance traces (rust-lang/cargo#14592)
- test: Remove completion tests (rust-lang/cargo#14590)
- feat: Add support for completing `cargo update <TAB>` (rust-lang/cargo#14552)
- test: Migrate remaining with_stdout/with_stderr calls (rust-lang/cargo#14577)
- fix(resolve): Improve multi-MSRV workspaces (rust-lang/cargo#14569)
- chore: Bump MSRV to 1.81 (rust-lang/cargo#14585)
- Add a `--dry-run` flag to the `install` command (rust-lang/cargo#14280)
- fix(resolve): Don't list transitive, incompatible dependencies as available (rust-lang/cargo#14568)
- feat(complete): Upgrade clap_complete (rust-lang/cargo#14573)
@rustbot rustbot added this to the 1.83.0 milestone Sep 28, 2024
@dtolnay dtolnay mentioned this pull request Sep 29, 2024
Open
@YBoy-git YBoy-git mentioned this pull request Sep 29, 2024
Open
@lukaslueg lukaslueg mentioned this pull request Sep 30, 2024
Closed
@Manishearth Manishearth mentioned this pull request Oct 3, 2024
Merged
Manishearth added a commit to unicode-org/icu4x that referenced this pull request Oct 3, 2024
@Manishearth
Update pinned llvm-compat nightly to 2024-01-01 / LLVM 17 (#5647)
2de828c 
Fixes CI issues because test-c-tiny uses an old rustc that isn't able to
understand the lockfile updated by test-c
(rust-lang/cargo#14595).

We should also consider having the lockfiles cleaned between jobs.

<!--
Thank you for your pull request to ICU4X!

Reminder: try to use [Conventional
Comments](https://conventionalcomments.org/) to make comments clearer.

Please see
https://github.com/unicode-org/icu4x/blob/main/CONTRIBUTING.md for
general
information on contributing to ICU4X.
-->
@Manishearth Manishearth mentioned this pull request Oct 3, 2024
Merged
@vavakado vavakado mentioned this pull request Oct 3, 2024
Closed
Manishearth added a commit to unicode-org/icu4x that referenced this pull request Oct 4, 2024
@Manishearth
Reset tutorial lockfiles between ffi ci jobs (#5649)
52d7c0b 
This fixes the nightly CI failure on test-c and test-js that began in
[this CI
run](https://github.com/unicode-org/icu4x/actions/runs/11093290258/job/30819401664),
caused by rust-lang/cargo#14595.

Updating the pinned-LLVM Rust version past Apr/May 2024 will fix this
problem as well, but this is currently hard since that needs LLVM 18

<!--
Thank you for your pull request to ICU4X!

Reminder: try to use [Conventional
Comments](https://conventionalcomments.org/) to make comments clearer.

Please see
https://github.com/unicode-org/icu4x/blob/main/CONTRIBUTING.md for
general
information on contributing to ICU4X.
-->
@weihanglo weihanglo deleted the lockfile-v4 branch October 9, 2024 00:21
@nspin nspin mentioned this pull request Oct 28, 2024
Open
@epage epage mentioned this pull request Nov 4, 2024
Closed
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@epage epage epage approved these changes

Assignees

@epage epage

Labels
A-dependency-resolution Area: dependency resolution and the resolver A-git Area: anything dealing with git A-lockfile Area: Cargo.lock issues A-manifest Area: Cargo.toml issues S-waiting-on-bors Status: Waiting on bors to run and complete tests. Bors will change the label on completion.
Projects
None yet
Milestone
1.83.0
Development

Successfully merging this pull request may close these issues.
4 participants
@weihanglo @rustbot @epage @bors