Skip to content

Commit

Permalink
Merge pull request #274 from udoprog/bump-dependencies
Browse files Browse the repository at this point in the history
Update dependencies and set rust-version
  • Loading branch information
daniel-abramov committed Apr 13, 2023
2 parents 498349d + aed9a08 commit db99615
Show file tree
Hide file tree
Showing 2 changed files with 17 additions and 16 deletions.
31 changes: 16 additions & 15 deletions Cargo.toml
Original file line number Diff line number Diff line change
Expand Up @@ -10,6 +10,7 @@ documentation = "https://docs.rs/tokio-tungstenite/0.18.0"
repository = "https://github.com/snapview/tokio-tungstenite"
version = "0.18.0"
edition = "2018"
rust-version = "1.63"
include = ["examples/**/*", "src/**/*", "LICENSE", "README.md", "CHANGELOG.md"]

[package.metadata.docs.rs]
Expand All @@ -27,49 +28,49 @@ __rustls-tls = ["rustls", "tokio-rustls", "stream", "tungstenite/__rustls-tls",
stream = []

[dependencies]
log = "0.4"
futures-util = { version = "0.3", default-features = false, features = ["sink", "std"] }
tokio = { version = "1.0.0", default-features = false, features = ["io-util"] }
log = "0.4.17"
futures-util = { version = "0.3.28", default-features = false, features = ["sink", "std"] }
tokio = { version = "1.27.0", default-features = false, features = ["io-util"] }

[dependencies.tungstenite]
version = "0.18.0"
version = "0.19.0"
default-features = false

[dependencies.native-tls-crate]
optional = true
package = "native-tls"
version = "0.2.7"
version = "0.2.11"

[dependencies.rustls]
optional = true
version = "0.20.0"
version = "0.21.0"

[dependencies.rustls-native-certs]
optional = true
version = "0.6.1"
version = "0.6.2"

[dependencies.tokio-native-tls]
optional = true
version = "0.3.0"
version = "0.3.1"

[dependencies.tokio-rustls]
optional = true
version = "0.23.0"
version = "0.24.0"

[dependencies.webpki]
optional = true
version = "0.22.0"

[dependencies.webpki-roots]
optional = true
version = "0.22.1"
version = "0.23.0"

[dev-dependencies]
futures-channel = "0.3"
hyper = { version = "0.14", default-features = false, features = ["http1", "server", "tcp"] }
tokio = { version = "1.0.0", default-features = false, features = ["io-std", "macros", "net", "rt-multi-thread", "time"] }
url = "2.0.0"
env_logger = "0.9"
futures-channel = "0.3.28"
hyper = { version = "0.14.25", default-features = false, features = ["http1", "server", "tcp"] }
tokio = { version = "1.27.0", default-features = false, features = ["io-std", "macros", "net", "rt-multi-thread", "time"] }
url = "2.3.1"
env_logger = "0.10.0"

[[example]]
name = "autobahn-client"
Expand Down
2 changes: 1 addition & 1 deletion src/tls.rs
Original file line number Diff line number Diff line change
Expand Up @@ -97,7 +97,7 @@ mod encryption {
for cert in rustls_native_certs::load_native_certs()? {
root_store
.add(&rustls::Certificate(cert.0))
.map_err(TlsError::Webpki)?;
.map_err(TlsError::Rustls)?;
}
}
#[cfg(feature = "rustls-tls-webpki-roots")]
Expand Down

0 comments on commit db99615

Please sign in to comment.