Navigation Menu

Skip to content

Commit

Permalink
remove references to IoResult
Browse files Browse the repository at this point in the history
This is now std::io::Result
  • Loading branch information
steveklabnik committed May 28, 2015
1 parent a5a5fce commit 16a47c2
Show file tree
Hide file tree
Showing 5 changed files with 6 additions and 6 deletions.
2 changes: 1 addition & 1 deletion src/doc/style/errors/ergonomics.md
Expand Up @@ -63,4 +63,4 @@ for more details.
### The `Result`-`impl` pattern [FIXME]

> **[FIXME]** Document the way that the `io` module uses trait impls
> on `IoResult` to painlessly propagate errors.
> on `std::io::Result` to painlessly propagate errors.
2 changes: 1 addition & 1 deletion src/doc/style/features/functions-and-methods/input.md
Expand Up @@ -121,7 +121,7 @@ The primary exception: sometimes a function is meant to modify data
that the caller already owns, for example to re-use a buffer:

```rust
fn read(&mut self, buf: &mut [u8]) -> IoResult<usize>
fn read(&mut self, buf: &mut [u8]) -> std::io::Result<usize>
```

(From the [Reader trait](http://static.rust-lang.org/doc/master/std/io/trait.Reader.html#tymethod.read).)
Expand Down
2 changes: 1 addition & 1 deletion src/doc/style/ownership/builders.md
Expand Up @@ -75,7 +75,7 @@ impl Command {
}

/// Executes the command as a child process, which is returned.
pub fn spawn(&self) -> IoResult<Process> {
pub fn spawn(&self) -> std::io::Result<Process> {
...
}
}
Expand Down
4 changes: 2 additions & 2 deletions src/libcollections/fmt.rs
Expand Up @@ -164,8 +164,8 @@
//! provides some helper methods.
//!
//! Additionally, the return value of this function is `fmt::Result` which is a
//! typedef to `Result<(), IoError>` (also known as `IoResult<()>`). Formatting
//! implementations should ensure that they return errors from `write!`
//! typedef to `Result<(), std::io::Error>` (also known as `std::io::Result<()>`).
//! Formatting implementations should ensure that they return errors from `write!`
//! correctly (propagating errors upward).
//!
//! An example of implementing the formatting traits would look
Expand Down
2 changes: 1 addition & 1 deletion src/libstd/rand/mod.rs
Expand Up @@ -95,7 +95,7 @@ impl StdRng {
/// appropriate.
///
/// Reading the randomness from the OS may fail, and any error is
/// propagated via the `IoResult` return value.
/// propagated via the `io::Result` return value.
pub fn new() -> io::Result<StdRng> {
OsRng::new().map(|mut r| StdRng { rng: r.gen() })
}
Expand Down

0 comments on commit 16a47c2

Please sign in to comment.