Auto merge of #29817 - atouchet:sha, r=jdm

De-dupe sha-1

<!-- 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: -->
- [ ] `./mach build -d` does not report any errors
- [ ] `./mach test-tidy` does not report any errors
- [ ] These changes fix #___ (GitHub issue number if applicable)

<!-- Either: -->
- [ ] There are tests for these changes OR
- [ ] These changes do not require tests because ___

<!-- 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-31 01:24:01 +02:00 committed by GitHub
commit e48cfb2ebe
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
2 changed files with 4 additions and 16 deletions

19
Cargo.lock generated
View file

@ -2608,9 +2608,9 @@ dependencies = [
[[package]]
name = "headers"
version = "0.3.7"
version = "0.3.8"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "4cff78e5788be1e0ab65b04d306b2ed5092c815ec97ec70f4ebd5aee158aa55d"
checksum = "f3e372db8e5c0d213e0cd0b9be18be2aca3d44cf2fe30a9d46a65581cd454584"
dependencies = [
"base64 0.13.0",
"bitflags",
@ -2619,7 +2619,7 @@ dependencies = [
"http",
"httpdate",
"mime",
"sha-1 0.10.1",
"sha1",
]
[[package]]
@ -5673,17 +5673,6 @@ dependencies = [
"opaque-debug",
]
[[package]]
name = "sha-1"
version = "0.10.1"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "f5058ada175748e33390e40e872bd0fe59a19f265d0158daa551c5a88a76009c"
dependencies = [
"cfg-if 1.0.0",
"cpufeatures",
"digest 0.10.6",
]
[[package]]
name = "sha1"
version = "0.10.5"
@ -7376,7 +7365,7 @@ dependencies = [
"mio 0.6.22",
"mio-extras",
"rand 0.7.3",
"sha-1 0.8.2",
"sha-1",
"slab",
"url",
]

View file

@ -71,7 +71,6 @@ packages = [
"block-buffer",
"digest",
"generic-array",
"sha-1",
# Duplicated by winit/surfman update.
"raw-window-handle",