Update to axum 0.7

tweedegolf · Dec 4, 2023 · e46d4bd · e46d4bd
1 parent b500dfb
commit e46d4bd
Show file tree

Hide file tree

Showing 6 changed files with 10 additions and 19 deletions.
diff --git a/Cargo.toml b/Cargo.toml
@@ -7,7 +7,7 @@ members = [
 resolver = "2"
 
 [workspace.package]
-version = "0.3.0"
+version = "0.4.0"
 edition = "2021"
 license = "Apache-2.0 OR MIT"
 repository = "https://github.com/tweedegolf/memory-serve"

diff --git a/README.md b/README.md
@@ -59,12 +59,8 @@ async fn main() {
         .merge(memory_router);
 
     let addr = SocketAddr::from(([127, 0, 0, 1], 3000));
-
-    info!("listening on {}", addr);
-    axum::Server::bind(&addr)
-        .serve(app.into_make_service())
-        .await
-        .unwrap();
+    let listener = tokio::net::TcpListener::bind(addr).await.unwrap();
+    axum::serve(listener, app).await.unwrap();
 }
 ```
 

diff --git a/examples/test/Cargo.toml b/examples/test/Cargo.toml
@@ -8,7 +8,7 @@ publish = false
 
 [dependencies]
 memory-serve = { path = "../../memory-serve" }
-axum = "0.6"
+axum = "0.7"
 tokio = { version = "1.0", features = ["full"] }
 tracing-subscriber = "0.3"
 tracing = "0.1"
diff --git a/examples/test/src/main.rs b/examples/test/src/main.rs
@@ -16,12 +16,10 @@ async fn main() {
         .route("/hello", get(handler));
 
     let addr = SocketAddr::from(([127, 0, 0, 1], 3000));
+    let listener = tokio::net::TcpListener::bind(addr).await.unwrap();
 
     info!("listening on {}", addr);
-    axum::Server::bind(&addr)
-        .serve(app.into_make_service())
-        .await
-        .unwrap();
+    axum::serve(listener, app).await.unwrap();
 }
 
 async fn handler() -> Html<&'static str> {

diff --git a/memory-serve/Cargo.toml b/memory-serve/Cargo.toml
@@ -10,8 +10,8 @@ description.workspace = true
 [dependencies]
 brotli = "3.4"
 flate2 = "1.0"
-axum = { version = "0.6", default-features = false }
-memory-serve-macros = { version = "0.3", path = "../memory-serve-macros" }
+axum = { version = "0.7", default-features = false }
+memory-serve-macros = { version = "0.4", path = "../memory-serve-macros" }
 tracing = "0.1"
 sha256 = "1.4"
 

diff --git a/memory-serve/src/lib.rs b/memory-serve/src/lib.rs
@@ -57,11 +57,8 @@
 //!         .merge(memory_router);
 //!
 //!     let addr = SocketAddr::from(([127, 0, 0, 1], 3000));
-//!
-//!     axum::Server::bind(&addr)
-//!         .serve(app.into_make_service())
-//!         .await
-//!         .unwrap();
+//!     let listener = tokio::net::TcpListener::bind(addr).await.unwrap();
+//!     axum::serve(listener, app).await.unwrap();
 //! }
 //! ```
 //!