Auto merge of #29766 - atouchet:ron, r=mrobinson

De-dupe base64 0.12

<!-- Please describe your changes on the following line: -->

---
<!-- Thank you for contributing to Servo! Please replace each `[ ]` by `[X]` when the step is complete, and replace `___` with appropriate data: -->
- [x] `./mach build -d` does not report any errors
- [x] `./mach test-tidy` does not report any errors
- [x] These changes do not require tests because they are a Crates.lock change.

<!-- Also, please make sure that "Allow edits from maintainers" checkbox is checked, so that we can help you if you get stuck somewhere along the way.-->

<!-- Pull requests that do not address these steps are welcome, but they will require additional verification as part of the review process. -->
This commit is contained in:
bors-servo 2023-05-22 08:29:20 +02:00 committed by GitHub
commit 4454200229
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23

14
Cargo.lock generated
View file

@ -291,12 +291,6 @@ dependencies = [
"byteorder", "byteorder",
] ]
[[package]]
name = "base64"
version = "0.12.0"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "7d5ca2cd0adc3f48f9e9ea5a6bbdf9ccc0bfade884847e484d452414c7ccffb3"
[[package]] [[package]]
name = "base64" name = "base64"
version = "0.13.0" version = "0.13.0"
@ -5021,11 +5015,11 @@ dependencies = [
[[package]] [[package]]
name = "ron" name = "ron"
version = "0.6.0" version = "0.6.6"
source = "registry+https://github.com/rust-lang/crates.io-index" source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "a91260f321dbf3b5a16ff91c451dc9eb644ce72775a6812f9c3dfffe63818f8f" checksum = "86018df177b1beef6c7c8ef949969c4f7cb9a9344181b92486b23c79995bdaa4"
dependencies = [ dependencies = [
"base64 0.12.0", "base64 0.13.0",
"bitflags", "bitflags",
"serde", "serde",
] ]
@ -7236,7 +7230,7 @@ dependencies = [
"gfx-memory", "gfx-memory",
"naga", "naga",
"parking_lot 0.11.2", "parking_lot 0.11.2",
"ron 0.6.0", "ron 0.6.6",
"serde", "serde",
"smallvec", "smallvec",
"thiserror", "thiserror",