Fix SendService trait bound (#171)

* Fix SendService trait bound

* Bump rust version and crate version

* Use libssl-dev

* Set openssl to minimal version

Author: AlvaroParker

.github/workflows/ci.yml

@@ -102,7 +102,7 @@ jobs:
       matrix:
         rust:
           - { version: stable, msrv: false }
-          - { name: "MSRV", version: 1.66, msrv: true }
+          - { name: "MSRV", version: 1.82, msrv: true }
         features:
           - { features: "" }
           - { name: "(`tls-rustls`)", features: --features tls-rustls }
@@ -178,14 +178,13 @@ jobs:
       - name: Install OpenSSL
         if: matrix.features.openssl == true
         run: |
-          sudo apt-add-repository "deb http://archive.ubuntu.com/ubuntu focal-updates main"
           sudo apt update
-          sudo apt-get install --allow-downgrades pkg-config libssl-dev=1.1.1f-1ubuntu2.23
+          sudo apt-get install pkg-config libssl-dev
       - name: Install Nightly Rust
         uses: dtolnay/rust-toolchain@nightly
       - name: Update to Minimal Versions
         run: cargo update -Zminimal-versions
       - name: Install Rust
-        uses: dtolnay/rust-toolchain@1.66
+        uses: dtolnay/rust-toolchain@1.82
       - name: Run Cargo Build
         run: cargo build ${{ matrix.features.features }}

Cargo.toml

@@ -9,14 +9,14 @@ license = "MIT"
 name = "axum-server"
 readme = "README.md"
 repository = "https://github.com/programatik29/axum-server"
-version = "0.7.2"
-rust-version = "1.66"
+version = "0.7.3"
+rust-version = "1.82"
 
 [features]
 default = []
 tls-rustls = ["tls-rustls-no-provider", "rustls/aws-lc-rs"]
 tls-rustls-no-provider = ["arc-swap", "rustls", "rustls-pemfile", "tokio/fs", "tokio/time", "tokio-rustls", "rustls-pki-types", "dep:pin-project-lite"]
-tls-openssl = ["arc-swap", "openssl", "tokio-openssl", "dep:pin-project-lite"]
+tls-openssl = ["arc-swap", "openssl", "openssl-sys", "tokio-openssl", "dep:pin-project-lite"]
 
 [dependencies]
 bytes = "1"
@@ -37,7 +37,8 @@ rustls-pemfile = { version = "2.1", optional = true }
 tokio-rustls = { version = "0.26", default-features = false, optional = true }
 
 ## openssl
-openssl = { version = "0.10", optional = true }
+openssl = { version = "0.10.61", optional = true }
+openssl-sys = { version = "0.9.97", optional = true }
 tokio-openssl = { version = "0.6", optional = true }
 
 ## rustls or openssl

README.md

@@ -41,7 +41,7 @@ You can find more examples [here](/examples).
 
 ## Minimum Supported Rust Version
 
-axum-server's MSRV is `1.66`.
+axum-server's MSRV is `1.82`.
 
 ## Safety
 

src/server.rs

@@ -13,7 +13,7 @@ use hyper_util::{
 use std::{
     fmt,
     future::poll_fn,
-    io::{self, ErrorKind},
+    io::{self},
     net::SocketAddr,
     time::Duration,
 };
@@ -265,7 +265,7 @@ pub(crate) async fn accept(listener: &mut TcpListener) -> (TcpStream, SocketAddr
 type BoxError = Box<dyn std::error::Error + Send + Sync>;
 
 pub(crate) fn io_other<E: Into<BoxError>>(error: E) -> io::Error {
-    io::Error::new(ErrorKind::Other, error)
+    io::Error::other(error)
 }
 
 #[cfg(test)]

src/service.rs

@@ -23,7 +23,7 @@ pub trait SendService<Request>: send_service::Sealed<Request> {
         + 'static;
 
     type Body: Body<Data = Self::BodyData, Error = Self::BodyError> + Send + 'static;
-    type BodyData: Send + 'static;
+    type BodyData: bytes::Buf + Send + 'static;
     type BodyError: Into<Box<dyn std::error::Error + Send + Sync>>;
 
     type Error: Into<Box<dyn std::error::Error + Send + Sync>>;

src/tls_openssl/future.rs

@@ -72,7 +72,8 @@ where
 
                 Poll::Ready(Ok(tls_stream))
             }
-            Poll::Ready(Err(e)) => Poll::Ready(Err(Error::new(ErrorKind::Other, e))),
+            Poll::Ready(Err(e)) => Poll::Ready(Err(io::Error::other(e))),
+
             Poll::Pending => Poll::Pending,
         }
     }
@@ -159,7 +160,7 @@ where
                     }
                     Poll::Ready(Ok(Err(e))) => return Poll::Ready(Err(e)),
                     Poll::Ready(Err(timeout)) => {
-                        return Poll::Ready(Err(Error::new(ErrorKind::TimedOut, timeout)))
+                        return Poll::Ready(Err(Error::new(ErrorKind::TimedOut, timeout)));
                     }
                     Poll::Pending => return Poll::Pending,
                 },

