From 679da06eef88d62cadd5d154c0fc1a5bea83374b Mon Sep 17 00:00:00 2001 From: Yoshua Wuyts Date: Fri, 1 Nov 2019 01:49:31 +0100 Subject: [PATCH] rename select to race Signed-off-by: Yoshua Wuyts --- src/future/future/mod.rs | 26 +++++++++---------- src/future/future/{select.rs => race.rs} | 6 ++--- .../future/{try_select.rs => try_race.rs} | 6 ++--- 3 files changed, 19 insertions(+), 19 deletions(-) rename src/future/future/{select.rs => race.rs} (93%) rename src/future/future/{try_select.rs => try_race.rs} (94%) diff --git a/src/future/future/mod.rs b/src/future/future/mod.rs index d67b4a2a1..dad94daa8 100644 --- a/src/future/future/mod.rs +++ b/src/future/future/mod.rs @@ -1,13 +1,13 @@ cfg_unstable! { mod delay; - mod select; - mod try_select; + mod race; + mod try_race; use std::time::Duration; use delay::DelayFuture; - use select::Select; - use try_select::TrySelect; + use race::Race; + use try_race::TryRace; } extension_trait! { @@ -160,22 +160,22 @@ extension_trait! { let b = future::ready(1u8); let c = future::ready(2u8); - let f = a.select(b).select(c); + let f = a.race(b).race(c); assert_eq!(f.await, 1u8); # }); ``` "#] #[cfg(any(feature = "unstable", feature = "docs"))] #[cfg_attr(feature = "docs", doc(cfg(unstable)))] - fn select( + fn race( self, other: F - ) -> impl Future::Output> [Select] + ) -> impl Future::Output> [Race] where Self: std::future::Future + Sized, F: std::future::Future::Output>, { - Select::new(self, other) + Race::new(self, other) } #[doc = r#" @@ -183,7 +183,7 @@ extension_trait! { Awaits multiple futures simultaneously, returning all results once complete. - `try_select` is similar to [`select`], but keeps going if a future + `try_race` is similar to [`race`], but keeps going if a future resolved to an error until all futures have been resolved. In which case an error is returned. @@ -203,7 +203,7 @@ extension_trait! { let b = future::ready(Err(Error::from(ErrorKind::Other))); let c = future::ready(Ok(1u8)); - let f = a.try_select(b).try_select(c); + let f = a.try_race(b).try_race(c); assert_eq!(f.await?, 1u8); # # Ok(()) }) } @@ -211,15 +211,15 @@ extension_trait! { "#] #[cfg(any(feature = "unstable", feature = "docs"))] #[cfg_attr(feature = "docs", doc(cfg(unstable)))] - fn try_select( + fn try_race( self, other: F - ) -> impl Future::Output> [TrySelect] + ) -> impl Future::Output> [TryRace] where Self: std::future::Future> + Sized, F: std::future::Future::Output>, { - TrySelect::new(self, other) + TryRace::new(self, other) } } diff --git a/src/future/future/select.rs b/src/future/future/race.rs similarity index 93% rename from src/future/future/select.rs rename to src/future/future/race.rs index 928595848..2fd604a73 100644 --- a/src/future/future/select.rs +++ b/src/future/future/race.rs @@ -9,7 +9,7 @@ use std::future::Future; pin_project! { #[allow(missing_docs)] #[allow(missing_debug_implementations)] - pub struct Select + pub struct Race where L: Future, R: Future @@ -19,7 +19,7 @@ pin_project! { } } -impl Select +impl Race where L: Future, R: Future, @@ -32,7 +32,7 @@ where } } -impl Future for Select +impl Future for Race where L: Future, R: Future, diff --git a/src/future/future/try_select.rs b/src/future/future/try_race.rs similarity index 94% rename from src/future/future/try_select.rs rename to src/future/future/try_race.rs index f87360dac..d0ca4a90f 100644 --- a/src/future/future/try_select.rs +++ b/src/future/future/try_race.rs @@ -9,7 +9,7 @@ use std::future::Future; pin_project! { #[allow(missing_docs)] #[allow(missing_debug_implementations)] - pub struct TrySelect + pub struct TryRace where L: Future, R: Future @@ -19,7 +19,7 @@ pin_project! { } } -impl TrySelect +impl TryRace where L: Future, R: Future, @@ -32,7 +32,7 @@ where } } -impl Future for TrySelect +impl Future for TryRace where L: Future>, R: Future,