From 8a440c9d5bc6b8bd573748691063bde8b95989e7 Mon Sep 17 00:00:00 2001 From: Josh Matthews Date: Mon, 4 Sep 2023 00:34:13 -0400 Subject: [PATCH] Upgrade tokio to 1.32.0. (#30286) * build(deps): bump tokio from 1.29.1 to 1.32.0 Bumps [tokio](https://github.com/tokio-rs/tokio) from 1.29.1 to 1.32.0. - [Release notes](https://github.com/tokio-rs/tokio/releases) - [Commits](https://github.com/tokio-rs/tokio/compare/tokio-1.29.1...tokio-1.32.0) --- updated-dependencies: - dependency-name: tokio dependency-type: direct:production update-type: version-update:semver-minor ... Signed-off-by: dependabot[bot] * Add ignored duplicate. --------- Signed-off-by: dependabot[bot] Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com> --- Cargo.lock | 19 ++++++++++++++----- servo-tidy.toml | 1 + 2 files changed, 15 insertions(+), 5 deletions(-) diff --git a/Cargo.lock b/Cargo.lock index 1bdcb995cd0..a51a71a2f80 100644 --- a/Cargo.lock +++ b/Cargo.lock @@ -2765,7 +2765,7 @@ dependencies = [ "httpdate", "itoa 1.0.1", "pin-project-lite", - "socket2", + "socket2 0.4.9", "tokio", "tower-service", "tracing", @@ -5763,6 +5763,16 @@ dependencies = [ "winapi", ] +[[package]] +name = "socket2" +version = "0.5.3" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "2538b18701741680e0322a2302176d3253a35388e2e62f172f64f4f16605f877" +dependencies = [ + "libc", + "windows-sys 0.48.0", +] + [[package]] name = "sparkle" version = "0.1.25" @@ -6268,18 +6278,17 @@ dependencies = [ [[package]] name = "tokio" -version = "1.29.1" +version = "1.32.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "532826ff75199d5833b9d2c5fe410f29235e25704ee5f0ef599fb51c21f4a4da" +checksum = "17ed6077ed6cd6c74735e21f37eb16dc3935f96878b1fe961074089cc80893f9" dependencies = [ - "autocfg", "backtrace", "bytes", "libc", "mio 0.8.8", "num_cpus", "pin-project-lite", - "socket2", + "socket2 0.5.3", "tokio-macros", "windows-sys 0.48.0", ] diff --git a/servo-tidy.toml b/servo-tidy.toml index 84ee23504f1..99234676d65 100644 --- a/servo-tidy.toml +++ b/servo-tidy.toml @@ -29,6 +29,7 @@ packages = [ "num-rational", "redox_syscall", "ron", + "socket2", "time", "wasi", "wayland-sys",