lint: Improve camel case suggestion when empty.

rust-lang · Aug 24, 2014 · 9eb9fcd · 9eb9fcd · bors · Aug 26, 2014
1 parent 673c555
commit 9eb9fcd
Show file tree

Hide file tree

Showing 2 changed files with 8 additions and 4 deletions.
diff --git a/src/librustc/lint/builtin.rs b/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());
             }
         }
 

diff --git a/src/test/compile-fail/lint-non-camel-case-types.rs b/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() { }