From 12c334a77b897f7b1cb6cff3c56a71ecb89c82af Mon Sep 17 00:00:00 2001
From: Richo Healey <richo@psych0tik.net>
Date: Sat, 21 Jun 2014 03:39:03 -0700
Subject: std: Rename the `ToStr` trait to `ToString`, and `to_str` to
 `to_string`.

[breaking-change]
---
 src/libnative/io/file_win32.rs | 2 +-
 src/libnative/io/pipe_unix.rs  | 2 +-
 src/libnative/io/pipe_win32.rs | 2 +-
 src/libnative/io/process.rs    | 4 ++--
 src/libnative/io/util.rs       | 4 ++--
 5 files changed, 7 insertions(+), 7 deletions(-)

(limited to 'src/libnative')

diff --git a/src/libnative/io/file_win32.rs b/src/libnative/io/file_win32.rs
index 98553603313..dbca4ff7ff7 100644
--- a/src/libnative/io/file_win32.rs
+++ b/src/libnative/io/file_win32.rs
@@ -259,7 +259,7 @@ pub fn to_utf16(s: &CString) -> IoResult<Vec<u16>> {
         None => Err(IoError {
             code: libc::ERROR_INVALID_NAME as uint,
             extra: 0,
-            detail: Some("valid unicode input required".to_str()),
+            detail: Some("valid unicode input required".to_string()),
         })
     }
 }
diff --git a/src/libnative/io/pipe_unix.rs b/src/libnative/io/pipe_unix.rs
index b5b2065f996..0e019fa7e8f 100644
--- a/src/libnative/io/pipe_unix.rs
+++ b/src/libnative/io/pipe_unix.rs
@@ -43,7 +43,7 @@ fn addr_to_sockaddr_un(addr: &CString) -> IoResult<(libc::sockaddr_storage, uint
         return Err(IoError {
             code: ERROR as uint,
             extra: 0,
-            detail: Some("path must be smaller than SUN_LEN".to_str()),
+            detail: Some("path must be smaller than SUN_LEN".to_string()),
         })
     }
     s.sun_family = libc::AF_UNIX as libc::sa_family_t;
diff --git a/src/libnative/io/pipe_win32.rs b/src/libnative/io/pipe_win32.rs
index e5e8cdeffd7..ec40ff89bd2 100644
--- a/src/libnative/io/pipe_win32.rs
+++ b/src/libnative/io/pipe_win32.rs
@@ -479,7 +479,7 @@ impl rtio::RtioPipe for UnixStream {
                             Err(IoError {
                                 code: libc::ERROR_OPERATION_ABORTED as uint,
                                 extra: amt,
-                                detail: Some("short write during write".to_str()),
+                                detail: Some("short write during write".to_string()),
                             })
                         } else {
                             Err(util::timeout("write timed out"))
diff --git a/src/libnative/io/process.rs b/src/libnative/io/process.rs
index 6fab73115cf..71702d180b9 100644
--- a/src/libnative/io/process.rs
+++ b/src/libnative/io/process.rs
@@ -170,7 +170,7 @@ impl rtio::RtioProcess for Process {
             Some(..) => return Err(IoError {
                 code: ERROR as uint,
                 extra: 0,
-                detail: Some("can't kill an exited process".to_str()),
+                detail: Some("can't kill an exited process".to_string()),
             }),
             None => {}
         }
@@ -301,7 +301,7 @@ fn spawn_process_os(cfg: ProcessConfig,
         return Err(IoError {
             code: libc::ERROR_CALL_NOT_IMPLEMENTED as uint,
             extra: 0,
-            detail: Some("unsupported gid/uid requested on windows".to_str()),
+            detail: Some("unsupported gid/uid requested on windows".to_string()),
         })
     }
 
diff --git a/src/libnative/io/util.rs b/src/libnative/io/util.rs
index 31ba2223082..06046cc74cf 100644
--- a/src/libnative/io/util.rs
+++ b/src/libnative/io/util.rs
@@ -30,7 +30,7 @@ pub fn timeout(desc: &'static str) -> IoError {
     IoError {
         code: ERROR as uint,
         extra: 0,
-        detail: Some(desc.to_str()),
+        detail: Some(desc.to_string()),
     }
 }
 
@@ -40,7 +40,7 @@ pub fn short_write(n: uint, desc: &'static str) -> IoError {
     IoError {
         code: ERROR as uint,
         extra: n,
-        detail: Some(desc.to_str()),
+        detail: Some(desc.to_string()),
     }
 }
 
-- 
cgit 1.4.1-3-g733a5