diff options
| author | bors-servo <infra@servo.org> | 2023-05-22 08:29:20 +0200 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2023-05-22 08:29:20 +0200 |
| commit | 445420022981f77ee42992d8c8a445cc03fa13a7 (patch) | |
| tree | 889b42ddad0dd3948ec5e191355664ab1046957d | |
| parent | 4e61168d683e4d9c80d1cac40051b5a46876d3a3 (diff) | |
| parent | d532f47fa35c5704ae3ff62623988e9c2a8035c7 (diff) | |
| download | servo-445420022981f77ee42992d8c8a445cc03fa13a7.tar.gz servo-445420022981f77ee42992d8c8a445cc03fa13a7.zip | |
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. -->
| -rw-r--r-- | Cargo.lock | 14 |
1 files changed, 4 insertions, 10 deletions
diff --git a/Cargo.lock b/Cargo.lock index d96e8c5364f..28491a85a61 100644 --- a/Cargo.lock +++ b/Cargo.lock @@ -293,12 +293,6 @@ dependencies = [ [[package]] name = "base64" -version = "0.12.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "7d5ca2cd0adc3f48f9e9ea5a6bbdf9ccc0bfade884847e484d452414c7ccffb3" - -[[package]] -name = "base64" version = "0.13.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "904dfeac50f3cdaba28fc6f57fdcddb75f49ed61346676a78c4ffe55877802fd" @@ -5021,11 +5015,11 @@ dependencies = [ [[package]] name = "ron" -version = "0.6.0" +version = "0.6.6" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a91260f321dbf3b5a16ff91c451dc9eb644ce72775a6812f9c3dfffe63818f8f" +checksum = "86018df177b1beef6c7c8ef949969c4f7cb9a9344181b92486b23c79995bdaa4" dependencies = [ - "base64 0.12.0", + "base64 0.13.0", "bitflags", "serde", ] @@ -7236,7 +7230,7 @@ dependencies = [ "gfx-memory", "naga", "parking_lot 0.11.2", - "ron 0.6.0", + "ron 0.6.6", "serde", "smallvec", "thiserror", |