Skip to content

Commit

Permalink
Merge branch 'main' into feat-add-features-for-other-tls-types
Browse files Browse the repository at this point in the history
  • Loading branch information
ctrlaltf24 committed Sep 20, 2024
2 parents bc8f6d3 + 2ef32ec commit 4ea65ec
Show file tree
Hide file tree
Showing 3 changed files with 18 additions and 18 deletions.
28 changes: 14 additions & 14 deletions Cargo.lock

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

4 changes: 2 additions & 2 deletions engineio/Cargo.toml
Original file line number Diff line number Diff line change
Expand Up @@ -23,7 +23,7 @@ serde_json = "1.0"
http = "1.1.0"
tokio-tungstenite = { version = "0.21.0", features = [] }
tungstenite = "0.21.0"
tokio = "1.37.0"
tokio = "1.40.0"
futures-util = { version = "0.3", default-features = false, features = ["sink"] }
async-trait = "0.1.81"
async-stream = "0.3.5"
Expand All @@ -41,7 +41,7 @@ criterion = { version = "0.5.1", features = ["async_tokio"] }
lazy_static = "1.4.0"

[dev-dependencies.tokio]
version = "1.37.0"
version = "1.40.0"
# we need the `#[tokio::test]` macro
features = ["macros"]

Expand Down
4 changes: 2 additions & 2 deletions socketio/Cargo.toml
Original file line number Diff line number Diff line change
Expand Up @@ -23,7 +23,7 @@ adler32 = "1.2.0"
serde_json = "1.0"
thiserror = "1.0"
url = "2.5.2"
tokio = { version = "1.37.0", optional = true }
tokio = { version = "1.40.0", optional = true }
futures-util = { version = "0.3", default-features = false, features = ["sink"], optional = true }
async-stream = { version = "0.3.5", optional = true }
log = "0.4.22"
Expand All @@ -37,7 +37,7 @@ cargo-tarpaulin = "0.18.5"
serial_test = "3.0.0"

[dev-dependencies.tokio]
version = "1.37.0"
version = "1.40.0"
# we need the `#[tokio::test]` macro
features = ["macros", "rt-multi-thread"]

Expand Down

0 comments on commit 4ea65ec

Please sign in to comment.