From 97eb506bb3fd0d6b01967c8d1cd06c19a8de3968 Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Thu, 15 Feb 2024 23:25:36 +0000
Subject: [PATCH] build(deps): Bump tokio from 1.35.1 to 1.36.0 in /rust
(#3561)
Bumps [tokio](https://github.com/tokio-rs/tokio) from 1.35.1 to 1.36.0.
Release notes
Sourced from tokio's
releases.
Tokio v1.36.0
1.36.0 (February 2nd, 2024)
Added
- io: add
tokio::io::Join (#6220)
- io: implement
AsyncWrite for Empty (#6235)
- net: add support for anonymous unix pipes (#6127)
- net: add
UnixSocket (#6290)
- net: expose keepalive option on
TcpSocket (#6311)
- sync: add
{Receiver,UnboundedReceiver}::poll_recv_many
(#6236)
- sync: add
Sender::{try_,}reserve_many (#6205)
- sync: add
watch::Receiver::mark_unchanged (#6252)
- task: add
JoinSet::try_join_next (#6280)
Changed
- io: make
copy cooperative (#6265)
- io: make
repeat and sink cooperative (#6254)
- io: simplify check for empty slice (#6293)
- process: use pidfd on Linux when available (#6152)
- sync: use AtomicBool in broadcast channel future (#6298)
Documented
- io: clarify
clear_ready docs (#6304)
- net: document that
*Fd traits on TcpSocket
are unix-only (#6294)
- sync: document FIFO behavior of
tokio::sync::Mutex (#6279)
- chore: typographic improvements (#6262)
- runtime: remove obsolete comment (#6303)
- task: fix typo (#6261)
#6220:
tokio-rs/tokio#6220
#6235:
tokio-rs/tokio#6235
#6127:
tokio-rs/tokio#6127
#6290:
tokio-rs/tokio#6290
#6311:
tokio-rs/tokio#6311
#6236:
tokio-rs/tokio#6236
#6205:
tokio-rs/tokio#6205
#6252:
tokio-rs/tokio#6252
#6280:
tokio-rs/tokio#6280
#6265:
tokio-rs/tokio#6265
#6254:
tokio-rs/tokio#6254
#6293:
tokio-rs/tokio#6293
#6238:
tokio-rs/tokio#6238
#6152:
tokio-rs/tokio#6152
#6298:
tokio-rs/tokio#6298
#6262:
tokio-rs/tokio#6262
#6303:
tokio-rs/tokio#6303
#6261:
tokio-rs/tokio#6261
... (truncated)
Commits
[](https://docs.github.com/en/github/managing-security-vulnerabilities/about-dependabot-security-updates#about-compatibility-scores)
Dependabot will resolve any conflicts with this PR as long as you don't
alter it yourself. You can also trigger a rebase manually by commenting
`@dependabot rebase`.
[//]: # (dependabot-automerge-start)
[//]: # (dependabot-automerge-end)
---
Dependabot commands and options
You can trigger Dependabot actions by commenting on this PR:
- `@dependabot rebase` will rebase this PR
- `@dependabot recreate` will recreate this PR, overwriting any edits
that have been made to it
- `@dependabot merge` will merge this PR after your CI passes on it
- `@dependabot squash and merge` will squash and merge this PR after
your CI passes on it
- `@dependabot cancel merge` will cancel a previously requested merge
and block automerging
- `@dependabot reopen` will reopen this PR if it is closed
- `@dependabot close` will close this PR and stop Dependabot recreating
it. You can achieve the same result by closing it manually
- `@dependabot show ignore conditions` will show all
of the ignore conditions of the specified dependency
- `@dependabot ignore major version` will close this
group update PR and stop Dependabot creating any more for the specific
dependency's major version (unless you unignore this specific
dependency's major version or upgrade to it yourself)
- `@dependabot ignore minor version` will close this
group update PR and stop Dependabot creating any more for the specific
dependency's minor version (unless you unignore this specific
dependency's minor version or upgrade to it yourself)
- `@dependabot ignore ` will close this group update PR
and stop Dependabot creating any more for the specific dependency
(unless you unignore this specific dependency or upgrade to it yourself)
- `@dependabot unignore ` will remove all of the ignore
conditions of the specified dependency
- `@dependabot unignore ` will
remove the ignore condition of the specified dependency and ignore
conditions
Signed-off-by: dependabot[bot]
Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
---
rust/Cargo.lock | 4 ++--
rust/connlib/clients/shared/Cargo.toml | 2 +-
rust/connlib/shared/Cargo.toml | 2 +-
rust/connlib/tunnel/Cargo.toml | 2 +-
rust/gateway/Cargo.toml | 2 +-
rust/phoenix-channel/Cargo.toml | 4 ++--
rust/relay/Cargo.toml | 2 +-
rust/windows-client/src-tauri/Cargo.toml | 2 +-
8 files changed, 10 insertions(+), 10 deletions(-)
diff --git a/rust/Cargo.lock b/rust/Cargo.lock
index c02d78d54..b910c14eb 100644
--- a/rust/Cargo.lock
+++ b/rust/Cargo.lock
@@ -6850,9 +6850,9 @@ checksum = "1f3ccbac311fea05f86f61904b462b55fb3df8837a366dfc601a0161d0532f20"
[[package]]
name = "tokio"
-version = "1.35.1"
+version = "1.36.0"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "c89b4efa943be685f629b149f53829423f8f5531ea21249408e8e2f8671ec104"
+checksum = "61285f6515fa018fb2d1e46eb21223fff441ee8db5d0f1435e8ab4f5cdb80931"
dependencies = [
"backtrace",
"bytes",
diff --git a/rust/connlib/clients/shared/Cargo.toml b/rust/connlib/clients/shared/Cargo.toml
index 89bee015b..35bdd582f 100644
--- a/rust/connlib/clients/shared/Cargo.toml
+++ b/rust/connlib/clients/shared/Cargo.toml
@@ -9,7 +9,7 @@ mock = ["connlib-shared/mock"]
[dependencies]
anyhow = "1.0.75"
-tokio = { version = "1.33", default-features = false, features = ["sync", "rt"] }
+tokio = { version = "1.36", default-features = false, features = ["sync", "rt"] }
tokio-util = "0.7.10"
secrecy = { workspace = true }
tracing = { workspace = true }
diff --git a/rust/connlib/shared/Cargo.toml b/rust/connlib/shared/Cargo.toml
index 324d460db..85c7fcf72 100644
--- a/rust/connlib/shared/Cargo.toml
+++ b/rust/connlib/shared/Cargo.toml
@@ -25,7 +25,7 @@ rand_core = { version = "0.6.4", default-features = false, features = ["std"] }
serde = { version = "1.0", default-features = false, features = ["derive", "std"] }
serde_json = { version = "1.0", default-features = false, features = ["std"] }
thiserror = { version = "1.0", default-features = false }
-tokio = { version = "1.33", default-features = false, features = ["rt", "rt-multi-thread"]}
+tokio = { version = "1.36", default-features = false, features = ["rt", "rt-multi-thread"]}
tokio-stream = { version = "0.1", features = ["time"] }
tokio-tungstenite = { version = "0.21", default-features = false, features = ["connect", "handshake", "rustls-tls-webpki-roots"] }
tracing = { workspace = true }
diff --git a/rust/connlib/tunnel/Cargo.toml b/rust/connlib/tunnel/Cargo.toml
index 68ae90956..285fa879f 100644
--- a/rust/connlib/tunnel/Cargo.toml
+++ b/rust/connlib/tunnel/Cargo.toml
@@ -7,7 +7,7 @@ edition = "2021"
[dependencies]
secrecy = { workspace = true }
async-trait = { version = "0.1", default-features = false }
-tokio = { version = "1.33", default-features = false, features = ["rt", "rt-multi-thread", "sync"] }
+tokio = { version = "1.36", default-features = false, features = ["rt", "rt-multi-thread", "sync"] }
thiserror = { version = "1.0", default-features = false }
rand_core = { version = "0.6", default-features = false, features = ["getrandom"] }
serde = { version = "1.0", default-features = false, features = ["derive", "std"] }
diff --git a/rust/gateway/Cargo.toml b/rust/gateway/Cargo.toml
index 7f85d1480..9564b001c 100644
--- a/rust/gateway/Cargo.toml
+++ b/rust/gateway/Cargo.toml
@@ -21,7 +21,7 @@ firezone-cli-utils = { workspace = true }
phoenix-channel = { workspace = true }
secrecy = { workspace = true }
serde = { version = "1.0", default-features = false, features = ["std", "derive"] }
-tokio = { version = "1.33", default-features = false, features = ["sync", "macros", "rt-multi-thread", "fs", "signal"] }
+tokio = { version = "1.36", default-features = false, features = ["sync", "macros", "rt-multi-thread", "fs", "signal"] }
tokio-tungstenite = { version = "0.21", default-features = false, features = ["connect", "handshake", "rustls-tls-webpki-roots"] }
tracing = { workspace = true }
tracing-subscriber = "0.3.17"
diff --git a/rust/phoenix-channel/Cargo.toml b/rust/phoenix-channel/Cargo.toml
index 5150aa4a2..42e6070fa 100644
--- a/rust/phoenix-channel/Cargo.toml
+++ b/rust/phoenix-channel/Cargo.toml
@@ -17,9 +17,9 @@ rand_core = "0.6.4"
url = "2.4.1"
serde_json = "1.0.108"
thiserror = "1.0.50"
-tokio = { version = "1.33.0", features = ["net", "time"] }
+tokio = { version = "1.36.0", features = ["net", "time"] }
backoff = "0.4.0"
anyhow = "1"
[dev-dependencies]
-tokio = { version = "1.33.0", features = ["macros", "rt"] }
+tokio = { version = "1.36.0", features = ["macros", "rt"] }
diff --git a/rust/relay/Cargo.toml b/rust/relay/Cargo.toml
index 64ca91a4c..d2c19eb3d 100644
--- a/rust/relay/Cargo.toml
+++ b/rust/relay/Cargo.toml
@@ -14,7 +14,7 @@ hex = "0.4.3"
hex-literal = "0.4.1"
rand = "0.8.5"
stun_codec = "0.3.4"
-tokio = { version = "1.33.0", features = ["macros", "rt-multi-thread", "net", "time"] }
+tokio = { version = "1.36.0", features = ["macros", "rt-multi-thread", "net", "time"] }
tracing = { workspace = true, features = ["log"] }
tracing-subscriber = { workspace = true, features = ["env-filter", "json", "fmt"] }
tracing-stackdriver = { version = "0.8.0", features = ["opentelemetry"] }
diff --git a/rust/windows-client/src-tauri/Cargo.toml b/rust/windows-client/src-tauri/Cargo.toml
index e5efeceb6..888d74444 100644
--- a/rust/windows-client/src-tauri/Cargo.toml
+++ b/rust/windows-client/src-tauri/Cargo.toml
@@ -36,7 +36,7 @@ serde_json = "1.0"
semver = { version = "1.0.21", features = ["serde"] }
subtle = "2.5.0"
thiserror = { version = "1.0", default-features = false }
-tokio = { version = "1.33.0", features = ["time"] }
+tokio = { version = "1.36.0", features = ["time"] }
tracing = { workspace = true }
tracing-log = "0.2"
tracing-subscriber = { version = "0.3.17", features = ["env-filter"] }