Replaces future::try_join's with tokio::try_join!

1 files changed, 11 insertions, 11 deletions

diff --git a/rust/scraper/src/touchpad/mod.rs b/rust/scraper/src/touchpad/mod.rs
index 182edc9..515ba92 100644
--- a/rust/scraper/src/touchpad/mod.rs
+++ b/rust/scraper/src/touchpad/mod.rs
@@ -3,10 +3,11 @@ mod request_response;
 mod conversion;
 
 use std::borrow::Cow;
-use futures::{future, TryFutureExt};
+use futures::{TryStreamExt};
 use proto::touchpad::common::v1;
 use reqwest::Client;
 use std::collections::HashMap;
+use tokio::try_join;
 
 pub use error::TouchpadLiveError;
 use proto::ProtoTimestamp;
@@ -56,7 +57,7 @@ impl<'a> TouchpadLiveClient<'a> {
             .await?
             .json::<Vec<TeamInfoResponse>>();
 
-        let (resp, teams) = future::try_join(meet_info_handle, team_info_handle).await?;
+        let (resp, teams) = try_join!(meet_info_handle, team_info_handle)?;
 
         Ok(v1::SwimMeet {
             id,
@@ -101,7 +102,7 @@ impl<'a> TouchpadLiveClient<'a> {
                 .send()
                 .await?
                 .json::<Vec<ParticipantResponse>>()
-                .map_err(|e| e.into());
+                .err_into();
 
             let swimmer_map = self
                 .client
@@ -109,7 +110,7 @@ impl<'a> TouchpadLiveClient<'a> {
                 .send()
                 .await?
                 .json()
-                .map_err(|e| e.into())
+                .err_into()
                 .map_ok(|x: HashMap<String, Vec<u32>>| x
                     .into_iter()
                     .filter_map(|(k, v)| Some((k.parse::<u32>().ok()?, v)))
@@ -118,9 +119,8 @@ impl<'a> TouchpadLiveClient<'a> {
 
             let events = get_events(self, id);
 
-            future::try_join3(swimmers, swimmer_map, events)
-        }
-            .await?;
+            try_join!(swimmers, swimmer_map, events)
+        }?;
 
         Ok(process_swimmers(swimmers, &swimmer_map, events))
     }
@@ -131,8 +131,8 @@ impl<'a> TouchpadLiveClient<'a> {
 
             let event = get_event(self, "individual", meet_id, ev_id);
 
-            future::try_join(events, event)
-        }.await?;
+            try_join!(events, event)
+        }?;
 
         let event = events
             .into_iter()
@@ -147,8 +147,8 @@ impl<'a> TouchpadLiveClient<'a> {
             let events = get_events(self, meet_id);
             let event = get_event(self, "relay", meet_id, ev_id);
 
-            future::try_join(events, event)
-        }.await?;
+            try_join!(events, event)
+        }?;
 
         let event = events
             .into_iter()