diff options
| author | Alex Crichton <alex@alexcrichton.com> | 2015-02-18 14:35:01 -0800 |
|---|---|---|
| committer | Alex Crichton <alex@alexcrichton.com> | 2015-02-18 14:35:01 -0800 |
| commit | 5250a82f7917d6f9ec590e7e762bfd036e21ef74 (patch) | |
| tree | 38ce94117b42eb159b630d0a97748b5f3056fbe5 /src/libstd/sys/windows | |
| parent | 5a32b4a34fc6fbd78e293b16f7ba7d06caca7a48 (diff) | |
| parent | 811c48fe22ffbe4ca45c32807c846d9a7c02a8f3 (diff) | |
| download | rust-5250a82f7917d6f9ec590e7e762bfd036e21ef74.tar.gz rust-5250a82f7917d6f9ec590e7e762bfd036e21ef74.zip | |
rollup merge of #22497: nikomatsakis/suffixes
Conflicts: src/librustc_trans/trans/tvec.rs
Diffstat (limited to 'src/libstd/sys/windows')
| -rw-r--r-- | src/libstd/sys/windows/c.rs | 2 | ||||
| -rw-r--r-- | src/libstd/sys/windows/process.rs | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/src/libstd/sys/windows/c.rs b/src/libstd/sys/windows/c.rs index 3a1b797eeb4..f861255a00a 100644 --- a/src/libstd/sys/windows/c.rs +++ b/src/libstd/sys/windows/c.rs @@ -105,7 +105,7 @@ pub struct WSAPROTOCOL_INFO { pub iSecurityScheme: libc::c_int, pub dwMessageSize: libc::DWORD, pub dwProviderReserved: libc::DWORD, - pub szProtocol: [u16; (WSAPROTOCOL_LEN as usize) + 1us], + pub szProtocol: [u16; (WSAPROTOCOL_LEN as usize) + 1], } pub type LPWSAPROTOCOL_INFO = *mut WSAPROTOCOL_INFO; diff --git a/src/libstd/sys/windows/process.rs b/src/libstd/sys/windows/process.rs index eab60047aa2..96ffc4daddd 100644 --- a/src/libstd/sys/windows/process.rs +++ b/src/libstd/sys/windows/process.rs @@ -388,7 +388,7 @@ fn make_command_line(prog: &CString, args: &[CString]) -> String { cmd.push('"'); } let argvec: Vec<char> = arg.chars().collect(); - for i in 0u..argvec.len() { + for i in 0..argvec.len() { append_char_at(cmd, &argvec, i); } if quote { |