about summary refs log tree commit diff
path: root/src/libstd/path
diff options
context:
space:
mode:
authorbors <bors@rust-lang.org>2014-10-03 18:47:13 +0000
committerbors <bors@rust-lang.org>2014-10-03 18:47:13 +0000
commitae81c89f34f1ac2cdb596cf216612e94822a8466 (patch)
tree5a3cd9b50266167ad0abdc56567dcdfdf882b4b2 /src/libstd/path
parent9a2286d3a13c4a97340c99c86c718654f6cb2ed6 (diff)
parent39f4bf7b1c9991cfd02f68d45ca59d6c525c4184 (diff)
downloadrust-ae81c89f34f1ac2cdb596cf216612e94822a8466.tar.gz
rust-ae81c89f34f1ac2cdb596cf216612e94822a8466.zip
auto merge of #17742 : alexcrichton/rust/rollup, r=alexcrichton
Trying to get a couple of these into the next snapshot.
Diffstat (limited to 'src/libstd/path')
-rw-r--r--src/libstd/path/posix.rs2
1 files changed, 2 insertions, 0 deletions
diff --git a/src/libstd/path/posix.rs b/src/libstd/path/posix.rs
index 9c4139853c5..805db000686 100644
--- a/src/libstd/path/posix.rs
+++ b/src/libstd/path/posix.rs
@@ -457,7 +457,9 @@ fn normalize_helper<'a>(v: &'a [u8], is_abs: bool) -> Option<Vec<&'a [u8]>> {
     }
 }
 
+#[allow(non_uppercase_statics)]
 static dot_static: &'static [u8] = b".";
+#[allow(non_uppercase_statics)]
 static dot_dot_static: &'static [u8] = b"..";
 
 #[cfg(test)]