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

migrate to V2 Cargo.lock format #3346

Merged
merged 3 commits into from
Jun 10, 2020

Conversation

antiochp
Copy link
Member

This PR takes our recently updated Cargo.lock file and translates it to V2 format.

See here for context -
rust-lang/cargo#7070

Tool used for translation -
https://github.com/rustsec/cargo-lock

cargo lock translate > Cargo.lock2
mv Cargo.lock2 Cargo.lock

Cargo.lock in grin-wallet was updated in the recent past to V2 and this PR makes Cargo.lock here consistent with that.

V2 has been supported in cargo for a while now and was recently enabled as the default to be used for new projects. Even relatively old versions of cargo support this new version so we should be perfectly fine to switch over at this point.

tl;dr Cargo.lock V2 format should make merge conflicts far less of an ordeal going forward.

rust-lang/cargo#7070

This commit is an attempt to refine Cargo's lock file format to generate
less git merge conflicts for lock file updates as well as make it easier
to manage lock file updates. The new lock file format has a few major changes:

The [metadata] table is no longer used to track checksums. The
packages themselves now list checksum fields directly.

The entries in the dependencies key no longer unconditionally
mention the version/source of the dependency. When unambiguous only
the name or only the name/version are mentioned.

@antiochp antiochp added this to the 4.0.0 milestone Jun 10, 2020
@antiochp antiochp self-assigned this Jun 10, 2020
Copy link
Member

@quentinlesceller quentinlesceller left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Nice! Totally missed out that v1 and v2 Cargo.lock thing.

@antiochp
Copy link
Member Author

Nice! Totally missed out that v1 and v2 Cargo.lock thing.

I think this is a good time to do this, given we recently updated the dependencies themselves.

@antiochp antiochp merged commit 2223d9f into mimblewimble:master Jun 10, 2020
@antiochp antiochp deleted the migrate_to_cargo_lock_v2 branch June 10, 2020 21:21
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Projects
None yet
Development

Successfully merging this pull request may close these issues.

2 participants