Skip to content

Commit

Permalink
Merge pull request rust-lang#349 from Idolf/master
Browse files Browse the repository at this point in the history
Replaced `list` with `iter`, since that is the function arguments' name
  • Loading branch information
alexcrichton authored Jan 12, 2017
2 parents 37e55df + ba71d93 commit 0a9d810
Show file tree
Hide file tree
Showing 2 changed files with 3 additions and 3 deletions.
2 changes: 1 addition & 1 deletion src/future/select_all.rs
Original file line number Diff line number Diff line change
Expand Up @@ -20,7 +20,7 @@ pub type SelectAllNext<A> = A;

/// Creates a new future which will select over a list of futures.
///
/// The returned future will wait for any future within `list` to be ready. Upon
/// The returned future will wait for any future within `iter` to be ready. Upon
/// completion or failure the item resolved will be returned, along with the
/// index of the future that was ready and the list of all the remaining
/// futures.
Expand Down
4 changes: 2 additions & 2 deletions src/future/select_ok.rs
Original file line number Diff line number Diff line change
Expand Up @@ -18,8 +18,8 @@ pub struct SelectOk<A> where A: Future {

/// Creates a new future which will select the first successful future over a list of futures.
///
/// The returned future will wait for any future within `list` to be ready and Ok. Unlike
/// select_all, this will only return the first successful completion, or the last
/// The returned future will wait for any future within `iter` to be ready and Ok. Unlike
/// `select_all`, this will only return the first successful completion, or the last
/// failure. This is useful in contexts where any success is desired and failures
/// are ignored, unless all the futures fail.
///
Expand Down

0 comments on commit 0a9d810

Please sign in to comment.