diff options
| author | Martin Robinson <mrobinson@igalia.com> | 2023-08-25 09:37:01 +0200 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2023-08-25 07:37:01 +0000 |
| commit | c0898c3a00878d9ac6a7994a8e2b2ae22d030ef1 (patch) | |
| tree | b0d962b91d5d2a53b2aa010b60bf5d88446b3944 | |
| parent | 21f426964b751ef198a9773e1daa0da7fc1f7072 (diff) | |
| download | servo-c0898c3a00878d9ac6a7994a8e2b2ae22d030ef1.tar.gz servo-c0898c3a00878d9ac6a7994a8e2b2ae22d030ef1.zip | |
Upgrade tokio and io-lifetimes (#30203)
This also adds a duplication exception for 'hermit-abi', which in
practice we never experience since it's platform-dependent.
| -rw-r--r-- | Cargo.lock | 35 | ||||
| -rw-r--r-- | servo-tidy.toml | 4 |
2 files changed, 25 insertions, 14 deletions
diff --git a/Cargo.lock b/Cargo.lock index 0053b595177..df1e2e55877 100644 --- a/Cargo.lock +++ b/Cargo.lock @@ -288,7 +288,7 @@ version = "0.2.14" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "d9b39be18770d11421cdb1b9947a45dd3f37e93092cbf377614828a319d5fee8" dependencies = [ - "hermit-abi", + "hermit-abi 0.1.19", "libc", "winapi", ] @@ -2666,14 +2666,20 @@ checksum = "95505c38b4572b2d910cecb0281560f54b440a19336cbbcb27bf6ce6adc6f5a8" [[package]] name = "hermit-abi" -version = "0.1.14" +version = "0.1.19" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b9586eedd4ce6b3c498bc3b4dd92fc9f11166aa908a914071953768066c67909" +checksum = "62b467343b94ba476dcb2500d242dadbb39557df889310ac77c5d99100aaac33" dependencies = [ "libc", ] [[package]] +name = "hermit-abi" +version = "0.3.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "443144c8cdadd93ebf52ddb4056d257f5b52c04d3c804e657d19eb73fc33668b" + +[[package]] name = "hex" version = "0.3.2" source = "registry+https://github.com/rust-lang/crates.io-index" @@ -2894,12 +2900,13 @@ dependencies = [ [[package]] name = "io-lifetimes" -version = "1.0.5" +version = "1.0.11" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "1abeb7a0dd0f8181267ff8adc397075586500b81b28a73e8a0208b00fc170fb3" +checksum = "eae7b9aee968036d54dce06cebaefd919e4472e753296daccd6d344e3e2df0c2" dependencies = [ + "hermit-abi 0.3.2", "libc", - "windows-sys 0.45.0", + "windows-sys 0.48.0", ] [[package]] @@ -4109,7 +4116,7 @@ version = "1.14.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "f6058e64324c71e02bc2b150e4f3bc8286db6c83092132ffa3f6b1eab0f9def5" dependencies = [ - "hermit-abi", + "hermit-abi 0.1.19", "libc", ] @@ -6299,31 +6306,31 @@ dependencies = [ [[package]] name = "tokio" -version = "1.26.0" +version = "1.29.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "03201d01c3c27a29c8a5cee5b55a93ddae1ccf6f08f65365c2c918f8c1b76f64" +checksum = "532826ff75199d5833b9d2c5fe410f29235e25704ee5f0ef599fb51c21f4a4da" dependencies = [ "autocfg", + "backtrace", "bytes", "libc", - "memchr", "mio 0.8.6", "num_cpus", "pin-project-lite", "socket2", "tokio-macros", - "windows-sys 0.45.0", + "windows-sys 0.48.0", ] [[package]] name = "tokio-macros" -version = "1.8.2" +version = "2.1.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d266c00fde287f55d3f1c3e96c500c362a2b8c695076ec180f27918820bc6df8" +checksum = "630bdcf245f78637c13ec01ffae6187cca34625e8c63150d424b59e55af2675e" dependencies = [ "proc-macro2", "quote", - "syn 1.0.103", + "syn 2.0.29", ] [[package]] diff --git a/servo-tidy.toml b/servo-tidy.toml index 2cc84585022..eab2152824d 100644 --- a/servo-tidy.toml +++ b/servo-tidy.toml @@ -36,6 +36,10 @@ packages = [ "wayland-sys", "bitflags", + # This dependency is for "hermit os" which Servo doesn't support. + # Theoretically, it's never fetched. + "hermit-abi", + # Duplicated by rustls and image. "spin", |