Round 5 test fixes and rebase conflicts
This commit is contained in:
parent
cb29c468f3
commit
0cd54b85ef
8 changed files with 52 additions and 10 deletions
|
@ -266,7 +266,7 @@ pub fn args() -> Args {
|
|||
let (argc, argv) = (*_NSGetArgc() as isize,
|
||||
*_NSGetArgv() as *const *const c_char);
|
||||
range(0, argc as isize).map(|i| {
|
||||
let bytes = CStr::from_ptr(&*argv.offset(i)).to_bytes().to_vec();
|
||||
let bytes = CStr::from_ptr(*argv.offset(i)).to_bytes().to_vec();
|
||||
OsStringExt::from_vec(bytes)
|
||||
}).collect::<Vec<_>>()
|
||||
};
|
||||
|
|
Loading…
Add table
Add a link
Reference in a new issue