diff options
| author | Alex Crichton <alex@alexcrichton.com> | 2014-10-30 09:02:07 -0700 |
|---|---|---|
| committer | Alex Crichton <alex@alexcrichton.com> | 2014-10-30 17:37:22 -0700 |
| commit | 00975e041d42b89b14b2655b2891e3348f3ad3f1 (patch) | |
| tree | 4300bbf758c3c1438ca807ef0ca8326b373a4e00 /src/libstd/path | |
| parent | f68dafa5059b84b6102dfd7b1e1cee9aae86b220 (diff) | |
| parent | d9eb13b2c8397f6eccea0c37967c4010d9aedb0d (diff) | |
| download | rust-00975e041d42b89b14b2655b2891e3348f3ad3f1.tar.gz rust-00975e041d42b89b14b2655b2891e3348f3ad3f1.zip | |
rollup merge of #18398 : aturon/lint-conventions-2
Conflicts: src/libcollections/slice.rs src/libcore/failure.rs src/libsyntax/parse/token.rs src/test/debuginfo/basic-types-mut-globals.rs src/test/debuginfo/simple-struct.rs src/test/debuginfo/trait-pointers.rs
Diffstat (limited to 'src/libstd/path')
| -rw-r--r-- | src/libstd/path/posix.rs | 4 |
1 files changed, 2 insertions, 2 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)] |