rollup merge of #22497: nikomatsakis/suffixes

Conflicts:
	src/librustc_trans/trans/tvec.rs

2 files changed, 2 insertions, 2 deletions

diff --git a/src/libstd/old_path/posix.rs b/src/libstd/old_path/posix.rs
index b0fec102103..15eee9e4a0c 100644
--- a/src/libstd/old_path/posix.rs
+++ b/src/libstd/old_path/posix.rs
@@ -418,7 +418,7 @@ fn normalize_helper<'a>(v: &'a [u8], is_abs: bool) -> Option<Vec<&'a [u8]>> {
         return None;
     }
     let mut comps: Vec<&'a [u8]> = vec![];
-    let mut n_up = 0u;
+    let mut n_up = 0;
     let mut changed = false;
     for comp in v.split(is_sep_byte) {
         if comp.is_empty() { changed = true }
diff --git a/src/libstd/old_path/windows.rs b/src/libstd/old_path/windows.rs
index 4754efbd1fe..37687d9b779 100644
--- a/src/libstd/old_path/windows.rs
+++ b/src/libstd/old_path/windows.rs
@@ -1079,7 +1079,7 @@ fn normalize_helper<'a>(s: &'a str, prefix: Option<PathPrefix>) -> (bool, Option
         });
     }
     let mut comps: Vec<&'a str> = vec![];
-    let mut n_up = 0u;
+    let mut n_up = 0;
     let mut changed = false;
     for comp in s_.split(f) {
         if comp.is_empty() { changed = true }