Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

chore: bump rustls and tokio-rustls #812

Open
wants to merge 5 commits into
base: master
Choose a base branch
from
Open

chore: bump rustls and tokio-rustls #812

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
5 commits
Select commit Hold shift + click to select a range
2edb8cc
chore: bump `rustls` and `tokio-rustls`
hzlinyiyu-netease May 10, 2024
4884a55
more fix
hzlinyiyu-netease May 10, 2024
cc06964
Merge remote-tracking branch 'upstream/master' into dev/ffffafafaf
hzlinyiyu-netease Jul 20, 2024
2862ae7
some fix
hzlinyiyu-netease Jul 20, 2024
f2de0a1
more
hzlinyiyu-netease Jul 20, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 2 additions & 2 deletions Cargo.toml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -50,5 +50,5 @@ darling = "0.20.10"
http = "1.0.0"

# rustls, update together
rustls = "0.22.0"
tokio-rustls = "0.25.0"
rustls = "0.23.5"
tokio-rustls = "0.26.0"
2 changes: 1 addition & 1 deletion poem/Cargo.toml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -162,7 +162,7 @@ tokio-stream = { workspace = true, optional = true }

# Feature optional dependencies
anyhow = { version = "1.0.0", optional = true }
eyre06 = { package = "eyre", version = "0.6", optional = true }
eyre06 = { package = "eyre", version = "0.6.12", optional = true }
uuid = { version = "1.8.0", optional = true, default-features = false, features = [
"v4",
] }
Expand Down
4 changes: 2 additions & 2 deletions poem/src/error.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1176,10 +1176,10 @@ mod tests {
assert_eq!(err.into_response().status(), StatusCode::BAD_GATEWAY);
}

#[cfg(feature = "eyre6")]
#[cfg(feature = "eyre06")]
#[test]
fn test_eyre6_error() {
let eyre6_err: eyre6::Error = IoError::new(ErrorKind::AlreadyExists, "aaa").into();
let eyre6_err: eyre06::Error = IoError::new(ErrorKind::AlreadyExists, "aaa").into();
let err: Error = Error::from((StatusCode::BAD_GATEWAY, eyre6_err));
assert!(err.is::<IoError>());
assert_eq!(
Expand Down
2 changes: 1 addition & 1 deletion poem/src/lib.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -277,7 +277,7 @@ pub mod middleware;
#[cfg(feature = "session")]
#[cfg_attr(docsrs, doc(cfg(feature = "session")))]
pub mod session;
#[cfg(feature = "test")]
#[cfg(any(feature = "test", test))]
#[cfg_attr(docsrs, doc(cfg(feature = "test")))]
pub mod test;
pub mod web;
Expand Down
2 changes: 1 addition & 1 deletion poem/src/listener/acme/listener.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,7 @@ use rcgen::{
};
use tokio_rustls::{
rustls::{
crypto::ring::sign::any_ecdsa_type,
crypto::aws_lc_rs::sign::any_ecdsa_type,
pki_types::{CertificateDer, PrivateKeyDer},
sign::CertifiedKey,
ServerConfig,
Expand Down
2 changes: 1 addition & 1 deletion poem/src/listener/rustls.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,7 @@ use rustls_pemfile::Item;
use tokio::io::{Error as IoError, ErrorKind, Result as IoResult};
use tokio_rustls::{
rustls::{
crypto::ring::sign::any_supported_type,
crypto::aws_lc_rs::sign::any_supported_type,
server::{ClientHello, ResolvesServerCert, WebPkiClientVerifier},
sign::CertifiedKey,
RootCertStore, ServerConfig,
Expand Down
Loading