rollup merge of #22497: nikomatsakis/suffixes

Conflicts:
	src/librustc_trans/trans/tvec.rs

3 files changed, 4 insertions, 4 deletions

diff --git a/src/libstd/sys/unix/os.rs b/src/libstd/sys/unix/os.rs
index ad56555997f..66856a2f2c2 100644
--- a/src/libstd/sys/unix/os.rs
+++ b/src/libstd/sys/unix/os.rs
@@ -175,13 +175,13 @@ pub fn current_exe() -> IoResult<Path> {
         let mut sz: libc::size_t = 0;
         let err = sysctl(mib.as_mut_ptr(), mib.len() as ::libc::c_uint,
                          ptr::null_mut(), &mut sz, ptr::null_mut(),
-                         0u as libc::size_t);
+                         0 as libc::size_t);
         if err != 0 { return Err(IoError::last_error()); }
         if sz == 0 { return Err(IoError::last_error()); }
         let mut v: Vec<u8> = Vec::with_capacity(sz as uint);
         let err = sysctl(mib.as_mut_ptr(), mib.len() as ::libc::c_uint,
                          v.as_mut_ptr() as *mut libc::c_void, &mut sz,
-                         ptr::null_mut(), 0u as libc::size_t);
+                         ptr::null_mut(), 0 as libc::size_t);
         if err != 0 { return Err(IoError::last_error()); }
         if sz == 0 { return Err(IoError::last_error()); }
         v.set_len(sz as uint - 1); // chop off trailing NUL
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 {