]> git.lizzy.rs Git - rust.git/commitdiff
Rollup merge of #23684 - tamird:ios-fallout, r=alexcrichton
authorManish Goregaokar <manishsmail@gmail.com>
Wed, 25 Mar 2015 11:42:13 +0000 (17:12 +0530)
committerManish Goregaokar <manishsmail@gmail.com>
Wed, 25 Mar 2015 14:14:08 +0000 (19:44 +0530)
r? @aturon cc @alexcrichton

src/libstd/sys/unix/os.rs

index 6c191689255bc123ac0517fa676300ef5051f128..5699a60908b61a9a11f0ab8095a34e06f49fd285 100644 (file)
@@ -345,7 +345,7 @@ pub fn args() -> Args {
             let utf_c_str: *const libc::c_char =
                 mem::transmute(objc_msgSend(tmp, utf8_sel));
             let bytes = CStr::from_ptr(utf_c_str).to_bytes();
-            res.push(OsString::from_str(str::from_utf8(bytes).unwrap()))
+            res.push(OsString::from(str::from_utf8(bytes).unwrap()))
         }
     }