From e71fd87417863e4e86ca3b689476631e6037e97b Mon Sep 17 00:00:00 2001 From: Jon Gjengset Date: Sun, 31 Mar 2024 10:27:42 +0200 Subject: [PATCH] Update msrv Avoid Arc::into_inner since it requires 1.70 --- .github/workflows/check.yml | 2 +- src/client_builder.rs | 11 ++++------- 2 files changed, 5 insertions(+), 8 deletions(-) diff --git a/.github/workflows/check.yml b/.github/workflows/check.yml index 7b3a15e..7e3eff2 100644 --- a/.github/workflows/check.yml +++ b/.github/workflows/check.yml @@ -99,7 +99,7 @@ jobs: # https://docs.github.com/en/actions/learn-github-actions/contexts#context-availability strategy: matrix: - msrv: ["1.57.0"] # base64 0.21 requires 1.57 + msrv: ["1.65.0"] name: ubuntu / ${{ matrix.msrv }} steps: - uses: actions/checkout@v4 diff --git a/src/client_builder.rs b/src/client_builder.rs index 59403e0..757bb00 100644 --- a/src/client_builder.rs +++ b/src/client_builder.rs @@ -21,7 +21,7 @@ use std::sync::Arc; #[cfg(feature = "rustls-tls")] #[derive(Debug)] -struct NoCertVerification(rustls::client::WebPkiServerVerifier); +struct NoCertVerification(Arc); #[cfg(feature = "rustls-tls")] impl rustls::client::danger::ServerCertVerifier for NoCertVerification { @@ -365,12 +365,9 @@ where config .dangerous() .set_certificate_verifier(Arc::new(NoCertVerification( - Arc::into_inner( - rustls::client::WebPkiServerVerifier::builder(Arc::new(CACERTS.clone())) - .build() - .expect("can construct standard verifier"), - ) - .expect("just constructed, so should only be one"), + rustls::client::WebPkiServerVerifier::builder(Arc::new(CACERTS.clone())) + .build() + .expect("can construct standard verifier"), ))); } let ssl_conn: RustlsConnector = config.into();