---

yaml
---
r: 64757
b: refs/heads/snap-stage3
c: 5c4cd30
h: refs/heads/master
i:
  64755: 32b00b9
v: v3

Author: bors

[refs]

@@ -1,7 +1,7 @@
 ---
 refs/heads/master: 2d28d645422c1617be58c8ca7ad9a457264ca850
 refs/heads/snap-stage1: e33de59e47c5076a89eadeb38f4934f58a3618a6
-refs/heads/snap-stage3: f5721c9334b2dca5375edd47428d0d317988fb9a
+refs/heads/snap-stage3: 5c4cd30f80273ba573df048b6295ea6e543df599
 refs/heads/try: 7b78b52e602bb3ea8174f9b2006bff3315f03ef9
 refs/tags/release-0.1: 1f5c5126e96c79d22cb7862f75304136e204f105
 refs/heads/ndm: f3868061cd7988080c30d6d5bf352a5a5fe2460b

branches/snap-stage3/src/compiletest/runtest.rs

@@ -681,7 +681,7 @@ fn make_out_name(config: &config, testfile: &Path, extension: &str) -> Path {
 }
 
 fn aux_output_dir_name(config: &config, testfile: &Path) -> Path {
-    output_base_name(config, testfile).with_filetype("libaux")
+    Path(output_base_name(config, testfile).to_str() + ".libaux")
 }
 
 fn output_testname(testfile: &Path) -> Path {

branches/snap-stage3/src/librustc/metadata/tydecode.rs

@@ -186,7 +186,7 @@ fn parse_trait_store(st: &mut PState) -> ty::TraitStore {
 }
 
 fn parse_substs(st: &mut PState, conv: conv_did) -> ty::substs {
-    let regions = parse_region_substs(st);
+    let regions = parse_region_substs(st, |x,y| conv(x,y));
 
     let self_ty = parse_opt(st, |st| parse_ty(st, |x,y| conv(x,y)) );
 
@@ -202,7 +202,7 @@ fn parse_substs(st: &mut PState, conv: conv_did) -> ty::substs {
     };
 }
 
-fn parse_region_substs(st: &mut PState) -> ty::RegionSubsts {
+fn parse_region_substs(st: &mut PState, conv: conv_did) -> ty::RegionSubsts {
     match next(st) {
         'e' => ty::ErasedRegions,
         'n' => {

branches/snap-stage3/src/librustc/middle/lint.rs

@@ -827,26 +827,23 @@ fn check_item_non_camel_case_types(cx: &Context, it: &ast::item) {
             !ident.contains_char('_')
     }
 
-    fn check_case(cx: &Context, sort: &str, ident: ast::ident, span: span) {
+    fn check_case(cx: &Context, ident: ast::ident, span: span) {
         if !is_camel_case(cx.tcx, ident) {
-            cx.span_lint(
-                non_camel_case_types, span,
-                fmt!("%s `%s` should have a camel case identifier",
-                    sort, cx.tcx.sess.str_of(ident)));
+            cx.span_lint(non_camel_case_types, span,
+                         "type, variant, or trait should have \
+                          a camel case identifier");
         }
     }
 
     match it.node {
-        ast::item_ty(*) | ast::item_struct(*) => {
-            check_case(cx, "type", it.ident, it.span)
-        }
+        ast::item_ty(*) | ast::item_struct(*) |
         ast::item_trait(*) => {
-            check_case(cx, "trait", it.ident, it.span)
+            check_case(cx, it.ident, it.span)
         }
         ast::item_enum(ref enum_definition, _) => {
-            check_case(cx, "type", it.ident, it.span);
+            check_case(cx, it.ident, it.span);
             for enum_definition.variants.iter().advance |variant| {
-                check_case(cx, "variant", variant.node.name, variant.span);
+                check_case(cx, variant.node.name, variant.span);
             }
         }
         _ => ()

branches/snap-stage3/src/librustc/middle/typeck/coherence.rs

@@ -439,7 +439,7 @@ impl CoherenceChecker {
                                          -> UniversalQuantificationResult {
         let regions = match polytype.generics.region_param {
             None => opt_vec::Empty,
-            Some(_) => {
+            Some(r) => {
                 opt_vec::with(
                     self.inference_context.next_region_var(
                         infer::BoundRegionInCoherence))

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

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