diff options
| author | Stefan Lankes <slankes@eonerc.rwth-aachen.de> | 2019-10-25 09:09:55 +0200 |
|---|---|---|
| committer | Stefan Lankes <slankes@eonerc.rwth-aachen.de> | 2019-10-25 09:09:55 +0200 |
| commit | d349e32fc70da197918256c29a0858fe7e1a6588 (patch) | |
| tree | 17f268176d32a172c84e84c30303a4794f4513b0 /src/libstd/sys/windows/process.rs | |
| parent | ddcd157d03a067419d7f5b4375cfaff5a474856a (diff) | |
| parent | d54111afc061ef398cd8ce28984f9e8d70001b24 (diff) | |
| download | rust-d349e32fc70da197918256c29a0858fe7e1a6588.tar.gz rust-d349e32fc70da197918256c29a0858fe7e1a6588.zip | |
Merge branch 'master' into rusty-hermit, resolve conflicts
Diffstat (limited to 'src/libstd/sys/windows/process.rs')
| -rw-r--r-- | src/libstd/sys/windows/process.rs | 5 |
1 files changed, 2 insertions, 3 deletions
diff --git a/src/libstd/sys/windows/process.rs b/src/libstd/sys/windows/process.rs index 8658deb8546..096b7bea8a5 100644 --- a/src/libstd/sys/windows/process.rs +++ b/src/libstd/sys/windows/process.rs @@ -257,7 +257,7 @@ impl Stdio { let ret = io.duplicate(0, true, c::DUPLICATE_SAME_ACCESS); io.into_raw(); - return ret + ret } Err(..) => Ok(Handle::new(c::INVALID_HANDLE_VALUE)), } @@ -472,9 +472,8 @@ fn make_command_line(prog: &OsStr, args: &[OsString]) -> io::Result<Vec<u16>> { cmd.push('"' as u16); } - let mut iter = arg.encode_wide(); let mut backslashes: usize = 0; - while let Some(x) = iter.next() { + for x in arg.encode_wide() { if x == '\\' as u16 { backslashes += 1; } else { |