---

yaml
---
r: 133051
b: refs/heads/dist-snap
c: 9eb9fcd
h: refs/heads/master
i:
  133049: c573415
  133047: d757165
v: v3

Author: flugsio

[refs]

@@ -6,7 +6,7 @@ refs/heads/try: 457a3c991d79b971be07fce75f9d0c12848fb37c
 refs/tags/release-0.1: 1f5c5126e96c79d22cb7862f75304136e204f105
 refs/heads/ndm: f3868061cd7988080c30d6d5bf352a5a5fe2460b
 refs/heads/try2: 147ecfdd8221e4a4d4e090486829a06da1e0ca3c
-refs/heads/dist-snap: 673c5554437fe50d8c45f71ad8f97e769591b038
+refs/heads/dist-snap: 9eb9fcd71962fae50c63431d63caab923c68182e
 refs/tags/release-0.2: c870d2dffb391e14efb05aa27898f1f6333a9596
 refs/tags/release-0.3: b5f0d0f648d9a6153664837026ba1be43d3e2503
 refs/heads/try3: 9387340aab40a73e8424c48fd42f0c521a4875c0

branches/dist-snap/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/dist-snap/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() { }