about summary refs log tree commit diff
path: root/src/libstd/sys
diff options
context:
space:
mode:
authorMichael Howell <michael@notriddle.com>2018-12-10 15:48:32 -0700
committerMichael Howell <michael@notriddle.com>2018-12-10 15:48:32 -0700
commit083585859b2e499998c5b10ff5241f1f81ce6032 (patch)
treed75423c45f532e87df6592b758b9f81851426b2c /src/libstd/sys
parent05a22a72e4574b2105c0a190d7a4bd4a84da16ee (diff)
downloadrust-083585859b2e499998c5b10ff5241f1f81ce6032.tar.gz
rust-083585859b2e499998c5b10ff5241f1f81ce6032.zip
Fix nit
Rewrite it to not use `if let`.
Diffstat (limited to 'src/libstd/sys')
-rw-r--r--src/libstd/sys/windows/args.rs10
1 files changed, 6 insertions, 4 deletions
diff --git a/src/libstd/sys/windows/args.rs b/src/libstd/sys/windows/args.rs
index fd93d389e43..6dee75214fe 100644
--- a/src/libstd/sys/windows/args.rs
+++ b/src/libstd/sys/windows/args.rs
@@ -72,13 +72,14 @@ unsafe fn parse_lp_cmd_line<F: Fn() -> OsString>(lp_cmd_line: *const u16, exe_na
         QUOTE => {
             loop {
                 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(
                         slice::from_raw_parts(lp_cmd_line.offset(1), i as usize - 1)
                     ));
                     return ret_val.into_iter();
                 }
-                if *lp_cmd_line.offset(i) == QUOTE {
+                if c == QUOTE {
                     break;
                 }
             }
@@ -101,13 +102,14 @@ unsafe fn parse_lp_cmd_line<F: Fn() -> OsString>(lp_cmd_line: *const u16, exe_na
         _ => {
             loop {
                 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(
                         slice::from_raw_parts(lp_cmd_line, i as usize)
                     ));
                     return ret_val.into_iter();
                 }
-                if let 0...SPACE = *lp_cmd_line.offset(i) {
+                if c > 0 && c <= SPACE {
                     break;
                 }
             }