@@ -47,9 +47,9 @@ use ptr;
4747use result:: { Err , Ok , Result } ;
4848use slice:: { Vector , ImmutableVector , MutableVector , ImmutableEqVector } ;
4949use str:: { Str , StrSlice , StrAllocating } ;
50- use str;
5150use string:: String ;
5251use sync:: atomics:: { AtomicInt , INIT_ATOMIC_INT , SeqCst } ;
52+ use to_str:: ToString ;
5353use vec:: Vec ;
5454
5555#[ cfg( unix) ]
@@ -135,7 +135,7 @@ pub fn getcwd() -> Path {
135135 fail ! ( ) ;
136136 }
137137 }
138- Path :: new ( String :: from_utf16 ( str:: truncate_utf16_at_nul ( buf) )
138+ Path :: new ( String :: from_utf16 ( :: str:: truncate_utf16_at_nul ( buf) )
139139 . expect ( "GetCurrentDirectoryW returned invalid UTF-16" ) )
140140}
141141
@@ -413,7 +413,7 @@ pub fn setenv<T: BytesContainer>(n: &str, v: T) {
413413 fn _setenv ( n : & str , v : & [ u8 ] ) {
414414 let n: Vec < u16 > = n. utf16_units ( ) . collect ( ) ;
415415 let n = n. append_one ( 0 ) ;
416- let v: Vec < u16 > = str:: from_utf8 ( v) . unwrap ( ) . utf16_units ( ) . collect ( ) ;
416+ let v: Vec < u16 > = :: str:: from_utf8 ( v) . unwrap ( ) . utf16_units ( ) . collect ( ) ;
417417 let v = v. append_one ( 0 ) ;
418418
419419 unsafe {
@@ -1045,7 +1045,7 @@ pub fn error_string(errnum: uint) -> String {
10451045 return format ! ( "OS Error {} (FormatMessageW() returned error {})" , errnum, fm_err) ;
10461046 }
10471047
1048- let msg = String :: from_utf16 ( str:: truncate_utf16_at_nul ( buf) ) ;
1048+ let msg = String :: from_utf16 ( :: str:: truncate_utf16_at_nul ( buf) ) ;
10491049 match msg {
10501050 Some ( msg) => format ! ( "OS Error {}: {}" , errnum, msg) ,
10511051 None => format ! ( "OS Error {} (FormatMessageW() returned invalid UTF-16)" , errnum) ,
@@ -1202,7 +1202,7 @@ fn real_args() -> Vec<String> {
12021202
12031203 // Push it onto the list.
12041204 let opt_s = slice:: raw:: buf_as_slice ( ptr as * const _ , len, |buf| {
1205- String :: from_utf16 ( str:: truncate_utf16_at_nul ( buf) )
1205+ String :: from_utf16 ( :: str:: truncate_utf16_at_nul ( buf) )
12061206 } ) ;
12071207 opt_s. expect ( "CommandLineToArgvW returned invalid UTF-16" )
12081208 } ) ;
0 commit comments