Merge pull request #915 from DaraghD/clippy

Fishrock123 · web-flow · commit b32f680d5bd1 · 2024-01-04T17:12:04.000-08:00
fix: clippy warnings
diff --git a/examples/middleware.rs b/examples/middleware.rs
@@ -93,7 +93,7 @@ const INTERNAL_SERVER_ERROR_HTML_PAGE: &str = "<html><body>
 #[async_std::main]
 async fn main() -> Result<()> {
     femme::start();
-    let mut app = tide::with_state(UserDatabase::default());
+    let mut app = tide::with_state(UserDatabase);
 
     app.with(After(|response: Response| async move {
         let response = match response.status() {
diff --git a/src/router.rs b/src/router.rs
@@ -45,7 +45,7 @@ impl<State: Clone + Send + Sync + 'static> Router<State> {
     ) {
         self.method_map
             .entry(method)
-            .or_insert_with(MethodRouter::new)
+            .or_default()
             .add(path, ep)
             .unwrap()
     }
diff --git a/tests/route_middleware.rs b/tests/route_middleware.rs
@@ -1,6 +1,5 @@
 mod test_utils;
 use http_types::headers::HeaderName;
-use std::convert::TryInto;
 use test_utils::ServerTestingExt;
 use tide::Middleware;
 
@@ -9,7 +8,7 @@ struct TestMiddleware(HeaderName, &'static str);
 
 impl TestMiddleware {
     fn with_header_name(name: &'static str, value: &'static str) -> Self {
-        Self(name.try_into().unwrap(), value)
+        Self(name.into(), value)
     }
 }
 
diff --git a/tests/unix.rs b/tests/unix.rs
@@ -5,8 +5,8 @@ mod unix_tests {
     use async_std::task;
     use http_types::{url::Url, Request};
     use std::time::Duration;
-    use tide::Method;
     use tempfile::tempdir;
+    use tide::Method;
 
     #[test]
     fn hello_unix_world() -> Result<(), http_types::Error> {

Original file line number	Diff line number	Diff line change
`@@ -45,7 +45,7 @@ impl<State: Clone + Send + Sync + 'static> Router<State> {`
`45`	`45`	`) {`
`46`	`46`	`self.method_map`
`47`	`47`	`.entry(method)`
`48`		`- .or_insert_with(MethodRouter::new)`
	`48`	`+ .or_default()`
`49`	`49`	`.add(path, ep)`
`50`	`50`	`.unwrap()`
`51`	`51`	`}`
Original file line number	Diff line number	Diff line change
`@@ -1,6 +1,5 @@`
`1`	`1`	`mod test_utils;`
`2`	`2`	`use http_types::headers::HeaderName;`
`3`		`-use std::convert::TryInto;`
`4`	`3`	`use test_utils::ServerTestingExt;`
`5`	`4`	`use tide::Middleware;`
`6`	`5`
`@@ -9,7 +8,7 @@ struct TestMiddleware(HeaderName, &'static str);`
`9`	`8`
`10`	`9`	`impl TestMiddleware {`
`11`	`10`	`fn with_header_name(name: &'static str, value: &'static str) -> Self {`
`12`		`- Self(name.try_into().unwrap(), value)`
	`11`	`+ Self(name.into(), value)`
`13`	`12`	`}`
`14`	`13`	`}`
`15`	`14`