Skip to content

Update to lockfile version 2 #1017

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
Merged
merged 1 commit into from
Aug 31, 2020
Merged

Update to lockfile version 2 #1017

merged 1 commit into from
Aug 31, 2020

Conversation

Nemo157
Copy link
Member

@Nemo157 Nemo157 commented Aug 30, 2020

New nightly cargos are finally updating to v2 when they have to change the lockfile, so retaining compatibility with v1 requires bringing in cargo lock translate to convert it back to v1 (previously they would rewrite a v1 lockfile if the existing one was v1). This has been supported since around 1.39 so it shouldn't be a breaking change for anyone.

@jyn514
Copy link
Member

jyn514 commented Aug 30, 2020

How can I verify that this has the same dependencies as the original lockfile and cargo didn't bump the versions during the switch?

@jyn514
Copy link
Member

jyn514 commented Aug 30, 2020

Or alternatively, you could first make another PR running cargo update so that the lockfile cargo generates by default would match the one here.

@jyn514 jyn514 added the C-technical-debt Category: This makes the code harder to read and modify, but has no impact on end users label Aug 30, 2020
@Nemo157
Copy link
Member Author

Nemo157 commented Aug 30, 2020

you can git show 6d459cb | rg '\+version' to see that it doesn't change any of the version= lines

@Nemo157 Nemo157 mentioned this pull request Aug 30, 2020
Merged
@jyn514 jyn514 added the S-waiting-on-review Status: This pull request has been implemented and needs to be reviewed label Aug 30, 2020
@jyn514
Copy link
Member

jyn514 commented Aug 31, 2020 •
edited
Loading 

$ git show 6d459cb3ae4bb3378cdc7a816f463cf7a98aeb37 | grep '[+-]version'
- "unic-ucd-version 0.9.0 (registry+https://github.com/rust-lang/crates.io-index)",
+ "unic-ucd-version",
 name = "unic-ucd-version"
-"checksum unic-ucd-version 0.9.0 (registry+https://github.com/rust-lang/crates.io-index)" = "96bd2f2237fe450fcd0a1d2f5f4e91711124f7857ba2e964247776ebeeb7b0c4"

Looks good to me :)

@jyn514 jyn514 merged commit c304fcb into rust-lang:master Aug 31, 2020
@Nemo157 Nemo157 deleted the update-lockfile-format branch August 31, 2020 08:43
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers
No reviews
Assignees
No one assigned
Labels
C-technical-debt Category: This makes the code harder to read and modify, but has no impact on end users S-waiting-on-review Status: This pull request has been implemented and needs to be reviewed
Projects
None yet
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.
2 participants
@Nemo157 @jyn514