Merge branch 'main' into param-error

Author: yoshuawuyts

Cargo.toml

@@ -26,7 +26,7 @@ rustdoc-args = ["--cfg", "feature=\"docs\""]
 [features]
 default = ["h1-server", "logger", "sessions"]
 h1-server = ["async-h1"]
-logger = []
+logger = ["femme"]
 docs = ["unstable"]
 sessions = ["async-session"]
 unstable = []
@@ -39,8 +39,9 @@ async-session  = { version = "2.0.0", optional = true }
 async-sse = "4.0.0"
 async-std = { version = "1.6.0", features = ["unstable"] }
 async-trait = "0.1.36"
-femme = "2.0.1"
+femme = { version = "2.0.1", optional = true }
 futures-util = "0.3.5"
+log = { version = "0.4.8", features = ["std"] }
 http-types = "2.4.0"
 kv-log-macro = "1.0.4"
 pin-project-lite = "0.1.7"

src/endpoint.rs

@@ -118,3 +118,10 @@ where
         Ok(next.run(req).await)
     }
 }
+
+#[async_trait]
+impl<State: Clone + Send + Sync + 'static> Endpoint<State> for Box<dyn Endpoint<State>> {
+    async fn call(&self, request: Request<State>) -> crate::Result {
+        self.as_ref().call(request).await
+    }
+}

src/log/mod.rs

@@ -21,7 +21,9 @@ pub use kv_log_macro::{max_level, Level};
 
 mod middleware;
 
+#[cfg(feature = "logger")]
 pub use femme::LevelFilter;
+
 pub use middleware::LogMiddleware;
 
 /// Start logging.

src/route.rs

@@ -104,9 +104,12 @@ impl<'a, State: Clone + Send + Sync + 'static> Route<'a, State> {
         State: Clone + Send + Sync + 'static,
         InnerState: Clone + Send + Sync + 'static,
     {
+        let prefix = self.prefix;
+
         self.prefix = true;
         self.all(service);
-        self.prefix = false;
+        self.prefix = prefix;
+
         self
     }
 

tests/endpoint.rs

@@ -0,0 +1,25 @@
+use tide::http::{Method, Request, Url};
+use tide::Response;
+
+#[async_std::test]
+async fn should_accept_boxed_endpoints() {
+    fn endpoint() -> Box<dyn tide::Endpoint<()>> {
+        Box::new(|_| async { Ok("hello world") })
+    }
+
+    let mut app = tide::Server::new();
+    app.at("/").get(endpoint());
+
+    let mut response: Response = app
+        .respond(Request::new(
+            Method::Get,
+            Url::parse("http://example.com/").unwrap(),
+        ))
+        .await
+        .unwrap();
+
+    assert_eq!(
+        response.take_body().into_string().await.unwrap(),
+        "hello world"
+    );
+}