removed clippy tokio lint exclusions

geo-engine · Dec 21, 2021 · ab520e3 · ab520e3
1 parent 5781d97
commit ab520e3
Show file tree

Hide file tree

Showing 7 changed files with 2 additions and 16 deletions.
diff --git a/operators/Cargo.toml b/operators/Cargo.toml
@@ -36,7 +36,7 @@ rustc-hash = { version = "1.0", default-features = false }
 serde = { version = "1.0", features = ["derive"] }
 serde_json = "1.0"
 snafu = "0.6"
-tokio = { version = "1.1", features = ["macros", "signal", "sync", "rt-multi-thread"] }
+tokio = { version = "1.15", features = ["macros", "signal", "sync", "rt-multi-thread"] }
 typetag = "0.1"
 uuid = { version = "0.8", features = ["serde", "v4", "v5"] }
 

diff --git a/services/Cargo.toml b/services/Cargo.toml
@@ -60,7 +60,7 @@ serde_with = "1.9"
 snafu = "0.6"
 strum = { version = "0.23", features = ["derive"] }
 time = "0.3"
-tokio = { version = "1.1", features = ["macros", "fs", "signal", "sync", "rt-multi-thread"] }
+tokio = { version = "1.15", features = ["macros", "fs", "signal", "sync", "rt-multi-thread"] }
 tokio-util = "0.6"
 typetag = "0.1"
 url = { version = "2.2", features = ["serde"] }

diff --git a/services/src/handlers/projects.rs b/services/src/handlers/projects.rs
@@ -271,8 +271,6 @@ mod tests {
     }
 
     #[tokio::test]
-    // TODO: remove when https://github.com/tokio-rs/tokio/issues/4245 is fixed
-    #[allow(clippy::semicolon_if_nothing_returned)]
     async fn create() {
         let res = create_test_helper(Method::POST).await;
 
@@ -447,8 +445,6 @@ mod tests {
     }
 
     #[tokio::test]
-    // TODO: remove when https://github.com/tokio-rs/tokio/issues/4245 is fixed
-    #[allow(clippy::semicolon_if_nothing_returned)]
     async fn load() {
         let res = load_test_helper(Method::GET).await;
 

diff --git a/services/src/handlers/session.rs b/services/src/handlers/session.rs
@@ -205,8 +205,6 @@ mod tests {
     }
 
     #[tokio::test]
-    // TODO: remove when https://github.com/tokio-rs/tokio/issues/4245 is fixed
-    #[allow(clippy::semicolon_if_nothing_returned)]
     async fn anonymous() {
         let res = anonymous_test_helper(Method::POST).await;
 

diff --git a/services/src/handlers/workflows.rs b/services/src/handlers/workflows.rs
@@ -505,8 +505,6 @@ mod tests {
     }
 
     #[tokio::test]
-    // TODO: remove when https://github.com/tokio-rs/tokio/issues/4245 is fixed
-    #[allow(clippy::semicolon_if_nothing_returned)]
     async fn register() {
         let res = register_test_helper(Method::POST).await;
 

diff --git a/services/src/pro/handlers/projects.rs b/services/src/pro/handlers/projects.rs
@@ -676,8 +676,6 @@ mod tests {
     }
 
     #[tokio::test]
-    // TODO: remove when https://github.com/tokio-rs/tokio/issues/4245 is fixed
-    #[allow(clippy::semicolon_if_nothing_returned)]
     async fn versions() {
         let res = versions_test_helper(Method::GET).await;
 

diff --git a/services/src/pro/handlers/users.rs b/services/src/pro/handlers/users.rs
@@ -276,8 +276,6 @@ mod tests {
     }
 
     #[tokio::test]
-    // TODO: remove when https://github.com/tokio-rs/tokio/issues/4245 is fixed
-    #[allow(clippy::semicolon_if_nothing_returned)]
     async fn register() {
         let ctx = ProInMemoryContext::default();
 
@@ -424,8 +422,6 @@ mod tests {
     }
 
     #[tokio::test]
-    // TODO: remove when https://github.com/tokio-rs/tokio/issues/4245 is fixed
-    #[allow(clippy::semicolon_if_nothing_returned)]
     async fn login() {
         let res = login_test_helper(Method::POST, "secret123").await;