update reqwest to v0.11 and tokio to v1.2

Cargo.toml

@@ -16,7 +16,7 @@ serde_json = "1.0"
 
 [dependencies.reqwest_]
 package = "reqwest"
-version = "0.10"
+version = "0.11"
 optional = true
 default-features = false
 features = ["gzip"]
@@ -28,8 +28,8 @@ optional = true
 
 [dev-dependencies.tokio]
 package = "tokio"
-version = "0.2"
-features = ["macros"]
+version = "1.2"
+features = ["macros", "rt-multi-thread"]
 
 [features]
 default = ["reqwest", "with_native_tls"]

src/async_impl/mods/api.rs

@@ -30,7 +30,7 @@ where
         request.error.map(|error| ("error", error)),
         request.foo.map(|foo| ("foo", foo)),
     ];
-    let params = params.into_iter().filter_map(|x| x).collect::<Vec<_>>();
+    let params = params.into_iter().flatten().collect::<Vec<_>>();
     let url = crate::get_slack_url_for_method("api.test");
     client
         .send(&url, &params[..])

src/async_impl/mods/auth.rs

@@ -33,7 +33,7 @@ where
             .test
             .map(|test| ("test", if test { "1" } else { "0" })),
     ];
-    let params = params.into_iter().filter_map(|x| x).collect::<Vec<_>>();
+    let params = params.into_iter().flatten().collect::<Vec<_>>();
     let url = crate::get_slack_url_for_method("auth.revoke");
     client
         .send(&url, &params[..])

src/async_impl/mods/bots.rs

@@ -28,7 +28,7 @@ where
     R: SlackWebRequestSender,
 {
     let params = vec![Some(("token", token)), request.bot.map(|bot| ("bot", bot))];
-    let params = params.into_iter().filter_map(|x| x).collect::<Vec<_>>();
+    let params = params.into_iter().flatten().collect::<Vec<_>>();
     let url = crate::get_slack_url_for_method("bots.info");
     client
         .send(&url, &params[..])

src/async_impl/mods/channels.rs

@@ -30,7 +30,7 @@ where
     R: SlackWebRequestSender,
 {
     let params = vec![Some(("token", token)), Some(("channel", request.channel))];
-    let params = params.into_iter().filter_map(|x| x).collect::<Vec<_>>();
+    let params = params.into_iter().flatten().collect::<Vec<_>>();
     let url = crate::get_slack_url_for_method("channels.archive");
     client
         .send(&url, &params[..])
@@ -62,7 +62,7 @@ where
             .validate
             .map(|validate| ("validate", if validate { "1" } else { "0" })),
     ];
-    let params = params.into_iter().filter_map(|x| x).collect::<Vec<_>>();
+    let params = params.into_iter().flatten().collect::<Vec<_>>();
     let url = crate::get_slack_url_for_method("channels.create");
     client
         .send(&url, &params[..])
@@ -103,7 +103,7 @@ where
             .unreads
             .map(|unreads| ("unreads", if unreads { "1" } else { "0" })),
     ];
-    let params = params.into_iter().filter_map(|x| x).collect::<Vec<_>>();
+    let params = params.into_iter().flatten().collect::<Vec<_>>();
     let url = crate::get_slack_url_for_method("channels.history");
     client
         .send(&url, &params[..])
@@ -129,7 +129,7 @@ where
     R: SlackWebRequestSender,
 {
     let params = vec![Some(("token", token)), Some(("channel", request.channel))];
-    let params = params.into_iter().filter_map(|x| x).collect::<Vec<_>>();
+    let params = params.into_iter().flatten().collect::<Vec<_>>();
     let url = crate::get_slack_url_for_method("channels.info");
     client
         .send(&url, &params[..])
@@ -159,7 +159,7 @@ where
         Some(("channel", request.channel)),
         Some(("user", request.user)),
     ];
-    let params = params.into_iter().filter_map(|x| x).collect::<Vec<_>>();
+    let params = params.into_iter().flatten().collect::<Vec<_>>();
     let url = crate::get_slack_url_for_method("channels.invite");
     client
         .send(&url, &params[..])
@@ -191,7 +191,7 @@ where
             .validate
             .map(|validate| ("validate", if validate { "1" } else { "0" })),
     ];
-    let params = params.into_iter().filter_map(|x| x).collect::<Vec<_>>();
+    let params = params.into_iter().flatten().collect::<Vec<_>>();
     let url = crate::get_slack_url_for_method("channels.join");
     client
         .send(&url, &params[..])
@@ -221,7 +221,7 @@ where
         Some(("channel", request.channel)),
         Some(("user", request.user)),
     ];
-    let params = params.into_iter().filter_map(|x| x).collect::<Vec<_>>();
+    let params = params.into_iter().flatten().collect::<Vec<_>>();
     let url = crate::get_slack_url_for_method("channels.kick");
     client
         .send(&url, &params[..])
