---

yaml
---
r: 28571
b: refs/heads/try
c: eb35039
h: refs/heads/master
i:
  28569: c69050b
  28567: e4c45c2
v: v3

Author: brson

[refs]

@@ -2,7 +2,7 @@
 refs/heads/master: cd6f24f9d14ac90d167386a56e7a6ac1f0318195
 refs/heads/snap-stage1: e33de59e47c5076a89eadeb38f4934f58a3618a6
 refs/heads/snap-stage3: cd6f24f9d14ac90d167386a56e7a6ac1f0318195
-refs/heads/try: 5e9d38ede0f0eff5fec3ad8713897c080211d5ea
+refs/heads/try: eb35039fe83d6d13b5c7c08fe761ab85374c96d0
 refs/tags/release-0.1: 1f5c5126e96c79d22cb7862f75304136e204f105
 refs/heads/ndm: f3868061cd7988080c30d6d5bf352a5a5fe2460b
 refs/heads/try2: d0c6ce338884ee21843f4b40bf6bf18d222ce5df

branches/try/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");
         }
     }
 

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