Auto merge of #24334 - servo:new-manifest-format, r=jdm

Browse source

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.

https://github.com/rust-lang/rust/pull/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 -->

...

This commit is contained in:

bors-servo 2019-10-04 16:37:24 -04:00 • committed by GitHub

parent 86efbe30ca 0ce8cf9e2e

commit c94ca298ca

No known key found for this signature in database

GPG key ID: 4AEE18F83AFDEB23

1 changed files with 2723 additions and 2763 deletions

Show all changes Ignore whitespace when comparing lines Ignore changes in amount of whitespace Ignore changes in whitespace at EOL

Download patch file Download diff file Expand all files Collapse all files

5486

Cargo.lock generated

View file

File diff suppressed because it is too large Load diff