---

yaml
---
r: 129279
b: refs/heads/auto
c: 9eb9fcd
h: refs/heads/master
i:
  129277: 07faade
  129275: e24a7ec
  129271: acd63ab
  129263: bf8653e
  129247: 72d9624
  129215: 3ba9a7f
  129151: a74716d
  129023: b904154
v: v3

Author: flugsio

[refs]

@@ -13,7 +13,7 @@ refs/heads/try3: 9387340aab40a73e8424c48fd42f0c521a4875c0
 refs/tags/release-0.3.1: 495bae036dfe5ec6ceafd3312b4dca48741e845b
 refs/tags/release-0.4: e828ea2080499553b97dfe33b3f4d472b4562ad7
 refs/tags/release-0.5: 7e3bcfbf21278251ee936ad53e92e9b719702d73
-refs/heads/auto: 673c5554437fe50d8c45f71ad8f97e769591b038
+refs/heads/auto: 9eb9fcd71962fae50c63431d63caab923c68182e
 refs/heads/servo: af82457af293e2a842ba6b7759b70288da276167
 refs/tags/release-0.6: b4ebcfa1812664df5e142f0134a5faea3918544c
 refs/tags/0.1: b19db808c2793fe2976759b85a355c3ad8c8b336

branches/auto/src/librustc/lint/builtin.rs

@@ -768,9 +768,13 @@ impl LintPass for NonCamelCaseTypes {
             let s = token::get_ident(ident);
 
             if !is_camel_case(ident) {
-                cx.span_lint(NON_CAMEL_CASE_TYPES, span,
-                    format!("{} `{}` should have a camel case name such as `{}`",
-                            sort, s, to_camel_case(s.get())).as_slice());
+                let c = to_camel_case(s.get());
+                let m = if c.is_empty() {
+                    format!("{} `{}` should have a camel case name such as `CamelCase`", sort, s)
+                } else {
+                    format!("{} `{}` should have a camel case name such as `{}`", sort, s, c)
+                };
+                cx.span_lint(NON_CAMEL_CASE_TYPES, span, m.as_slice());
             }
         }
 

branches/auto/src/test/compile-fail/lint-non-camel-case-types.rs

@@ -37,6 +37,6 @@ struct foo7 {
     bar: int,
 }
 
-type __ = int; //~ ERROR type `__` should have a camel case name such as ``
+type __ = int; //~ ERROR type `__` should have a camel case name such as `CamelCase`
 
 fn main() { }