about summary refs log tree commit diff
path: root/src/libsyntax
diff options
context:
space:
mode:
authorHuon Wilson <dbau.pp+github@gmail.com>2013-07-01 13:51:13 +1000
committerHuon Wilson <dbau.pp+github@gmail.com>2013-07-01 17:52:57 +1000
commitc437a16c5d8c00b39dc6c5e36011def997d77224 (patch)
treeba408e4897a59f96ba64a82c07f1307a2af8658a /src/libsyntax
parentda4384583b84c262dec82be4b041f0332ca16e57 (diff)
downloadrust-c437a16c5d8c00b39dc6c5e36011def997d77224.tar.gz
rust-c437a16c5d8c00b39dc6c5e36011def997d77224.zip
rustc: add a lint to enforce uppercase statics.
Diffstat (limited to 'src/libsyntax')
-rw-r--r--src/libsyntax/diagnostic.rs8
-rw-r--r--src/libsyntax/ext/expand.rs2
-rw-r--r--src/libsyntax/syntax.rs1
3 files changed, 7 insertions, 4 deletions
diff --git a/src/libsyntax/diagnostic.rs b/src/libsyntax/diagnostic.rs
index ab7d3fda501..204028212d6 100644
--- a/src/libsyntax/diagnostic.rs
+++ b/src/libsyntax/diagnostic.rs
@@ -179,10 +179,10 @@ fn diagnosticstr(lvl: level) -> ~str {
 
 fn diagnosticcolor(lvl: level) -> term::color::Color {
     match lvl {
-        fatal => term::color::bright_red,
-        error => term::color::bright_red,
-        warning => term::color::bright_yellow,
-        note => term::color::bright_green
+        fatal => term::color::BRIGHT_RED,
+        error => term::color::BRIGHT_RED,
+        warning => term::color::BRIGHT_YELLOW,
+        note => term::color::BRIGHT_GREEN
     }
 }
 
diff --git a/src/libsyntax/ext/expand.rs b/src/libsyntax/ext/expand.rs
index 15f915ba4d8..a78a18810a8 100644
--- a/src/libsyntax/ext/expand.rs
+++ b/src/libsyntax/ext/expand.rs
@@ -580,6 +580,7 @@ pub fn core_macros() -> @str {
             pub mod $c {
                 fn key(_x: @::std::condition::Handler<$in,$out>) { }
 
+                #[allow(non_uppercase_statics)]
                 pub static cond :
                     ::std::condition::Condition<'static,$in,$out> =
                     ::std::condition::Condition {
@@ -595,6 +596,7 @@ pub fn core_macros() -> @str {
             pub mod $c {
                 fn key(_x: @::std::condition::Handler<$in,$out>) { }
 
+                #[allow(non_uppercase_statics)]
                 pub static cond :
                     ::std::condition::Condition<'static,$in,$out> =
                     ::std::condition::Condition {
diff --git a/src/libsyntax/syntax.rs b/src/libsyntax/syntax.rs
index 830ca569455..52ed49ea1ea 100644
--- a/src/libsyntax/syntax.rs
+++ b/src/libsyntax/syntax.rs
@@ -21,6 +21,7 @@
 #[crate_type = "lib"];
 
 #[allow(non_camel_case_types)];
+#[allow(non_uppercase_statics)];
 #[deny(deprecated_pattern)];
 
 extern mod extra;