about summary refs log tree commit diff
path: root/src/libtime
diff options
context:
space:
mode:
authorRicho Healey <richo@psych0tik.net>2014-06-21 03:39:03 -0700
committerBrian Anderson <banderson@mozilla.com>2014-07-08 13:01:43 -0700
commit12c334a77b897f7b1cb6cff3c56a71ecb89c82af (patch)
tree1f5a85061a69058875391ec6171cf8b446996dff /src/libtime
parentbfe4ddfdea45533c98657701509bb7185fd96cba (diff)
downloadrust-12c334a77b897f7b1cb6cff3c56a71ecb89c82af.tar.gz
rust-12c334a77b897f7b1cb6cff3c56a71ecb89c82af.zip
std: Rename the `ToStr` trait to `ToString`, and `to_str` to `to_string`.
[breaking-change]
Diffstat (limited to 'src/libtime')
-rw-r--r--src/libtime/lib.rs6
1 files changed, 3 insertions, 3 deletions
diff --git a/src/libtime/lib.rs b/src/libtime/lib.rs
index 873cc7af7b6..9ed46d7a49b 100644
--- a/src/libtime/lib.rs
+++ b/src/libtime/lib.rs
@@ -1039,7 +1039,7 @@ pub fn strftime(format: &str, tm: &Tm) -> String {
           'U' => format!("{:02d}", (tm.tm_yday - tm.tm_wday + 7) / 7),
           'u' => {
             let i = tm.tm_wday as int;
-            (if i == 0 { 7 } else { i }).to_str()
+            (if i == 0 { 7 } else { i }).to_string()
           }
           'V' => iso_week('V', tm),
           'v' => {
@@ -1052,8 +1052,8 @@ pub fn strftime(format: &str, tm: &Tm) -> String {
               format!("{:02d}",
                              (tm.tm_yday - (tm.tm_wday - 1 + 7) % 7 + 7) / 7)
           }
-          'w' => (tm.tm_wday as int).to_str(),
-          'Y' => (tm.tm_year as int + 1900).to_str(),
+          'w' => (tm.tm_wday as int).to_string(),
+          'Y' => (tm.tm_year as int + 1900).to_string(),
           'y' => format!("{:02d}", (tm.tm_year as int + 1900) % 100),
           'Z' => "".to_string(),    // FIXME(pcwalton): Implement this.
           'z' => {