@@ -247,7 +247,7 @@ where
     R: SlackWebRequestSender,
 {
     let params = vec![Some(("token", token)), Some(("channel", request.channel))];
-    let params = params.into_iter().filter_map(|x| x).collect::<Vec<_>>();
+    let params = params.into_iter().flatten().collect::<Vec<_>>();
     let url = crate::get_slack_url_for_method("channels.leave");
     client
         .send(&url, &params[..])
@@ -281,7 +281,7 @@ where
             .exclude_members
             .map(|exclude_members| ("exclude_members", if exclude_members { "1" } else { "0" })),
     ];
-    let params = params.into_iter().filter_map(|x| x).collect::<Vec<_>>();
+    let params = params.into_iter().flatten().collect::<Vec<_>>();
     let url = crate::get_slack_url_for_method("channels.list");
     client
         .send(&url, &params[..])
@@ -312,7 +312,7 @@ where
         Some(("channel", request.channel)),
         Some(("ts", &ts[..])),
     ];
-    let params = params.into_iter().filter_map(|x| x).collect::<Vec<_>>();
+    let params = params.into_iter().flatten().collect::<Vec<_>>();
     let url = crate::get_slack_url_for_method("channels.mark");
     client
         .send(&url, &params[..])
@@ -345,7 +345,7 @@ where
             .validate
             .map(|validate| ("validate", if validate { "1" } else { "0" })),
     ];
-    let params = params.into_iter().filter_map(|x| x).collect::<Vec<_>>();
+    let params = params.into_iter().flatten().collect::<Vec<_>>();
     let url = crate::get_slack_url_for_method("channels.rename");
     client
         .send(&url, &params[..])
@@ -376,7 +376,7 @@ where
         Some(("channel", request.channel)),
         Some(("thread_ts", &thread_ts[..])),
     ];
-    let params = params.into_iter().filter_map(|x| x).collect::<Vec<_>>();
+    let params = params.into_iter().flatten().collect::<Vec<_>>();
     let url = crate::get_slack_url_for_method("channels.replies");
     client
         .send(&url, &params[..])
@@ -406,7 +406,7 @@ where
         Some(("channel", request.channel)),
         Some(("purpose", request.purpose)),
     ];
-    let params = params.into_iter().filter_map(|x| x).collect::<Vec<_>>();
+    let params = params.into_iter().flatten().collect::<Vec<_>>();
     let url = crate::get_slack_url_for_method("channels.setPurpose");
     client
         .send(&url, &params[..])
@@ -436,7 +436,7 @@ where
         Some(("channel", request.channel)),
         Some(("topic", request.topic)),
     ];
-    let params = params.into_iter().filter_map(|x| x).collect::<Vec<_>>();
+    let params = params.into_iter().flatten().collect::<Vec<_>>();
     let url = crate::get_slack_url_for_method("channels.setTopic");
     client
         .send(&url, &params[..])
@@ -462,7 +462,7 @@ where
     R: SlackWebRequestSender,
 {
     let params = vec![Some(("token", token)), Some(("channel", request.channel))];
-    let params = params.into_iter().filter_map(|x| x).collect::<Vec<_>>();
+    let params = params.into_iter().flatten().collect::<Vec<_>>();
     let url = crate::get_slack_url_for_method("channels.unarchive");
     client
         .send(&url, &params[..])

src/async_impl/mods/chat.rs

@@ -38,7 +38,7 @@ where
             .as_user
             .map(|as_user| ("as_user", if as_user { "1" } else { "0" })),
     ];
-    let params = params.into_iter().filter_map(|x| x).collect::<Vec<_>>();
+    let params = params.into_iter().flatten().collect::<Vec<_>>();
     let url = crate::get_slack_url_for_method("chat.delete");
     client
         .send(&url, &params[..])
@@ -68,7 +68,7 @@ where
         Some(("channel", request.channel)),
         Some(("text", request.text)),
     ];
-    let params = params.into_iter().filter_map(|x| x).collect::<Vec<_>>();
+    let params = params.into_iter().flatten().collect::<Vec<_>>();
     let url = crate::get_slack_url_for_method("chat.meMessage");
     client
         .send(&url, &params[..])
@@ -126,7 +126,7 @@ where
             .reply_broadcast
             .map(|reply_broadcast| ("reply_broadcast", if reply_broadcast { "1" } else { "0" })),
     ];
-    let params = params.into_iter().filter_map(|x| x).collect::<Vec<_>>();
+    let params = params.into_iter().flatten().collect::<Vec<_>>();
     let url = crate::get_slack_url_for_method("chat.postMessage");
     client
         .send(&url, &params[..])
@@ -163,7 +163,7 @@ where
             )
         }),
     ];
-    let params = params.into_iter().filter_map(|x| x).collect::<Vec<_>>();
+    let params = params.into_iter().flatten().collect::<Vec<_>>();
     let url = crate::get_slack_url_for_method("chat.unfurl");
     client
         .send(&url, &params[..])
@@ -205,7 +205,7 @@ where
             .as_user
             .map(|as_user| ("as_user", if as_user { "1" } else { "0" })),
     ];
