about summary refs log tree commit diff
diff options
context:
space:
mode:
authorSteve Klabnik <steve@steveklabnik.com>2015-05-27 14:15:24 -0400
committerSteve Klabnik <steve@steveklabnik.com>2015-05-28 12:51:01 -0400
commit16a47c2d916ad51660d638b85e30125ac3f3fe53 (patch)
treecbbcaad2b3240a4079163a5dcd9e23e22232206d
parenta5a5fcee386119b016c4ef8908cbd449dc65b730 (diff)
remove references to IoResult
This is now std::io::Result
-rw-r--r--src/doc/style/errors/ergonomics.md2
-rw-r--r--src/doc/style/features/functions-and-methods/input.md2
-rw-r--r--src/doc/style/ownership/builders.md2
-rw-r--r--src/libcollections/fmt.rs4
-rw-r--r--src/libstd/rand/mod.rs2
5 files changed, 6 insertions, 6 deletions
diff --git a/src/doc/style/errors/ergonomics.md b/src/doc/style/errors/ergonomics.md
index d530301a909..f2e23963e10 100644
--- a/src/doc/style/errors/ergonomics.md
+++ b/src/doc/style/errors/ergonomics.md
@@ -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.
diff --git a/src/doc/style/features/functions-and-methods/input.md b/src/doc/style/features/functions-and-methods/input.md
index 9b9500008c2..a1310de2e60 100644
--- a/src/doc/style/features/functions-and-methods/input.md
+++ b/src/doc/style/features/functions-and-methods/input.md
@@ -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).)
diff --git a/src/doc/style/ownership/builders.md b/src/doc/style/ownership/builders.md
index 8f721a97676..54992341ce5 100644
--- a/src/doc/style/ownership/builders.md
+++ b/src/doc/style/ownership/builders.md
@@ -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> {
         ...
     }
 }
diff --git a/src/libcollections/fmt.rs b/src/libcollections/fmt.rs
index cb023bcb7a5..817a5baf3d1 100644
--- a/src/libcollections/fmt.rs
+++ b/src/libcollections/fmt.rs
@@ -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
diff --git a/src/libstd/rand/mod.rs b/src/libstd/rand/mod.rs
index e11a5818966..b806afc5951 100644
--- a/src/libstd/rand/mod.rs
+++ b/src/libstd/rand/mod.rs
@@ -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() })
     }