diff options
| author | Manish Goregaokar <manishsmail@gmail.com> | 2015-03-25 17:12:13 +0530 |
|---|---|---|
| committer | Manish Goregaokar <manishsmail@gmail.com> | 2015-03-25 19:44:08 +0530 |
| commit | 5a5845dc010401dccb14954239ea60a2e27e8406 (patch) | |
| tree | 744ac4f659a1914055f8d8692bb54a420bf1a373 | |
| parent | 55357672281a5fb68106c595303e5b4e071821ff (diff) | |
| parent | eb5ed1033096f000c8d02908d78fe5968562b0f5 (diff) | |
| download | rust-5a5845dc010401dccb14954239ea60a2e27e8406.tar.gz rust-5a5845dc010401dccb14954239ea60a2e27e8406.zip | |
Rollup merge of #23684 - tamird:ios-fallout, r=alexcrichton
r? @aturon cc @alexcrichton
| -rw-r--r-- | src/libstd/sys/unix/os.rs | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/src/libstd/sys/unix/os.rs b/src/libstd/sys/unix/os.rs index 6c191689255..5699a60908b 100644 --- a/src/libstd/sys/unix/os.rs +++ b/src/libstd/sys/unix/os.rs @@ -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())) } } |