Merge pull request #717 from belak/optional-cookies

Add an optional cookies feature

Author: Fishrock123

Cargo.toml

@@ -24,11 +24,12 @@ features = ["docs"]
 rustdoc-args = ["--cfg", "feature=\"docs\""]
 
 [features]
-default = ["h1-server", "logger", "sessions"]
+default = ["h1-server", "cookies", "logger", "sessions"]
+cookies = []
 h1-server = ["async-h1"]
 logger = ["femme"]
 docs = ["unstable"]
-sessions = ["async-session"]
+sessions = ["async-session", "cookies"]
 unstable = []
 # DO NOT USE. Only exists to expose internals so they can be benchmarked.
 __internal__bench = []
@@ -61,11 +62,29 @@ serde = { version = "1.0.117", features = ["derive"] }
 surf = { version = "2.0.0", default-features = false, features = ["h1-client"] }
 tempfile = "3.1.0"
 
+[[test]]
+name = "cookies"
+path = "tests/cookies.rs"
+required-features = ["cookies"]
+
 [[test]]
 name = "nested"
 path = "tests/nested.rs"
 required-features = ["unstable"]
 
+[[test]]
+name = "sessions"
+path = "tests/sessions.rs"
+required-features = ["sessions"]
+
 [[bench]]
 name = "router"
 harness = false
+
+[[example]]
+name = "cookies"
+required-features = ["cookies"]
+
+[[example]]
+name = "sessions"
+required-features = ["sessions"]

src/lib.rs

@@ -60,6 +60,7 @@
 #![doc(html_favicon_url = "https://yoshuawuyts.com/assets/http-rs/favicon.ico")]
 #![doc(html_logo_url = "https://yoshuawuyts.com/assets/http-rs/logo-rounded.png")]
 
+#[cfg(feature = "cookies")]
 mod cookies;
 mod endpoint;
 mod fs;

src/request.rs

@@ -5,7 +5,9 @@ use route_recognizer::Params;
 use std::ops::Index;
 use std::pin::Pin;
 
+#[cfg(feature = "cookies")]
 use crate::cookies::CookieData;
+#[cfg(feature = "cookies")]
 use crate::http::cookies::Cookie;
 use crate::http::format_err;
 use crate::http::headers::{self, HeaderName, HeaderValues, ToHeaderValues};
@@ -485,6 +487,7 @@ impl<State> Request<State> {
     }
 
     /// returns a `Cookie` by name of the cookie.
+    #[cfg(feature = "cookies")]
     #[must_use]
     pub fn cookie(&self, name: &str) -> Option<Cookie<'static>> {
         self.ext::<CookieData>()

src/security/cors.rs

@@ -364,6 +364,7 @@ mod test {
     }
 
     #[async_std::test]
+    #[cfg(feature = "cookies")]
     async fn retain_cookies() {
         let mut app = crate::Server::new();
         app.with(CorsMiddleware::new().allow_origin(ALLOW_ORIGIN));

src/server.rs

@@ -3,6 +3,7 @@
 use async_std::io;
 use async_std::sync::Arc;
 
+#[cfg(feature = "cookies")]
 use crate::cookies;
 use crate::listener::{Listener, ToListener};
 use crate::log;
@@ -100,15 +101,16 @@ impl<State: Clone + Send + Sync + 'static> Server<State> {
     /// # Ok(()) }) }
     /// ```
     pub fn with_state(state: State) -> Self {
-        let mut server = Self {
+        Self {
             router: Arc::new(Router::new()),
-            middleware: Arc::new(vec![]),
+            middleware: Arc::new(vec![
+                #[cfg(feature = "cookies")]
+                Arc::new(cookies::CookiesMiddleware::new()),
+                #[cfg(feature = "logger")]
+                Arc::new(log::LogMiddleware::new()),
+            ]),
             state,
-        };
-        server.with(cookies::CookiesMiddleware::new());
-        #[cfg(feature = "logger")]
-        server.with(log::LogMiddleware::new());
-        server
+        }
     }
 
     /// Add a new route at the given `path`, relative to root.