Skip to content

Commit

Permalink
Merge pull request rust-lang#10 from MarkusJais/master
Browse files Browse the repository at this point in the history
more fixed typos in the documentation
  • Loading branch information
alexcrichton authored Jul 26, 2016
2 parents 7654bd5 + ac26652 commit 2224c8d
Show file tree
Hide file tree
Showing 5 changed files with 6 additions and 6 deletions.
2 changes: 1 addition & 1 deletion src/collect.rs
Original file line number Diff line number Diff line change
Expand Up @@ -21,7 +21,7 @@ pub struct Collect<I>
/// given.
///
/// The returned future will execute each underlying future one at a time,
/// collecting the results into a destincation `Vec<T>`. If any future returns
/// collecting the results into a destination `Vec<T>`. If any future returns
/// an error then all other futures will be canceled and an error will be
/// returned immediately. If all futures complete successfully, however, then
/// the returned future will succeed with a `Vec` of all the successful results.
Expand Down
2 changes: 1 addition & 1 deletion src/flatten.rs
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
use {Future, IntoFuture, Task, Poll};
use chain::Chain;

/// Future for the `flatten` combinator, flattening a future-of-a-future to just
/// Future for the `flatten` combinator, flattening a future-of-a-future to get just
/// the result of the final future.
///
/// This is created by this `Future::flatten` method.
Expand Down
2 changes: 1 addition & 1 deletion src/fuse.rs
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
use {Future, Task, Poll};

/// A future which "fuse"s an future once it's been resolved.
/// A future which "fuse"s a future once it's been resolved.
///
/// Normally futures can behave unpredictable once they're used after a future
/// has been resolved, but `Fuse` is always defined to return `None` from `poll`
Expand Down
2 changes: 1 addition & 1 deletion src/lock.rs
Original file line number Diff line number Diff line change
Expand Up @@ -36,7 +36,7 @@ impl<T> Lock<T> {
}
}

/// Attempts to acquire this lock, returning whether the lock as acquired or
/// Attempts to acquire this lock, returning whether the lock was acquired or
/// not.
///
/// If `Some` is returned then the data this lock protects can be accessed
Expand Down
4 changes: 2 additions & 2 deletions src/poll.rs
Original file line number Diff line number Diff line change
Expand Up @@ -18,7 +18,7 @@ pub enum Poll<T, E> {
/// what the future completed with.
Ok(T),

/// Indicates that the future has failed, and this error what the future
/// Indicates that the future has failed, and this error is what the future
/// failed with.
Err(E),
}
Expand All @@ -35,7 +35,7 @@ impl<T, E> Poll<T, E> {
}
}

/// Change the error type of this `Poll` with the closure provided
/// Change the error type of this `Poll` value with the closure provided
pub fn map_err<F, U>(self, f: F) -> Poll<T, U>
where F: FnOnce(E) -> U
{
Expand Down

0 comments on commit 2224c8d

Please sign in to comment.