diff options
| author | bors <bors@rust-lang.org> | 2013-08-18 05:11:58 -0700 |
|---|---|---|
| committer | bors <bors@rust-lang.org> | 2013-08-18 05:11:58 -0700 |
| commit | 3bc685842802edfcd2918f911268f8e345cf3c26 (patch) | |
| tree | 7ef40025a4a23dfcd30b30ba648f360fa6fa6d04 /src/libstd/rt | |
| parent | 600901152c223faad80d7cb419cecccd71803723 (diff) | |
| parent | 6440343a6c26fca12ef2e323fa7738dce9da1986 (diff) | |
| download | rust-3bc685842802edfcd2918f911268f8e345cf3c26.tar.gz rust-3bc685842802edfcd2918f911268f8e345cf3c26.zip | |
auto merge of #8551 : huonw/rust/speling, r=alexcrichton
(This doesn't add/remove `u`s or change `ize` to `ise`, or anything like that.)
Diffstat (limited to 'src/libstd/rt')
| -rw-r--r-- | src/libstd/rt/io/extensions.rs | 2 | ||||
| -rw-r--r-- | src/libstd/rt/io/mod.rs | 10 | ||||
| -rw-r--r-- | src/libstd/rt/mod.rs | 24 | ||||
| -rw-r--r-- | src/libstd/rt/task.rs | 3 | ||||
| -rw-r--r-- | src/libstd/rt/uv/mod.rs | 2 | ||||
| -rw-r--r-- | src/libstd/rt/uv/uvll.rs | 2 |
6 files changed, 21 insertions, 22 deletions
diff --git a/src/libstd/rt/io/extensions.rs b/src/libstd/rt/io/extensions.rs index 2d21bf0f9dc..d136ddc0fdf 100644 --- a/src/libstd/rt/io/extensions.rs +++ b/src/libstd/rt/io/extensions.rs @@ -262,7 +262,7 @@ pub trait WriterByteConversions { /// (8 bytes). fn write_le_f64(&mut self, f: f64); - /// Write a litten-endian IEEE754 single-precision floating-point + /// Write a little-endian IEEE754 single-precision floating-point /// (4 bytes). fn write_le_f32(&mut self, f: f32); diff --git a/src/libstd/rt/io/mod.rs b/src/libstd/rt/io/mod.rs index c980dc9d73e..9ec1b699b1d 100644 --- a/src/libstd/rt/io/mod.rs +++ b/src/libstd/rt/io/mod.rs @@ -19,7 +19,7 @@ file, TCP, UDP, Unix domain sockets. Readers and Writers may be composed to add capabilities like string parsing, encoding, and compression. -This will likely live in core::io, not core::rt::io. +This will likely live in std::io, not std::rt::io. # Examples @@ -93,7 +93,7 @@ Asynchronous interfaces are most often associated with the callback (continuation-passing) style popularised by node.js. Such systems rely on all computations being run inside an event loop which maintains a list of all pending I/O events; when one completes the registered -callback is run and the code that made the I/O request continiues. +callback is run and the code that made the I/O request continues. Such interfaces achieve non-blocking at the expense of being more difficult to reason about. @@ -136,7 +136,7 @@ Rust's I/O employs a combination of techniques to reduce boilerplate while still providing feedback about errors. The basic strategy: * Errors are fatal by default, resulting in task failure -* Errors raise the `io_error` conditon which provides an opportunity to inspect +* Errors raise the `io_error` condition which provides an opportunity to inspect an IoError object containing details. * Return values must have a sensible null or zero value which is returned if a condition is handled successfully. This may be an `Option`, an empty @@ -189,7 +189,7 @@ will start passing around null or zero objects when wrapped in a condition handl * XXX: How should we use condition handlers that return values? * XXX: Should EOF raise default conditions when EOF is not an error? -# Issues withi/o scheduler affinity, work stealing, task pinning +# Issues with i/o scheduler affinity, work stealing, task pinning # Resource management @@ -430,7 +430,7 @@ pub trait Reader { /// println(reader.read_line()); /// } /// - /// # Failue + /// # Failure /// /// Returns `true` on failure. fn eof(&mut self) -> bool; diff --git a/src/libstd/rt/mod.rs b/src/libstd/rt/mod.rs index 65214d0cea7..58e86f97f71 100644 --- a/src/libstd/rt/mod.rs +++ b/src/libstd/rt/mod.rs @@ -40,17 +40,17 @@ out of `rt` as development proceeds. Several modules in `core` are clients of `rt`: -* `core::task` - The user-facing interface to the Rust task model. -* `core::task::local_data` - The interface to local data. -* `core::gc` - The garbage collector. -* `core::unstable::lang` - Miscellaneous lang items, some of which rely on `core::rt`. -* `core::condition` - Uses local data. -* `core::cleanup` - Local heap destruction. -* `core::io` - In the future `core::io` will use an `rt` implementation. -* `core::logging` -* `core::pipes` -* `core::comm` -* `core::stackwalk` +* `std::task` - The user-facing interface to the Rust task model. +* `std::task::local_data` - The interface to local data. +* `std::gc` - The garbage collector. +* `std::unstable::lang` - Miscellaneous lang items, some of which rely on `std::rt`. +* `std::condition` - Uses local data. +* `std::cleanup` - Local heap destruction. +* `std::io` - In the future `std::io` will use an `rt` implementation. +* `std::logging` +* `std::pipes` +* `std::comm` +* `std::stackwalk` */ @@ -139,7 +139,7 @@ pub mod rc; /// scheduler and task context pub mod tube; -/// Simple reimplementation of core::comm +/// Simple reimplementation of std::comm pub mod comm; mod select; diff --git a/src/libstd/rt/task.rs b/src/libstd/rt/task.rs index 708166518bb..01a8882e4f9 100644 --- a/src/libstd/rt/task.rs +++ b/src/libstd/rt/task.rs @@ -69,7 +69,7 @@ pub struct Coroutine { saved_context: Context } -/// Some tasks have a deciated home scheduler that they must run on. +/// Some tasks have a dedicated home scheduler that they must run on. pub enum SchedHome { AnySched, Sched(SchedHandle) @@ -592,4 +592,3 @@ mod test { } } } - diff --git a/src/libstd/rt/uv/mod.rs b/src/libstd/rt/uv/mod.rs index 6c5a28b31b1..59833a16ed8 100644 --- a/src/libstd/rt/uv/mod.rs +++ b/src/libstd/rt/uv/mod.rs @@ -10,7 +10,7 @@ /*! -Bindings to libuv, along with the default implementation of `core::rt::rtio`. +Bindings to libuv, along with the default implementation of `std::rt::rtio`. UV types consist of the event loop (Loop), Watchers, Requests and Callbacks. diff --git a/src/libstd/rt/uv/uvll.rs b/src/libstd/rt/uv/uvll.rs index 11d64f4697c..c04004dfbf6 100644 --- a/src/libstd/rt/uv/uvll.rs +++ b/src/libstd/rt/uv/uvll.rs @@ -23,7 +23,7 @@ * There are also a collection of helper functions to ease interacting * with the low-level API. * - * As new functionality, existant in uv.h, is added to the rust stdlib, + * As new functionality, existent in uv.h, is added to the rust stdlib, * the mappings should be added in this module. */ |
