diff options
| author | bors <bors@rust-lang.org> | 2014-10-31 02:27:15 +0000 |
|---|---|---|
| committer | bors <bors@rust-lang.org> | 2014-10-31 02:27:15 +0000 |
| commit | 221fc1e3cdcc208e1bb7debcc2de27d47c847747 (patch) | |
| tree | 5e2d393fe5a4a94cd6a09d93f4ddcf5a4f6aecaa /src/libstd/path | |
| parent | a12d06b73fcb38cf23dfe71da725428a1094395f (diff) | |
| parent | 6fcba8826fd26028341a35d88b07208378ac05ea (diff) | |
| download | rust-221fc1e3cdcc208e1bb7debcc2de27d47c847747.tar.gz rust-221fc1e3cdcc208e1bb7debcc2de27d47c847747.zip | |
auto merge of #18459 : alexcrichton/rust/rollup, r=alexcrichton
Diffstat (limited to 'src/libstd/path')
| -rw-r--r-- | src/libstd/path/posix.rs | 4 | ||||
| -rw-r--r-- | src/libstd/path/windows.rs | 6 |
2 files changed, 5 insertions, 5 deletions
diff --git a/src/libstd/path/posix.rs b/src/libstd/path/posix.rs index f27a1c1feda..0d7a467b313 100644 --- a/src/libstd/path/posix.rs +++ b/src/libstd/path/posix.rs @@ -457,9 +457,9 @@ fn normalize_helper<'a>(v: &'a [u8], is_abs: bool) -> Option<Vec<&'a [u8]>> { } } -#[allow(non_uppercase_statics)] +#[allow(non_upper_case_globals)] static dot_static: &'static [u8] = b"."; -#[allow(non_uppercase_statics)] +#[allow(non_upper_case_globals)] static dot_dot_static: &'static [u8] = b".."; #[cfg(test)] diff --git a/src/libstd/path/windows.rs b/src/libstd/path/windows.rs index 1897c8638cc..1ddc027a07e 100644 --- a/src/libstd/path/windows.rs +++ b/src/libstd/path/windows.rs @@ -776,7 +776,7 @@ impl Path { let mut s = String::from_str(s.slice_to(len)); unsafe { let v = s.as_mut_vec(); - *v.get_mut(0) = (*v)[0] + v[0] = (*v)[0] .to_ascii() .to_uppercase() .to_byte(); @@ -784,7 +784,7 @@ impl Path { if is_abs { // normalize C:/ to C:\ unsafe { - *s.as_mut_vec().get_mut(2) = SEP_BYTE; + s.as_mut_vec()[2] = SEP_BYTE; } } Some(s) @@ -794,7 +794,7 @@ impl Path { let mut s = String::from_str(s.slice_to(len)); unsafe { let v = s.as_mut_vec(); - *v.get_mut(4) = (*v)[4].to_ascii().to_uppercase().to_byte(); + v[4] = (*v)[4].to_ascii().to_uppercase().to_byte(); } Some(s) } |