---

yaml
---
r: 20972
b: refs/heads/snap-stage3
c: d99ca69
h: refs/heads/master
v: v3

Author: brson

[refs]

@@ -1,7 +1,7 @@
 ---
 refs/heads/master: e430a699f2c60890d9b86069fd0c68a70ece7120
 refs/heads/snap-stage1: e33de59e47c5076a89eadeb38f4934f58a3618a6
-refs/heads/snap-stage3: 8d5a51e9d7f51ba9c80a34121b158c8c2ef9cdd7
+refs/heads/snap-stage3: d99ca69cf7207e31d7ddffe849a4235cc63899d7
 refs/heads/try: ffbe0e0e00374358b789b0037bcb3a577cd218be
 refs/tags/release-0.1: 1f5c5126e96c79d22cb7862f75304136e204f105
 refs/heads/ndm: f3868061cd7988080c30d6d5bf352a5a5fe2460b

branches/snap-stage3/src/rustc/middle/lint.rs

@@ -452,10 +452,21 @@ fn check_item_path_statement(cx: ty::ctxt, it: @ast::item) {
 fn check_item_non_camel_case_types(cx: ty::ctxt, it: @ast::item) {
     fn is_camel_case(ident: ast::ident) -> bool {
         assert ident.is_not_empty();
-        char::is_uppercase(str::char_at(*ident, 0)) &&
+        let ident = ident_without_trailing_underscores(ident);
+        char::is_uppercase(str::char_at(ident, 0)) &&
             !ident.contains_char('_')
     }
 
+    fn ident_without_trailing_underscores(ident: ast::ident) -> ~str {
+        match str::rfind(*ident, |c| c != '_') {
+          some(idx) => (*ident).slice(0, idx + 1),
+          none => {
+            // all underscores
+            *ident
+          }
+        }
+    }
+
     fn check_case(cx: ty::ctxt, ident: ast::ident,
                   expr_id: ast::node_id, item_id: ast::node_id,
                   span: span) {

branches/snap-stage3/src/test/run-pass/lint-non-camel-case-with-trailing-underscores.rs

@@ -0,0 +1,6 @@
+// This is ok because we often use the trailing underscore to mean 'prime'
+
+#[forbid(non_camel_case_types)]
+type Foo_ = int;
+
+fn main() { }