Skip to content

Commit

Permalink
Convert Cargo.lock to new lock file format
Browse files Browse the repository at this point in the history
Since version 1.38.0 of Rust, Cargo has built in support for a new lock
file format that aims at reducing merge conflicts of unrelated changes.
Given that we require an even more recent version of Rust, it seems safe
to switch over to this new format (which by now is the default for new
projects anyway).
This patch changes the format of Cargo.lock accordingly.
  • Loading branch information
d-e-s-o committed Apr 16, 2020
1 parent ddeab1e commit 7db5473
Show file tree
Hide file tree
Showing 2 changed files with 90 additions and 91 deletions.
1 change: 1 addition & 0 deletions CHANGELOG.md
Original file line number Diff line number Diff line change
Expand Up @@ -2,6 +2,7 @@ Unreleased
----------
- Added bash completion support via `shell-complete` utility program
- Updated minimum required Rust version to `1.40.0`
- Converted `Cargo.lock` to new lock file format
- Bumped `libc` dependency to `0.2.69`
- Bumped `structopt` dependency to `0.3.13`
- Bumped various transitive dependencies to most recent versions
Expand Down
180 changes: 89 additions & 91 deletions Cargo.lock

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

0 comments on commit 7db5473

Please sign in to comment.