diff options
| author | bors <bors@rust-lang.org> | 2015-02-19 07:59:27 +0000 |
|---|---|---|
| committer | bors <bors@rust-lang.org> | 2015-02-19 07:59:27 +0000 |
| commit | 149f002437af373d5769f804eb5e02d8164a7668 (patch) | |
| tree | 3d54ca061a9aab431f41ec6327b23c76d607f252 /src/libstd/old_path | |
| parent | 22992358bc74956f53b1a2ab99ae245cd3ca5550 (diff) | |
| parent | 811c48fe22ffbe4ca45c32807c846d9a7c02a8f3 (diff) | |
| download | rust-149f002437af373d5769f804eb5e02d8164a7668.tar.gz rust-149f002437af373d5769f804eb5e02d8164a7668.zip | |
Auto merge of #22497 - nikomatsakis:suffixes, r=alexcrichton
The old suffixes now issue warnings unless a feature-gate is given. Fixes #22496. r? @alexcrichton
Diffstat (limited to 'src/libstd/old_path')
| -rw-r--r-- | src/libstd/old_path/posix.rs | 2 | ||||
| -rw-r--r-- | src/libstd/old_path/windows.rs | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/src/libstd/old_path/posix.rs b/src/libstd/old_path/posix.rs index 440d17cfd50..0a184a01a1d 100644 --- a/src/libstd/old_path/posix.rs +++ b/src/libstd/old_path/posix.rs @@ -409,7 +409,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 07c5e10992b..02a21321c4c 100644 --- a/src/libstd/old_path/windows.rs +++ b/src/libstd/old_path/windows.rs @@ -1063,7 +1063,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 } |
