Skip to content

Commit b886db5

Browse files
sfackleralexcrichton
authored andcommitted
---
yaml --- r: 124832 b: refs/heads/auto c: 2e24ef3 h: refs/heads/master v: v3
1 parent 0185f56 commit b886db5

File tree

8 files changed

+7
-7
lines changed

8 files changed

+7
-7
lines changed

[refs]

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -13,7 +13,7 @@ refs/heads/try3: 9387340aab40a73e8424c48fd42f0c521a4875c0
1313
refs/tags/release-0.3.1: 495bae036dfe5ec6ceafd3312b4dca48741e845b
1414
refs/tags/release-0.4: e828ea2080499553b97dfe33b3f4d472b4562ad7
1515
refs/tags/release-0.5: 7e3bcfbf21278251ee936ad53e92e9b719702d73
16-
refs/heads/auto: e3887a7766eca68c6fa4382b28c863fb31ba00aa
16+
refs/heads/auto: 2e24ef377e32ee2fe253046fdc073840279e4b95
1717
refs/heads/servo: af82457af293e2a842ba6b7759b70288da276167
1818
refs/tags/release-0.6: b4ebcfa1812664df5e142f0134a5faea3918544c
1919
refs/tags/0.1: b19db808c2793fe2976759b85a355c3ad8c8b336

branches/auto/src/libstd/ascii.rs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -20,7 +20,7 @@ use option::{Option, Some, None};
2020
use slice::{ImmutableVector, MutableVector, Vector};
2121
use str::{OwnedStr, Str, StrAllocating, StrSlice};
2222
use string::String;
23-
use to_str::{IntoStr};
23+
use to_string::IntoStr;
2424
use vec::Vec;
2525

2626
/// Datatype to hold one ascii character. It wraps a `u8`, with the highest bit always zero.

branches/auto/src/libstd/lib.rs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -239,7 +239,7 @@ pub mod gc;
239239

240240
pub mod from_str;
241241
pub mod num;
242-
pub mod to_str;
242+
pub mod to_string;
243243

244244
/* Common data structures */
245245

branches/auto/src/libstd/prelude.rs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -78,7 +78,7 @@
7878
#[doc(no_inline)] pub use io::{Buffer, Writer, Reader, Seek};
7979
#[doc(no_inline)] pub use str::{Str, StrVector, StrSlice, OwnedStr};
8080
#[doc(no_inline)] pub use str::{IntoMaybeOwned, StrAllocating, UnicodeStrSlice};
81-
#[doc(no_inline)] pub use to_str::{ToString, IntoStr};
81+
#[doc(no_inline)] pub use to_string::{ToString, IntoStr};
8282
#[doc(no_inline)] pub use tuple::{Tuple1, Tuple2, Tuple3, Tuple4};
8383
#[doc(no_inline)] pub use tuple::{Tuple5, Tuple6, Tuple7, Tuple8};
8484
#[doc(no_inline)] pub use tuple::{Tuple9, Tuple10, Tuple11, Tuple12};

branches/auto/src/libstd/task.rs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -106,7 +106,7 @@ use rt::task::Task;
106106
use str::{Str, SendStr, IntoMaybeOwned};
107107
use string::String;
108108
use sync::Future;
109-
use to_str::ToString;
109+
use to_string::ToString;
110110

111111
/// A means of spawning a task
112112
pub trait Spawner {

branches/auto/src/test/run-pass/class-cast-to-trait-cross-crate-2.rs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -11,7 +11,7 @@
1111
// aux-build:cci_class_cast.rs
1212
extern crate cci_class_cast;
1313

14-
use std::to_str::ToString;
14+
use std::to_string::ToString;
1515
use cci_class_cast::kitty::cat;
1616

1717
fn print_out(thing: Box<ToString>, expected: String) {

branches/auto/src/test/run-pass/send_str_treemap.rs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -12,7 +12,7 @@ extern crate collections;
1212

1313
use std::collections::{ Map, MutableMap};
1414
use std::str::{SendStr, Owned, Slice};
15-
use std::to_str::ToString;
15+
use std::to_string::ToString;
1616
use self::collections::TreeMap;
1717
use std::option::Some;
1818

0 commit comments

Comments
 (0)