-    let params = params.into_iter().filter_map(|x| x).collect::<Vec<_>>();
+    let params = params.into_iter().flatten().collect::<Vec<_>>();
     let url = crate::get_slack_url_for_method("chat.update");
     client
         .send(&url, &params[..])

src/async_impl/mods/dnd.rs

@@ -78,7 +78,7 @@ where
         Some(("token", token)),
         request.user.map(|user| ("user", user)),
     ];
-    let params = params.into_iter().filter_map(|x| x).collect::<Vec<_>>();
+    let params = params.into_iter().flatten().collect::<Vec<_>>();
     let url = crate::get_slack_url_for_method("dnd.info");
     client
         .send(&url, &params[..])
@@ -108,7 +108,7 @@ where
         Some(("token", token)),
         Some(("num_minutes", &num_minutes[..])),
     ];
-    let params = params.into_iter().filter_map(|x| x).collect::<Vec<_>>();
+    let params = params.into_iter().flatten().collect::<Vec<_>>();
     let url = crate::get_slack_url_for_method("dnd.setSnooze");
     client
         .send(&url, &params[..])
@@ -137,7 +137,7 @@ where
         Some(("token", token)),
         request.users.map(|users| ("users", users)),
     ];
-    let params = params.into_iter().filter_map(|x| x).collect::<Vec<_>>();
+    let params = params.into_iter().flatten().collect::<Vec<_>>();
     let url = crate::get_slack_url_for_method("dnd.teamInfo");
     client
         .send(&url, &params[..])

src/async_impl/mods/files.rs

@@ -30,7 +30,7 @@ where
     R: SlackWebRequestSender,
 {
     let params = vec![Some(("token", token)), Some(("file", request.file))];
-    let params = params.into_iter().filter_map(|x| x).collect::<Vec<_>>();
+    let params = params.into_iter().flatten().collect::<Vec<_>>();
     let url = crate::get_slack_url_for_method("files.delete");
     client
         .send(&url, &params[..])
@@ -63,7 +63,7 @@ where
         count.as_ref().map(|count| ("count", &count[..])),
         page.as_ref().map(|page| ("page", &page[..])),
     ];
-    let params = params.into_iter().filter_map(|x| x).collect::<Vec<_>>();
+    let params = params.into_iter().flatten().collect::<Vec<_>>();
     let url = crate::get_slack_url_for_method("files.info");
     client
         .send(&url, &params[..])
@@ -102,7 +102,7 @@ where
         count.as_ref().map(|count| ("count", &count[..])),
         page.as_ref().map(|page| ("page", &page[..])),
     ];
-    let params = params.into_iter().filter_map(|x| x).collect::<Vec<_>>();
+    let params = params.into_iter().flatten().collect::<Vec<_>>();
     let url = crate::get_slack_url_for_method("files.list");
     client
         .send(&url, &params[..])
@@ -128,7 +128,7 @@ where
     R: SlackWebRequestSender,
 {
     let params = vec![Some(("token", token)), Some(("file", request.file))];
-    let params = params.into_iter().filter_map(|x| x).collect::<Vec<_>>();
+    let params = params.into_iter().flatten().collect::<Vec<_>>();
     let url = crate::get_slack_url_for_method("files.revokePublicURL");
     client
         .send(&url, &params[..])
@@ -154,7 +154,7 @@ where
     R: SlackWebRequestSender,
 {
     let params = vec![Some(("token", token)), Some(("file", request.file))];
-    let params = params.into_iter().filter_map(|x| x).collect::<Vec<_>>();
+    let params = params.into_iter().flatten().collect::<Vec<_>>();
     let url = crate::get_slack_url_for_method("files.sharedPublicURL");
     client
         .send(&url, &params[..])

src/async_impl/mods/files_comments.rs

@@ -32,7 +32,7 @@ where
         Some(("file", request.file)),
         Some(("comment", request.comment)),
     ];
-    let params = params.into_iter().filter_map(|x| x).collect::<Vec<_>>();
+    let params = params.into_iter().flatten().collect::<Vec<_>>();
     let url = crate::get_slack_url_for_method("files.comments.add");
     client
         .send(&url, &params[..])
@@ -62,7 +62,7 @@ where
         Some(("file", request.file)),
         Some(("id", request.id)),
     ];
-    let params = params.into_iter().filter_map(|x| x).collect::<Vec<_>>();
+    let params = params.into_iter().flatten().collect::<Vec<_>>();
     let url = crate::get_slack_url_for_method("files.comments.delete");
     client
         .send(&url, &params[..])
@@ -93,7 +93,7 @@ where
         Some(("id", request.id)),
         Some(("comment", request.comment)),
     ];
-    let params = params.into_iter().filter_map(|x| x).collect::<Vec<_>>();
+    let params = params.into_iter().flatten().collect::<Vec<_>>();
     let url = crate::get_slack_url_for_method("files.comments.edit");
     client
         .send(&url, &params[..])