Bump MSRV to 1.85 (for rustls-platform-verifier -> jni)

Author: djc

.github/workflows/build.yml

@@ -105,7 +105,7 @@ jobs:
       - name: Install rust toolchain
         uses: dtolnay/rust-toolchain@master
         with:
-          toolchain: "1.71"
+          toolchain: "1.85"
 
       - name: Check MSRV
         run: cargo check --lib --locked --all-features

Cargo.toml

@@ -2,7 +2,7 @@
 name = "hyper-rustls"
 version = "0.27.7"
 edition = "2021"
-rust-version = "1.71"
+rust-version = "1.85"
 license = "Apache-2.0 OR ISC OR MIT"
 readme = "README.md"
 description = "Rustls+hyper integration for pure rust HTTPS"

examples/client.rs

@@ -23,7 +23,7 @@ fn main() {
 }
 
 fn error(err: String) -> io::Error {
-    io::Error::new(io::ErrorKind::Other, err)
+    io::Error::other(err)
 }
 
 #[tokio::main]

examples/server.rs

@@ -30,7 +30,7 @@ fn main() {
 }
 
 fn error(err: String) -> io::Error {
-    io::Error::new(io::ErrorKind::Other, err)
+    io::Error::other(err)
 }
 
 #[tokio::main]

src/connector.rs

@@ -94,16 +94,10 @@ where
             }
             Some(scheme) if scheme != &http::uri::Scheme::HTTPS => {
                 let message = format!("unsupported scheme {scheme}");
-                return Box::pin(async move {
-                    Err(io::Error::new(io::ErrorKind::Other, message).into())
-                });
+                return Box::pin(async move { Err(io::Error::other(message).into()) });
             }
             Some(_) => {}
-            None => {
-                return Box::pin(async move {
-                    Err(io::Error::new(io::ErrorKind::Other, "missing scheme").into())
-                })
-            }
+            None => return Box::pin(async move { Err(io::Error::other("missing scheme").into()) }),
         };
 
         let cfg = self.tls_config.clone();
@@ -123,7 +117,7 @@ where
                 TlsConnector::from(cfg)
                     .connect(hostname, TokioIo::new(tcp))
                     .await
-                    .map_err(|e| io::Error::new(io::ErrorKind::Other, e))?,
+                    .map_err(io::Error::other)?,
             )))
         })
     }

src/connector/builder.rs

@@ -108,7 +108,7 @@ impl ConnectorBuilder<WantsTlsConfig> {
             ClientConfig::builder_with_provider(provider.into())
                 .with_safe_default_protocol_versions()
                 .and_then(|builder| builder.try_with_platform_verifier())
-                .map_err(|e| std::io::Error::new(std::io::ErrorKind::Other, e))?
+                .map_err(std::io::Error::other)?
                 .with_no_client_auth(),
         ))
     }
@@ -140,7 +140,7 @@ impl ConnectorBuilder<WantsTlsConfig> {
         Ok(self.with_tls_config(
             ClientConfig::builder_with_provider(provider.into())
                 .with_safe_default_protocol_versions()
-                .map_err(|e| std::io::Error::new(std::io::ErrorKind::Other, e))?
+                .map_err(std::io::Error::other)?
                 .with_native_roots()?
                 .with_no_client_auth(),
         ))