about summary refs log tree commit diff
path: root/src/libstd
diff options
context:
space:
mode:
authorbors <bors@rust-lang.org>2013-10-02 01:16:31 -0700
committerbors <bors@rust-lang.org>2013-10-02 01:16:31 -0700
commit97cd495aca946d088e103d364d3be34f2bfaf1e1 (patch)
tree6558cbe87d3e6152f649ef4c32b9facd75db0b46 /src/libstd
parent33a5928b461e4cda3688ea3fbe9a05f35b4fd884 (diff)
parent2461b3102607c1cb4469c94bbe95d67db6c5e54d (diff)
downloadrust-97cd495aca946d088e103d364d3be34f2bfaf1e1.tar.gz
rust-97cd495aca946d088e103d364d3be34f2bfaf1e1.zip
auto merge of #9638 : pnkfelix/rust/fsk-issue7526-attempt-to-catch-nonuc-statics-in-match-patterns, r=alexcrichton
r? anyone

Address scariest part of #7526 by adding a new more specific lint (that is set to warn by default, rather than allow).

Diffstat (limited to 'src/libstd')
-rw-r--r--src/libstd/num/f32.rs1
-rw-r--r--src/libstd/num/f64.rs1
2 files changed, 2 insertions, 0 deletions
diff --git a/src/libstd/num/f32.rs b/src/libstd/num/f32.rs
index 8d76786c6d1..41a3d193379 100644
--- a/src/libstd/num/f32.rs
+++ b/src/libstd/num/f32.rs
@@ -11,6 +11,7 @@
 //! Operations and constants for `f32`
 #[allow(missing_doc)];
 #[allow(non_uppercase_statics)];
+#[allow(non_uppercase_pattern_statics)];
 
 use default::Default;
 use libc::c_int;
diff --git a/src/libstd/num/f64.rs b/src/libstd/num/f64.rs
index 6cd0ba63828..772596d15fb 100644
--- a/src/libstd/num/f64.rs
+++ b/src/libstd/num/f64.rs
@@ -12,6 +12,7 @@
 
 #[allow(missing_doc)];
 #[allow(non_uppercase_statics)];
+#[allow(non_uppercase_pattern_statics)];
 
 use default::Default;
 use libc::c_int;