Skip to content

Commit

Permalink
Merge pull request rust-lang#306 from DirkyJerky/patch-1
Browse files Browse the repository at this point in the history
Fix typo
  • Loading branch information
alexcrichton authored Dec 25, 2016
2 parents 0163721 + 53434c6 commit 0940a17
Showing 1 changed file with 2 additions and 2 deletions.
4 changes: 2 additions & 2 deletions src/future/mod.rs
Original file line number Diff line number Diff line change
Expand Up @@ -495,8 +495,8 @@ pub trait Future {
/// both the value resolved and a future representing the completion of the
/// other work. Both futures must have the same item and error type.
///
/// Note that this function consumes the receiving future and returns a
/// wrapped version of it.
/// Note that this function consumes the receiving futures and returns a
/// wrapped version of them.
///
/// # Examples
///
Expand Down

0 comments on commit 0940a17

Please sign in to comment.