Skip to content

Commit c94ca29

Browse files
author
bors-servo
authored
Auto merge of servo#24334 - servo:new-manifest-format, r=jdm
Switch to the new Cargo.lock format The way the Cargo.lock file is encoded on stable Rust is quite unfriendly to Git when multiple pull requests change that file at the same time, how version numbers are everywhere and all checksums are in the same place often produces merge conflicts for nothing. This patch brings the new Cargo.lock format to Servo. rust-lang/rust#63579 The main caveat is that for now, cargo-tree and similar tools won't work anymore. I checked that the duplicate crate tidy check still does its job though. <!-- Reviewable:start --> --- This change is [<img src="https://reviewable.io/review_button.svg" height="34" align="absmiddle" alt="Reviewable"/>](https://reviewable.io/reviews/servo/servo/24334) <!-- Reviewable:end -->
2 parents 86efbe3 + 0ce8cf9 commit c94ca29

File tree

1 file changed

+2726
-2766
lines changed

1 file changed

+2726
-2766
lines changed

0 commit comments

Comments
 (0)