auto merge of #9638 : pnkfelix/rust/fsk-issue7526-attempt-to-catch-nonuc-statics...

r? anyone

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

diff --cc src/librustc/lib/llvm.rs
Simple merge

diff --cc src/librustc/middle/check_match.rs
Simple merge

diff --cc src/librustc/middle/lint.rs
Simple merge

diff --cc src/librustc/middle/trans/cabi_arm.rs
Simple merge

diff --cc src/librustc/middle/trans/cabi_mips.rs
Simple merge

diff --cc src/librustc/middle/trans/cabi_x86_64.rs
Simple merge

diff --cc src/librustc/middle/trans/intrinsic.rs
Simple merge

diff --cc src/librustc/middle/trans/type_.rs
Simple merge

diff --cc src/libstd/num/f32.rs
Simple merge

diff --cc src/libstd/num/f64.rs
Simple merge

diff --cc src/test/compile-fail/issue-6804.rs
index 6bc9f7d1b2a6a1f29dfcd83caa5cef144d1ff56e,e239385fa5867fd3f9e1cb075bda578be2188aa5..4aa45c78fc889e3efb5c1172483d3d3cdfec73a9
--- 1/src/test/compile-fail/issue-6804.rs
--- 2/src/test/compile-fail/issue-6804.rs
+++ b/src/test/compile-fail/issue-6804.rs
@@@ -1,6 -1,8 +1,8 @@@
+ #[allow(non_uppercase_pattern_statics)];
+ 
  // Matching against NaN should result in a warning
  
 -use std::float::NaN;
 +use std::f64::NaN;
  
  fn main() {
      let x = NaN;