---

yaml
---
r: 23993
b: refs/heads/master
c: eb35039
h: refs/heads/master
i:
  23991: 5caed02
v: v3

Author: brson

[refs]

@@ -1,5 +1,5 @@
 ---
-refs/heads/master: 5e9d38ede0f0eff5fec3ad8713897c080211d5ea
+refs/heads/master: eb35039fe83d6d13b5c7c08fe761ab85374c96d0
 refs/heads/snap-stage1: e33de59e47c5076a89eadeb38f4934f58a3618a6
 refs/heads/snap-stage3: cd6f24f9d14ac90d167386a56e7a6ac1f0318195
 refs/heads/try: ffbe0e0e00374358b789b0037bcb3a577cd218be

trunk/src/rustc/middle/lint.rs

@@ -156,7 +156,7 @@ fn get_lint_dict() -> lint_dict {
 
         (~"non_camel_case_types",
          @{lint: non_camel_case_types,
-           desc: ~"types, variants and traits must have camel case names",
+           desc: ~"types, variants and traits should have camel case names",
            default: warn}),
 
         (~"managed_heap_memory",
@@ -605,7 +605,8 @@ fn check_item_non_camel_case_types(cx: ty::ctxt, it: @ast::item) {
         if !is_camel_case(cx, ident) {
             cx.sess.span_lint(
                 non_camel_case_types, expr_id, item_id, span,
-                ~"type, variant, or trait must be camel case");
+                ~"type, variant, or trait should have \
+                  a camel case identifier");
         }
     }
 

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

@@ -1,24 +1,24 @@
 #[forbid(non_camel_case_types)];
 
-struct foo { //~ ERROR type, variant, or trait must be camel case
+struct foo { //~ ERROR type, variant, or trait should have a camel case identifier
     bar: int,
 }
 
-enum foo2 { //~ ERROR type, variant, or trait must be camel case
+enum foo2 { //~ ERROR type, variant, or trait should have a camel case identifier
     Bar
 }
 
-struct foo3 { //~ ERROR type, variant, or trait must be camel case
+struct foo3 { //~ ERROR type, variant, or trait should have a camel case identifier
     bar: int
 }
 
-type foo4 = int; //~ ERROR type, variant, or trait must be camel case
+type foo4 = int; //~ ERROR type, variant, or trait should have a camel case identifier
 
 enum Foo5 {
-    bar //~ ERROR type, variant, or trait must be camel case
+    bar //~ ERROR type, variant, or trait should have a camel case identifier
 }
 
-trait foo6 { //~ ERROR type, variant, or trait must be camel case
+trait foo6 { //~ ERROR type, variant, or trait should have a camel case identifier
 }
 
 fn main() { }