src/tls_openssl/mod.rs

@@ -249,7 +249,6 @@ impl TryFrom<SslAcceptorBuilder> for OpenSSLConfig {
     ///     // Set configurations like set_certificate_chain_file or
     ///     // set_private_key_file.
     ///     // let tls_builder.set_ ... ;
-
     ///     let _config = OpenSSLConfig::try_from(tls_builder);
     /// }
     /// ```

src/tls_rustls/future.rs

@@ -104,7 +104,7 @@ where
                     }
                     Poll::Ready(Ok(Err(e))) => return Poll::Ready(Err(e)),
                     Poll::Ready(Err(timeout)) => {
-                        return Poll::Ready(Err(Error::new(ErrorKind::TimedOut, timeout)))
+                        return Poll::Ready(Err(Error::new(ErrorKind::TimedOut, timeout)));
                     }
                     Poll::Pending => return Poll::Pending,
                 },

src/tls_rustls/mod.rs

@@ -586,7 +586,10 @@ mod tests {
         .await
         .unwrap_err();
         assert_eq!(err.kind(), io::ErrorKind::NotFound);
-        assert_eq!(err.to_string(), "failed to read from file `examples/self-signed-certs/missing.pem`: No such file or directory (os error 2)");
+        assert_eq!(
+            err.to_string(),
+            "failed to read from file `examples/self-signed-certs/missing.pem`: No such file or directory (os error 2)"
+        );
 
         let err = RustlsConfig::from_pem_file(
             "examples/self-signed-certs/cert.pem",
@@ -595,7 +598,10 @@ mod tests {
         .await
         .unwrap_err();
         assert_eq!(err.kind(), io::ErrorKind::NotFound);
-        assert_eq!(err.to_string(), "failed to read from file `examples/self-signed-certs/missing.pem`: No such file or directory (os error 2)");
+        assert_eq!(
+            err.to_string(),
+            "failed to read from file `examples/self-signed-certs/missing.pem`: No such file or directory (os error 2)"
+        );
     }
 
     #[tokio::test]
@@ -607,7 +613,10 @@ mod tests {
         .await
         .unwrap_err();
         assert_eq!(err.kind(), io::ErrorKind::NotFound);
-        assert_eq!(err.to_string(), "failed to read from file `examples/self-signed-certs/missing.pem`: No such file or directory (os error 2)");
+        assert_eq!(
+            err.to_string(),
+            "failed to read from file `examples/self-signed-certs/missing.pem`: No such file or directory (os error 2)"
+        );
 
         let err = RustlsConfig::from_pem_chain_file(
             "examples/self-signed-certs/cert.pem",
@@ -616,6 +625,9 @@ mod tests {
         .await
         .unwrap_err();
         assert_eq!(err.kind(), io::ErrorKind::NotFound);
-        assert_eq!(err.to_string(), "failed to read from file `examples/self-signed-certs/missing.pem`: No such file or directory (os error 2)");
+        assert_eq!(
+            err.to_string(),
+            "failed to read from file `examples/self-signed-certs/missing.pem`: No such file or directory (os error 2)"
+        );
     }
 }