Auto merge of #29420 - atouchet:tok, r=jdm

De-dupe mio 0.7

<!-- 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-02-26 04:33:56 +01:00 committed by GitHub
commit d31a6ccb5c
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23

56
Cargo.lock generated
View file

@ -2570,7 +2570,7 @@ dependencies = [
"http",
"indexmap",
"slab",
"tokio 1.15.0",
"tokio 1.25.0",
"tokio-util 0.6.9",
"tracing",
]
@ -2784,8 +2784,8 @@ dependencies = [
"httpdate 0.3.2",
"itoa 0.4.8",
"pin-project 1.0.2",
"socket2 0.4.2",
"tokio 1.15.0",
"socket2 0.4.7",
"tokio 1.25.0",
"tower-service",
"tracing",
"want",
@ -2804,7 +2804,7 @@ dependencies = [
"openssl",
"openssl-sys",
"parking_lot 0.12.0",
"tokio 1.15.0",
"tokio 1.25.0",
"tokio-openssl 0.6.3",
"tower-layer",
]
@ -3532,7 +3532,7 @@ dependencies = [
"string_cache",
"thin-slice",
"time",
"tokio 1.15.0",
"tokio 1.25.0",
"url",
"uuid",
"void",
@ -3750,19 +3750,6 @@ dependencies = [
"winapi",
]
[[package]]
name = "mio"
version = "0.7.14"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "8067b404fe97c70829f082dec8bcf4f71225d7eaea1d8645349cb76fa06205cc"
dependencies = [
"libc",
"log",
"miow",
"ntapi",
"winapi",
]
[[package]]
name = "mio"
version = "0.8.6"
@ -3998,7 +3985,7 @@ dependencies = [
"std_test_override",
"time",
"tokio 0.2.24",
"tokio 1.15.0",
"tokio 1.25.0",
"tokio-openssl 0.6.3",
"tokio-stream",
"tokio-test",
@ -4112,15 +4099,6 @@ dependencies = [
"minimal-lexical",
]
[[package]]
name = "ntapi"
version = "0.3.7"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "c28774a7fd2fbb4f0babd8237ce554b73af68021b5f695a3cebd6c59bac0980f"
dependencies = [
"winapi",
]
[[package]]
name = "num-complex"
version = "0.2.4"
@ -6093,9 +6071,9 @@ dependencies = [
[[package]]
name = "socket2"
version = "0.4.2"
version = "0.4.7"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "5dc90fe6c7be1a323296982db1836d1ea9e47b6839496dde9a541bc496df3516"
checksum = "02e2d2db9033d13a1567121ddd7a095ee144db4e1ca1b1bda3419bc0da294ebd"
dependencies = [
"libc",
"winapi",
@ -6641,18 +6619,20 @@ dependencies = [
[[package]]
name = "tokio"
version = "1.15.0"
version = "1.25.0"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "fbbf1c778ec206785635ce8ad57fe52b3009ae9e0c9f574a728f3049d3e55838"
checksum = "c8e00990ebabbe4c14c08aca901caed183ecd5c09562a12c824bb53d3c3fd3af"
dependencies = [
"autocfg",
"bytes 1.1.0",
"libc",
"memchr",
"mio 0.7.14",
"mio 0.8.6",
"num_cpus",
"pin-project-lite 0.2.8",
"socket2 0.4.7",
"tokio-macros 1.7.0",
"winapi",
"windows-sys 0.42.0",
]
[[package]]
@ -6696,7 +6676,7 @@ dependencies = [
"futures-util",
"openssl",
"openssl-sys",
"tokio 1.15.0",
"tokio 1.25.0",
]
[[package]]
@ -6707,7 +6687,7 @@ checksum = "f6edf2d6bc038a43d31353570e27270603f4648d18f5ed10c0e179abe43255af"
dependencies = [
"futures-core",
"pin-project-lite 0.2.8",
"tokio 1.15.0",
"tokio 1.25.0",
]
[[package]]
@ -6719,7 +6699,7 @@ dependencies = [
"async-stream",
"bytes 1.1.0",
"futures-core",
"tokio 1.15.0",
"tokio 1.25.0",
"tokio-stream",
]
@ -6748,7 +6728,7 @@ dependencies = [
"futures-sink",
"log",
"pin-project-lite 0.2.8",
"tokio 1.15.0",
"tokio 1.25.0",
]
[[package]]