From 7f792fe293f084bf4cee50493d494d8f30dc62bd Mon Sep 17 00:00:00 2001 From: Cole Helbling Date: Sat, 25 Nov 2023 15:04:59 -0800 Subject: [PATCH] Bump axum-core to 0.4, http to 1.0 --- Cargo.toml | 9 +++++---- README.md | 4 ++-- examples/counter-extractor.rs | 4 ++-- examples/counter.rs | 4 ++-- examples/hello_world.rs | 4 ++-- examples/signed_private.rs | 4 ++-- src/lib.rs | 15 ++++++--------- 7 files changed, 21 insertions(+), 23 deletions(-) diff --git a/Cargo.toml b/Cargo.toml index d1f85e8..1b7c39a 100644 --- a/Cargo.toml +++ b/Cargo.toml @@ -18,23 +18,24 @@ private = ["cookie/secure"] [dependencies] async-trait = "0.1" -axum-core = { version = "0.3", optional = true } +axum-core = { version = "0.4", optional = true } cookie = { version = "0.17", features = ["percent-encode"] } futures-util = "0.3" -http = "0.2" +http = "1.0" parking_lot = "0.12" pin-project-lite = "0.2" tower-layer = "0.3" tower-service = "0.3" [dev-dependencies] -axum = "0.6" -hyper = "0.14" +axum = "0.7" +hyper = "1.0" once_cell = "1.9" rusty-hook = "0.11" tokio = { version = "1", features = ["full"] } tower = "0.4" tracing-subscriber = "0.3" +http-body-util = "0.1" [package.metadata.docs.rs] all-features = true diff --git a/README.md b/README.md index ee21ab1..22964f5 100644 --- a/README.md +++ b/README.md @@ -24,8 +24,8 @@ async fn main() { .layer(CookieManagerLayer::new()); let addr = SocketAddr::from(([127, 0, 0, 1], 3000)); - axum::Server::bind(&addr) - .serve(app.into_make_service()) + let listener = tokio::net::TcpListener::bind(&addr).await.unwrap(); + axum::serve(listener, app.into_make_service()) .await .unwrap(); } diff --git a/examples/counter-extractor.rs b/examples/counter-extractor.rs index d4eaf81..3ce5f03 100644 --- a/examples/counter-extractor.rs +++ b/examples/counter-extractor.rs @@ -41,8 +41,8 @@ async fn main() { .layer(CookieManagerLayer::new()); let addr = SocketAddr::from(([127, 0, 0, 1], 3000)); - axum::Server::bind(&addr) - .serve(app.into_make_service()) + let listener = tokio::net::TcpListener::bind(&addr).await.unwrap(); + axum::serve(listener, app.into_make_service()) .await .unwrap(); } diff --git a/examples/counter.rs b/examples/counter.rs index ceb1fae..be3032e 100644 --- a/examples/counter.rs +++ b/examples/counter.rs @@ -11,8 +11,8 @@ async fn main() { .layer(CookieManagerLayer::new()); let addr = SocketAddr::from(([127, 0, 0, 1], 3000)); - axum::Server::bind(&addr) - .serve(app.into_make_service()) + let listener = tokio::net::TcpListener::bind(&addr).await.unwrap(); + axum::serve(listener, app.into_make_service()) .await .unwrap(); } diff --git a/examples/hello_world.rs b/examples/hello_world.rs index a35cec3..fbfe60f 100644 --- a/examples/hello_world.rs +++ b/examples/hello_world.rs @@ -9,8 +9,8 @@ async fn main() { .layer(CookieManagerLayer::new()); let addr = SocketAddr::from(([127, 0, 0, 1], 3000)); - axum::Server::bind(&addr) - .serve(app.into_make_service()) + let listener = tokio::net::TcpListener::bind(&addr).await.unwrap(); + axum::serve(listener, app.into_make_service()) .await .unwrap(); } diff --git a/examples/signed_private.rs b/examples/signed_private.rs index 0bcd50d..36df2d6 100644 --- a/examples/signed_private.rs +++ b/examples/signed_private.rs @@ -18,8 +18,8 @@ async fn main() { .layer(CookieManagerLayer::new()); let addr = SocketAddr::from(([127, 0, 0, 1], 3000)); - axum::Server::bind(&addr) - .serve(app.into_make_service()) + let listener = tokio::net::TcpListener::bind(&addr).await.unwrap(); + axum::serve(listener, app.into_make_service()) .await .unwrap(); } diff --git a/src/lib.rs b/src/lib.rs index 91a83cf..527a631 100644 --- a/src/lib.rs +++ b/src/lib.rs @@ -17,8 +17,8 @@ //! .layer(CookieManagerLayer::new()); //! //! let addr = SocketAddr::from(([127, 0, 0, 1], 3000)); -//! axum::Server::bind(&addr) -//! .serve(app.into_make_service()) +//! let listener = tokio::net::TcpListener::bind(&addr).await.unwrap(); +//! axum::serve(listener, app.into_make_service()) //! .await //! .unwrap(); //! } @@ -197,13 +197,10 @@ impl Inner { #[cfg(all(test, feature = "axum-core"))] mod tests { use crate::{CookieManagerLayer, Cookies}; - use axum::{ - body::{Body, BoxBody}, - routing::get, - Router, - }; + use axum::{body::Body, routing::get, Router}; use cookie::Cookie; use http::{header, Request}; + use http_body_util::BodyExt; use tower::ServiceExt; fn app() -> Router { @@ -236,8 +233,8 @@ mod tests { .layer(CookieManagerLayer::new()) } - async fn body_string(body: BoxBody) -> String { - let bytes = hyper::body::to_bytes(body).await.unwrap(); + async fn body_string(body: Body) -> String { + let bytes = body.collect().await.unwrap().to_bytes(); String::from_utf8_lossy(&bytes).into() }