Skip to content

Commit 2224c8d

Browse files
authored
Merge pull request rust-lang#10 from MarkusJais/master
more fixed typos in the documentation
2 parents 7654bd5 + ac26652 commit 2224c8d

File tree

5 files changed

+6
-6
lines changed

5 files changed

+6
-6
lines changed

src/collect.rs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -21,7 +21,7 @@ pub struct Collect<I>
2121
/// given.
2222
///
2323
/// The returned future will execute each underlying future one at a time,
24-
/// collecting the results into a destincation `Vec<T>`. If any future returns
24+
/// collecting the results into a destination `Vec<T>`. If any future returns
2525
/// an error then all other futures will be canceled and an error will be
2626
/// returned immediately. If all futures complete successfully, however, then
2727
/// the returned future will succeed with a `Vec` of all the successful results.

src/flatten.rs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
use {Future, IntoFuture, Task, Poll};
22
use chain::Chain;
33

4-
/// Future for the `flatten` combinator, flattening a future-of-a-future to just
4+
/// Future for the `flatten` combinator, flattening a future-of-a-future to get just
55
/// the result of the final future.
66
///
77
/// This is created by this `Future::flatten` method.

src/fuse.rs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
use {Future, Task, Poll};
22

3-
/// A future which "fuse"s an future once it's been resolved.
3+
/// A future which "fuse"s a future once it's been resolved.
44
///
55
/// Normally futures can behave unpredictable once they're used after a future
66
/// has been resolved, but `Fuse` is always defined to return `None` from `poll`

src/lock.rs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -36,7 +36,7 @@ impl<T> Lock<T> {
3636
}
3737
}
3838

39-
/// Attempts to acquire this lock, returning whether the lock as acquired or
39+
/// Attempts to acquire this lock, returning whether the lock was acquired or
4040
/// not.
4141
///
4242
/// If `Some` is returned then the data this lock protects can be accessed

src/poll.rs

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -18,7 +18,7 @@ pub enum Poll<T, E> {
1818
/// what the future completed with.
1919
Ok(T),
2020

21-
/// Indicates that the future has failed, and this error what the future
21+
/// Indicates that the future has failed, and this error is what the future
2222
/// failed with.
2323
Err(E),
2424
}
@@ -35,7 +35,7 @@ impl<T, E> Poll<T, E> {
3535
}
3636
}
3737

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

0 commit comments

Comments
 (0)