Skip to content

Commit

Permalink
Rename to_str to to_string
Browse files Browse the repository at this point in the history
Closes #15796.

[breaking-change]
  • Loading branch information
sfackler authored and alexcrichton committed Jul 21, 2014
1 parent e3887a7 commit 2e24ef3
Show file tree
Hide file tree
Showing 7 changed files with 6 additions and 6 deletions.
2 changes: 1 addition & 1 deletion src/libstd/ascii.rs
Expand Up @@ -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.
Expand Down
2 changes: 1 addition & 1 deletion src/libstd/lib.rs
Expand Up @@ -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 */

Expand Down
2 changes: 1 addition & 1 deletion src/libstd/prelude.rs
Expand Up @@ -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};
Expand Down
2 changes: 1 addition & 1 deletion src/libstd/task.rs
Expand Up @@ -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 {
Expand Down
File renamed without changes.
2 changes: 1 addition & 1 deletion src/test/run-pass/class-cast-to-trait-cross-crate-2.rs
Expand Up @@ -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<ToString>, expected: String) {
Expand Down
2 changes: 1 addition & 1 deletion src/test/run-pass/send_str_treemap.rs
Expand Up @@ -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;

Expand Down

0 comments on commit 2e24ef3

Please sign in to comment.