---

yaml
---
r: 29852
b: refs/heads/incoming
c: a83414b
h: refs/heads/master
v: v3

Author: brson

[refs]

@@ -6,7 +6,7 @@ refs/heads/try: d324a424d8f84b1eb049b12cf34182bda91b0024
 refs/tags/release-0.1: 1f5c5126e96c79d22cb7862f75304136e204f105
 refs/heads/ndm: f3868061cd7988080c30d6d5bf352a5a5fe2460b
 refs/heads/try2: d0c6ce338884ee21843f4b40bf6bf18d222ce5df
-refs/heads/incoming: 74c69e1053188d92b86bc8b28cbf1af87d31ea2d
+refs/heads/incoming: a83414b6e8879b2485374469f7f5fe60f22ae936
 refs/heads/dist-snap: 2f32a1581f522e524009138b33b1c7049ced668d
 refs/tags/release-0.2: c870d2dffb391e14efb05aa27898f1f6333a9596
 refs/tags/release-0.3: b5f0d0f648d9a6153664837026ba1be43d3e2503

branches/incoming/src/rustc/middle/lint.rs

@@ -452,17 +452,28 @@ 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();
-        let ident = ident_without_trailing_underscores(ident);
+        let ident = ident_without_trailing_underscores(*ident);
+        let ident = ident_without_leading_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),
+    fn ident_without_trailing_underscores(ident: ~str) -> ~str {
+        match str::rfind(ident, |c| c != '_') {
+          some(idx) => ident.slice(0, idx + 1),
           none => {
             // all underscores
-            *ident
+            ident
+          }
+        }
+    }
+
+    fn ident_without_leading_underscores(ident: ~str) -> ~str {
+        match str::find(ident, |c| c != '_') {
+          some(idx) => ident.slice(idx, ident.len()),
+          none => {
+            // all underscores
+            ident
           }
         }
     }