Rewrite it to not use `if let`.
This commit is contained in:
Michael Howell 2018-12-10 15:48:32 -07:00
parent 05a22a72e4
commit 083585859b

View file

@ -72,13 +72,14 @@ unsafe fn parse_lp_cmd_line<F: Fn() -> OsString>(lp_cmd_line: *const u16, exe_na
QUOTE => { QUOTE => {
loop { loop {
i += 1; i += 1;
if *lp_cmd_line.offset(i) == 0 { let c = *lp_cmd_line.offset(i);
if c == 0 {
ret_val.push(OsString::from_wide( ret_val.push(OsString::from_wide(
slice::from_raw_parts(lp_cmd_line.offset(1), i as usize - 1) slice::from_raw_parts(lp_cmd_line.offset(1), i as usize - 1)
)); ));
return ret_val.into_iter(); return ret_val.into_iter();
} }
if *lp_cmd_line.offset(i) == QUOTE { if c == QUOTE {
break; break;
} }
} }
@ -101,13 +102,14 @@ unsafe fn parse_lp_cmd_line<F: Fn() -> OsString>(lp_cmd_line: *const u16, exe_na
_ => { _ => {
loop { loop {
i += 1; i += 1;
if *lp_cmd_line.offset(i) == 0 { let c = *lp_cmd_line.offset(i);
if c == 0 {
ret_val.push(OsString::from_wide( ret_val.push(OsString::from_wide(
slice::from_raw_parts(lp_cmd_line, i as usize) slice::from_raw_parts(lp_cmd_line, i as usize)
)); ));
return ret_val.into_iter(); return ret_val.into_iter();
} }
if let 0...SPACE = *lp_cmd_line.offset(i) { if c > 0 && c <= SPACE {
break; break;
} }
} }