From 288a4893ae7832942c70df0d5459831c0d0dd61a Mon Sep 17 00:00:00 2001 From: Steven Fackler Date: Sun, 20 Jul 2014 17:12:40 -0700 Subject: [PATCH] Rename to_str to to_string Closes #15796. [breaking-change] --- src/libstd/ascii.rs | 2 +- src/libstd/lib.rs | 2 +- src/libstd/prelude.rs | 2 +- src/libstd/task.rs | 2 +- src/libstd/{to_str.rs => to_string.rs} | 0 src/test/run-pass/class-cast-to-trait-cross-crate-2.rs | 2 +- src/test/run-pass/send_str_treemap.rs | 2 +- 7 files changed, 6 insertions(+), 6 deletions(-) rename src/libstd/{to_str.rs => to_string.rs} (100%) diff --git a/src/libstd/ascii.rs b/src/libstd/ascii.rs index b9c86e2b23586..966e4f8811eaa 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 ad6942712ac9a..e14092bc8dc16 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 eee494c7bc0a1..0fa223305a669 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 4b8c15a0152a3..19ad81a04834d 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 similarity index 100% rename from src/libstd/to_str.rs rename to src/libstd/to_string.rs diff --git a/src/test/run-pass/class-cast-to-trait-cross-crate-2.rs b/src/test/run-pass/class-cast-to-trait-cross-crate-2.rs index e3dbaa62d3532..a2ae91abd131a 100644 --- a/src/test/run-pass/class-cast-to-trait-cross-crate-2.rs +++ b/src/test/run-pass/class-cast-to-trait-cross-crate-2.rs @@ -11,7 +11,7 @@ // aux-build:cci_class_cast.rs extern crate cci_class_cast; -use std::to_str::ToString; +use std::to_string::ToString; use cci_class_cast::kitty::cat; fn print_out(thing: Box, expected: String) { diff --git a/src/test/run-pass/send_str_treemap.rs b/src/test/run-pass/send_str_treemap.rs index f3a730aa2b395..e51c94428dae3 100644 --- a/src/test/run-pass/send_str_treemap.rs +++ b/src/test/run-pass/send_str_treemap.rs @@ -12,7 +12,7 @@ extern crate collections; use std::collections::{ Map, MutableMap}; use std::str::{SendStr, Owned, Slice}; -use std::to_str::ToString; +use std::to_string::ToString; use self::collections::TreeMap; use std::option::Some;