diff options
Diffstat (limited to 'src/libstd')
| -rw-r--r-- | src/libstd/comm/select.rs | 2 | ||||
| -rw-r--r-- | src/libstd/io/mod.rs | 2 | ||||
| -rw-r--r-- | src/libstd/iter.rs | 2 | ||||
| -rw-r--r-- | src/libstd/rt/task.rs | 2 | ||||
| -rw-r--r-- | src/libstd/rt/unwind.rs | 2 | ||||
| -rw-r--r-- | src/libstd/sync/mpsc_queue.rs | 3 |
6 files changed, 6 insertions, 7 deletions
diff --git a/src/libstd/comm/select.rs b/src/libstd/comm/select.rs index e41fa60aa42..02066086ad7 100644 --- a/src/libstd/comm/select.rs +++ b/src/libstd/comm/select.rs @@ -144,7 +144,7 @@ impl Select { } } - /// Waits for an event on this port set. The returned valus is *not* and + /// Waits for an event on this port set. The returned value is *not* an /// index, but rather an id. This id can be queried against any active /// `Handle` structures (each one has an `id` method). The handle with /// the matching `id` will have some sort of event available on it. The diff --git a/src/libstd/io/mod.rs b/src/libstd/io/mod.rs index c99fe587fc0..2eadf9a7f4f 100644 --- a/src/libstd/io/mod.rs +++ b/src/libstd/io/mod.rs @@ -1287,7 +1287,7 @@ pub trait Acceptor<T> { /// /// Since connection attempts can continue forever, this iterator always returns /// `Some`. The `Some` contains the `IoResult` representing whether the -/// connection attempt was succesful. A successful connection will be wrapped +/// connection attempt was successful. A successful connection will be wrapped /// in `Ok`. A failed connection is represented as an `Err`. pub struct IncomingConnections<'a, A> { priv inc: &'a mut A, diff --git a/src/libstd/iter.rs b/src/libstd/iter.rs index e5a89fc42e1..7516a3ddf54 100644 --- a/src/libstd/iter.rs +++ b/src/libstd/iter.rs @@ -883,7 +883,7 @@ pub trait OrdIterator<A> { /// ``` fn min(&mut self) -> Option<A>; - /// `min_max` finds the mininum and maximum elements in the iterator. + /// `min_max` finds the minimum and maximum elements in the iterator. /// /// The return type `MinMaxResult` is an enum of three variants: /// - `NoElements` if the iterator is empty. diff --git a/src/libstd/rt/task.rs b/src/libstd/rt/task.rs index 0719523af77..72ba98eab4f 100644 --- a/src/libstd/rt/task.rs +++ b/src/libstd/rt/task.rs @@ -254,7 +254,7 @@ impl Task { ops.deschedule(amt, self, f) } - /// Wakes up a previously blocked task, optionally specifiying whether the + /// Wakes up a previously blocked task, optionally specifying whether the /// current task can accept a change in scheduling. This function can only /// be called on tasks that were previously blocked in `deschedule`. pub fn reawaken(mut ~self) { diff --git a/src/libstd/rt/unwind.rs b/src/libstd/rt/unwind.rs index 5718a27bfef..ef8bd94c897 100644 --- a/src/libstd/rt/unwind.rs +++ b/src/libstd/rt/unwind.rs @@ -400,7 +400,7 @@ pub fn begin_unwind_raw(msg: *u8, file: *u8, line: uint) -> ! { /// The entry point for unwinding with a formatted message. /// /// This is designed to reduce the amount of code required at the call -/// site as much as possible (so that `fail!()` has as low an implact +/// site as much as possible (so that `fail!()` has as low an impact /// on (e.g.) the inlining of other functions as possible), by moving /// the actual formatting into this shared place. #[inline(never)] #[cold] diff --git a/src/libstd/sync/mpsc_queue.rs b/src/libstd/sync/mpsc_queue.rs index b5a55f3f8c9..2dc63380cb8 100644 --- a/src/libstd/sync/mpsc_queue.rs +++ b/src/libstd/sync/mpsc_queue.rs @@ -104,7 +104,7 @@ impl<T: Send> Queue<T> { /// /// Note that the current implementation means that this function cannot /// return `Option<T>`. It is possible for this queue to be in an - /// inconsistent state where many pushes have suceeded and completely + /// inconsistent state where many pushes have succeeded and completely /// finished, but pops cannot return `Some(t)`. This inconsistent state /// happens when a pusher is pre-empted at an inopportune moment. /// @@ -203,4 +203,3 @@ mod tests { } } } - |