Skip to content

Commit f006293

Browse files
committed
Switch to cleaner middleware setup
1 parent 9bc8c55 commit f006293

File tree

1 file changed

+9
-21
lines changed

1 file changed

+9
-21
lines changed

src/server.rs

Lines changed: 9 additions & 21 deletions
Original file line numberDiff line numberDiff line change
@@ -101,27 +101,15 @@ impl<State: Clone + Send + Sync + 'static> Server<State> {
101101
/// # Ok(()) }) }
102102
/// ```
103103
pub fn with_state(state: State) -> Self {
104-
#[cfg(any(feature = "cookies", feature = "logger"))]
105-
{
106-
let mut server = Self {
107-
router: Arc::new(Router::new()),
108-
middleware: Arc::new(vec![]),
109-
state,
110-
};
111-
#[cfg(feature = "cookies")]
112-
server.with(cookies::CookiesMiddleware::new());
113-
#[cfg(feature = "logger")]
114-
server.with(log::LogMiddleware::new());
115-
server
116-
}
117-
118-
#[cfg(not(any(feature = "cookies", feature = "logger")))]
119-
{
120-
Self {
121-
router: Arc::new(Router::new()),
122-
middleware: Arc::new(vec![]),
123-
state,
124-
}
104+
Self {
105+
router: Arc::new(Router::new()),
106+
middleware: Arc::new(vec![
107+
#[cfg(feature = "cookies")]
108+
Arc::new(cookies::CookiesMiddleware::new()),
109+
#[cfg(feature = "logger")]
110+
Arc::new(log::LogMiddleware::new()),
111+
]),
112+
state,
125113
}
126114
}
127115

0 commit comments

Comments
 (0)