auto merge of #15864 : alexcrichton/rust/rollup, r=alexcrichton

5 files changed, 4 insertions, 4 deletions

diff --git a/src/libstd/ascii.rs b/src/libstd/ascii.rs
index b9c86e2b235..966e4f8811e 100644
--- a/src/libstd/ascii.rs
+++ b/src/libstd/ascii.rs
@@ -20,7 +20,7 @@ use option::{Option, Some, None};
 use slice::{ImmutableVector, MutableVector, Vector};
 use str::{OwnedStr, Str, StrAllocating, StrSlice};
 use string::String;
-use to_str::{IntoStr};
+use to_string::IntoStr;
 use vec::Vec;
 
 /// Datatype to hold one ascii character. It wraps a `u8`, with the highest bit always zero.
diff --git a/src/libstd/lib.rs b/src/libstd/lib.rs
index ad6942712ac..e14092bc8dc 100644
--- a/src/libstd/lib.rs
+++ b/src/libstd/lib.rs
@@ -239,7 +239,7 @@ pub mod gc;
 
 pub mod from_str;
 pub mod num;
-pub mod to_str;
+pub mod to_string;
 
 /* Common data structures */
 
diff --git a/src/libstd/prelude.rs b/src/libstd/prelude.rs
index eee494c7bc0..0fa223305a6 100644
--- a/src/libstd/prelude.rs
+++ b/src/libstd/prelude.rs
@@ -78,7 +78,7 @@
 #[doc(no_inline)] pub use io::{Buffer, Writer, Reader, Seek};
 #[doc(no_inline)] pub use str::{Str, StrVector, StrSlice, OwnedStr};
 #[doc(no_inline)] pub use str::{IntoMaybeOwned, StrAllocating, UnicodeStrSlice};
-#[doc(no_inline)] pub use to_str::{ToString, IntoStr};
+#[doc(no_inline)] pub use to_string::{ToString, IntoStr};
 #[doc(no_inline)] pub use tuple::{Tuple1, Tuple2, Tuple3, Tuple4};
 #[doc(no_inline)] pub use tuple::{Tuple5, Tuple6, Tuple7, Tuple8};
 #[doc(no_inline)] pub use tuple::{Tuple9, Tuple10, Tuple11, Tuple12};
diff --git a/src/libstd/task.rs b/src/libstd/task.rs
index 4b8c15a0152..19ad81a0483 100644
--- a/src/libstd/task.rs
+++ b/src/libstd/task.rs
@@ -106,7 +106,7 @@ use rt::task::Task;
 use str::{Str, SendStr, IntoMaybeOwned};
 use string::String;
 use sync::Future;
-use to_str::ToString;
+use to_string::ToString;
 
 /// A means of spawning a task
 pub trait Spawner {
diff --git a/src/libstd/to_str.rs b/src/libstd/to_string.rs
index c19fd81b570..c19fd81b570 100644
--- a/src/libstd/to_str.rs
+++ b/src/libstd/to_string.rs