diff options
| author | bors-servo <lbergstrom+bors@mozilla.com> | 2019-10-04 16:37:24 -0400 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2019-10-04 16:37:24 -0400 |
| commit | c94ca298ca7b1ca8ff537e00c2e94cc814a4b227 (patch) | |
| tree | 7a94b2e290123658d57f57048e2cc0fc52dec85e /components/script/dom/htmlvideoelement.rs | |
| parent | 86efbe30ca2f228fcfcd7798ef2c7d2ce0150509 (diff) | |
| parent | 0ce8cf9e2eb1dd5df6b7e821f453d93d580d36ef (diff) | |
| download | servo-c94ca298ca7b1ca8ff537e00c2e94cc814a4b227.tar.gz servo-c94ca298ca7b1ca8ff537e00c2e94cc814a4b227.zip | |
Auto merge of #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.
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 -->
Diffstat (limited to 'components/script/dom/htmlvideoelement.rs')
0 files changed, 0 insertions, 0 deletions