Merge branch 'main' into merge_flush

cloudwego · Jan 10, 2024 · a294fed · a294fed
2 parents 3de3fc0 + b92527f
commit a294fed
Show file tree

Hide file tree

Showing 3 changed files with 30 additions and 25 deletions.
diff --git a/Cargo.lock b/Cargo.lock
diff --git a/volo-http/Cargo.toml b/volo-http/Cargo.toml
@@ -1,6 +1,6 @@
 [package]
 name = "volo-http"
-version = "0.1.9"
+version = "0.1.11"
 edition.workspace = true
 homepage.workspace = true
 repository.workspace = true

diff --git a/volo-http/src/lib.rs b/volo-http/src/lib.rs
@@ -13,33 +13,38 @@ pub mod request;
 pub mod response;
 pub mod route;
 pub mod server;
+
 pub(crate) mod service_fn;
 
 mod macros;
 
-use std::convert::Infallible;
+#[doc(hidden)]
+pub mod prelude {
+    pub use bytes::Bytes;
+    pub use hyper::{
+        self,
+        body::Incoming as BodyIncoming,
+        http::{self, HeaderMap, HeaderName, HeaderValue, Method, StatusCode, Uri, Version},
+    };
+    pub use volo::net::Address;
 
-pub use bytes::Bytes;
-pub use hyper::{
-    self,
-    body::Incoming as BodyIncoming,
-    http::{self, HeaderMap, HeaderName, HeaderValue, Method, StatusCode, Uri, Version},
-};
-pub use volo::net::Address;
+    #[cfg(feature = "cookie")]
+    pub use crate::cookie::CookieJar;
+    #[cfg(any(feature = "serde_json", feature = "sonic_json"))]
+    pub use crate::json::Json;
+    pub use crate::{
+        context::{ConnectionInfo, HttpContext},
+        extension::Extension,
+        extract::{Form, MaybeInvalid, Query, State},
+        param::Params,
+        request::Request,
+        response::Response,
+        route::Router,
+        server::Server,
+    };
 
-#[cfg(feature = "cookie")]
-pub use crate::cookie::CookieJar;
-#[cfg(any(feature = "serde_json", feature = "sonic_json"))]
-pub use crate::json::Json;
-pub use crate::{
-    context::{ConnectionInfo, HttpContext},
-    extension::Extension,
-    extract::{Form, MaybeInvalid, Query, State},
-    param::Params,
-    request::Request,
-    response::Response,
-    route::Router,
-    server::Server,
-};
+    pub type DynService =
+        motore::BoxCloneService<HttpContext, BodyIncoming, Response, std::convert::Infallible>;
+}
 
-pub type DynService = motore::BoxCloneService<HttpContext, BodyIncoming, Response, Infallible>;
+pub use prelude::*;