Merge pull request #581 from jbr/no-unnecessary-move

remove unnecessary `move`s from route handlers
http-rs · Jun 12, 2020 · a26863a · a26863a
2 parents 1b60303 + f64858a
commit a26863a
Show file tree

Hide file tree

Showing 14 changed files with 22 additions and 23 deletions.
diff --git a/benches/router.rs b/benches/router.rs
@@ -7,7 +7,7 @@ fn criterion_benchmark(c: &mut Criterion) {
     router.add(
         "hello",
         Method::Get,
-        Box::new(|_| async move { Ok("hello world") }),
+        Box::new(|_| async { Ok("hello world") }),
     );
 
     c.bench_function("route-match", |b| {

diff --git a/examples/chunked.rs b/examples/chunked.rs
@@ -4,7 +4,7 @@ use tide::{Body, Response, StatusCode};
 fn main() -> Result<(), std::io::Error> {
     task::block_on(async {
         let mut app = tide::new();
-        app.at("/").get(|_| async move {
+        app.at("/").get(|_| async {
             let mut res = Response::new(StatusCode::Ok);
             res.set_body(Body::from_file(file!()).await.unwrap());
             Ok(res)

diff --git a/examples/hello.rs b/examples/hello.rs
@@ -2,7 +2,7 @@
 async fn main() -> Result<(), std::io::Error> {
     tide::log::start();
     let mut app = tide::new();
-    app.at("/").get(|_| async move { Ok("Hello, world!") });
+    app.at("/").get(|_| async { Ok("Hello, world!") });
     app.listen("127.0.0.1:8080").await?;
     Ok(())
 }
diff --git a/examples/nested.rs b/examples/nested.rs
@@ -1,12 +1,11 @@
 #[async_std::main]
 async fn main() -> Result<(), std::io::Error> {
     let mut app = tide::new();
-    app.at("/").get(|_| async move { Ok("Root") });
+    app.at("/").get(|_| async { Ok("Root") });
     app.at("/api").nest({
         let mut api = tide::new();
-        api.at("/hello").get(|_| async move { Ok("Hello, world") });
-        api.at("/goodbye")
-            .get(|_| async move { Ok("Goodbye, world") });
+        api.at("/hello").get(|_| async { Ok("Hello, world") });
+        api.at("/goodbye").get(|_| async { Ok("Goodbye, world") });
         api
     });
     app.listen("127.0.0.1:8080").await?;

diff --git a/examples/redirect.rs b/examples/redirect.rs
@@ -3,13 +3,13 @@ use tide::{http::StatusCode, Redirect, Response};
 #[async_std::main]
 async fn main() -> Result<(), std::io::Error> {
     let mut app = tide::new();
-    app.at("/").get(|_| async move { Ok("Root") });
+    app.at("/").get(|_| async { Ok("Root") });
 
     // Redirect hackers to YouTube.
     app.at("/.env")
         .get(Redirect::new("https://www.youtube.com/watch?v=dQw4w9WgXcQ"));
 
-    app.at("/users-page").get(|_| async move {
+    app.at("/users-page").get(|_| async {
         Ok(if signed_in() {
             Response::new(StatusCode::Ok)
         } else {

diff --git a/src/lib.rs b/src/lib.rs
@@ -29,7 +29,7 @@
 //! # fn main() -> Result<(), std::io::Error> { block_on(async {
 //! #
 //! let mut app = tide::new();
-//! app.at("/").get(|_| async move { Ok("Hello, world!") });
+//! app.at("/").get(|_| async { Ok("Hello, world!") });
 //! app.listen("127.0.0.1:8080").await?;
 //! #
 //! # Ok(()) }) }
@@ -41,7 +41,7 @@
 //! # fn main() -> Result<(), std::io::Error> { block_on(async {
 //! #
 //! let mut app = tide::new();
-//! app.at("/").get(|req| async move { Ok(req) });
+//! app.at("/").get(|req| async { Ok(req) });
 //! app.listen("127.0.0.1:8080").await?;
 //! #
 //! # Ok(()) }) }
@@ -233,7 +233,7 @@ pub use http_types::{self as http, Body, Error, Status, StatusCode};
 /// # fn main() -> Result<(), std::io::Error> { block_on(async {
 /// #
 /// let mut app = tide::new();
-/// app.at("/").get(|_| async move { Ok("Hello, world!") });
+/// app.at("/").get(|_| async { Ok("Hello, world!") });
 /// app.listen("127.0.0.1:8080").await?;
 /// #
 /// # Ok(()) }) }

diff --git a/src/redirect.rs b/src/redirect.rs
@@ -9,7 +9,7 @@
 //! use tide::Redirect;
 //!
 //! let mut app = tide::new();
-//! app.at("/").get(|_| async move { Ok("meow") });
+//! app.at("/").get(|_| async { Ok("meow") });
 //! app.at("/nori").get(Redirect::temporary("/"));
 //! app.listen("127.0.0.1:8080").await?;
 //! #

diff --git a/src/router.rs b/src/router.rs
@@ -83,9 +83,9 @@ impl<State: 'static> Router<State> {
 }
 
 fn not_found_endpoint<State>(_req: Request<State>) -> BoxFuture<'static, crate::Result> {
-    Box::pin(async move { Ok(Response::new(StatusCode::NotFound)) })
+    Box::pin(async { Ok(Response::new(StatusCode::NotFound)) })
 }
 
 fn method_not_allowed<State>(_req: Request<State>) -> BoxFuture<'static, crate::Result> {
-    Box::pin(async move { Ok(Response::new(StatusCode::MethodNotAllowed)) })
+    Box::pin(async { Ok(Response::new(StatusCode::MethodNotAllowed)) })
 }
diff --git a/src/security/cors.rs b/src/security/cors.rs
@@ -253,7 +253,7 @@ mod test {
 
     fn app() -> crate::Server<()> {
         let mut app = crate::Server::new();
-        app.at(ENDPOINT).get(|_| async move { Ok("Hello World") });
+        app.at(ENDPOINT).get(|_| async { Ok("Hello World") });
 
         app
     }

diff --git a/src/server.rs b/src/server.rs
@@ -143,7 +143,7 @@ impl Server<()> {
     /// # fn main() -> Result<(), std::io::Error> { block_on(async {
     /// #
     /// let mut app = tide::new();
-    /// app.at("/").get(|_| async move { Ok("Hello, world!") });
+    /// app.at("/").get(|_| async { Ok("Hello, world!") });
     /// app.listen("127.0.0.1:8080").await?;
     /// #
     /// # Ok(()) }) }
@@ -213,7 +213,7 @@ impl<State: Send + Sync + 'static> Server<State> {
     ///
     /// ```rust,no_run
     /// # let mut app = tide::Server::new();
-    /// app.at("/").get(|_| async move { Ok("Hello, world!") });
+    /// app.at("/").get(|_| async { Ok("Hello, world!") });
     /// ```
     ///
     /// A path is comprised of zero or many segments, i.e. non-empty strings
@@ -369,7 +369,7 @@ impl<State: Send + Sync + 'static> Server<State> {
     /// use tide::http::{Url, Method, Request, Response};
     ///
     /// let mut app = tide::new();
-    /// app.at("/").get(|_| async move { Ok("hello world") });
+    /// app.at("/").get(|_| async { Ok("hello world") });
     ///
     /// let req = Request::new(Method::Get, Url::parse("https://example.com")?);
     /// let res: Response = app.respond(req).await?;

diff --git a/tests/chunked-encode-small.rs b/tests/chunked-encode-small.rs
@@ -21,7 +21,7 @@ async fn chunked_large() -> Result<(), http_types::Error> {
     let port = test_utils::find_port().await;
     let server = task::spawn(async move {
         let mut app = tide::new();
-        app.at("/").get(|_| async move {
+        app.at("/").get(|_| async {
             let mut res = Response::new(StatusCode::Ok);
             let body = Cursor::new(TEXT.to_owned());
             res.set_body(Body::from_reader(body, None));

diff --git a/tests/nested.rs b/tests/nested.rs
@@ -101,7 +101,7 @@ async fn nested_with_different_state() {
         let num = req.state();
         Ok(format!("the number is {}", num))
     });
-    outer.at("/").get(|_| async move { Ok("Hello, world!") });
+    outer.at("/").get(|_| async { Ok("Hello, world!") });
     outer.at("/foo").nest(inner);
 
     let req = Request::new(Method::Get, Url::parse("http://example.com/foo").unwrap());

diff --git a/tests/response.rs b/tests/response.rs
@@ -42,7 +42,7 @@ async fn json_content_type() {
     use tide::Body;
 
     let mut app = tide::new();
-    app.at("/json_content_type").get(|_| async move {
+    app.at("/json_content_type").get(|_| async {
         let mut map = BTreeMap::new();
         map.insert(Some("a"), 2);
         map.insert(Some("b"), 4);

diff --git a/tests/wildcard.rs b/tests/wildcard.rs
@@ -174,7 +174,7 @@ async fn invalid_wildcard() {
 #[async_std::test]
 async fn nameless_wildcard() {
     let mut app = tide::Server::new();
-    app.at("/echo/:").get(|_| async move { Ok("") });
+    app.at("/echo/:").get(|_| async { Ok("") });
 
     let req = http::Request::new(
         Method::Get,