diff options
| author | bors <bors@rust-lang.org> | 2014-05-22 20:56:18 -0700 |
|---|---|---|
| committer | bors <bors@rust-lang.org> | 2014-05-22 20:56:18 -0700 |
| commit | 02117dd1bc10c65ca1f56fd81996a573c88ccfd5 (patch) | |
| tree | 37eef5dbc14141cacc83d97e025cc398a85f7508 /src/libstd | |
| parent | ec0258a381b88b5574e3f8ce72ae553ac3a574b7 (diff) | |
| parent | d3fde8476b9cdce734dcec6b2003a482c5908235 (diff) | |
| download | rust-02117dd1bc10c65ca1f56fd81996a573c88ccfd5.tar.gz rust-02117dd1bc10c65ca1f56fd81996a573c88ccfd5.zip | |
auto merge of #14357 : huonw/rust/spelling, r=pnkfelix
The span on a inner doc-comment would point to the next token, e.g. the span for the `a` line points to the `b` line, and the span of `b` points to the `fn`.
```rust
//! a
//! b
fn bar() {}
```
Diffstat (limited to 'src/libstd')
| -rw-r--r-- | src/libstd/io/mod.rs | 8 | ||||
| -rw-r--r-- | src/libstd/io/process.rs | 2 | ||||
| -rw-r--r-- | src/libstd/io/stdio.rs | 2 | ||||
| -rw-r--r-- | src/libstd/io/timer.rs | 2 |
4 files changed, 7 insertions, 7 deletions
diff --git a/src/libstd/io/mod.rs b/src/libstd/io/mod.rs index 50bd3e7067c..0d71c3de76c 100644 --- a/src/libstd/io/mod.rs +++ b/src/libstd/io/mod.rs @@ -407,7 +407,7 @@ pub enum IoErrorKind { PermissionDenied, /// A network connection failed for some reason not specified in this list. ConnectionFailed, - /// The network operation failed because the network connection was cloesd. + /// The network operation failed because the network connection was closed. Closed, /// The connection was refused by the remote server. ConnectionRefused, @@ -474,7 +474,7 @@ pub trait Reader { /// inspected for in the error's `kind` field. Also note that reading 0 /// bytes is not considered an error in all circumstances /// - /// # Implementaton Note + /// # Implementation Note /// /// When implementing this method on a new Reader, you are strongly encouraged /// not to return 0 if you can avoid it. @@ -947,9 +947,9 @@ fn extend_sign(val: u64, nbytes: uint) -> i64 { /// A trait for objects which are byte-oriented streams. Writers are defined by /// one method, `write`. This function will block until the provided buffer of -/// bytes has been entirely written, and it will return any failurs which occur. +/// bytes has been entirely written, and it will return any failures which occur. /// -/// Another commonly overriden method is the `flush` method for writers such as +/// Another commonly overridden method is the `flush` method for writers such as /// buffered writers. /// /// Writers are intended to be composable with one another. Many objects diff --git a/src/libstd/io/process.rs b/src/libstd/io/process.rs index 7d84530282f..d2a83dd840d 100644 --- a/src/libstd/io/process.rs +++ b/src/libstd/io/process.rs @@ -123,7 +123,7 @@ impl Command { /// * Inherit the current process's environment /// * Inherit the current process's working directory /// * A readable pipe for stdin (file descriptor 0) - /// * A writeable pipe for stdour and stderr (file descriptors 1 and 2) + /// * A writeable pipe for stdout and stderr (file descriptors 1 and 2) /// /// Builder methods are provided to change these defaults and /// otherwise configure the process. diff --git a/src/libstd/io/stdio.rs b/src/libstd/io/stdio.rs index 3a103651d63..ab7001cbc9a 100644 --- a/src/libstd/io/stdio.rs +++ b/src/libstd/io/stdio.rs @@ -92,7 +92,7 @@ fn src<T>(fd: libc::c_int, readable: bool, f: |StdSource| -> T) -> T { /// provided unbuffered access to stdin. /// /// Care should be taken when creating multiple handles to the stdin of a -/// process. Beause this is a buffered reader by default, it's possible for +/// process. Because this is a buffered reader by default, it's possible for /// pending input to be unconsumed in one reader and unavailable to other /// readers. It is recommended that only one handle at a time is created for the /// stdin of a process. diff --git a/src/libstd/io/timer.rs b/src/libstd/io/timer.rs index 5565918ef85..2df6062b7ac 100644 --- a/src/libstd/io/timer.rs +++ b/src/libstd/io/timer.rs @@ -52,7 +52,7 @@ use rt::rtio::{IoFactory, LocalIo, RtioTimer}; /// # } /// ``` /// -/// If only sleeping is necessary, then a convenience api is provided through +/// If only sleeping is necessary, then a convenience API is provided through /// the `io::timer` module. /// /// ``` |
