---

yaml
---
r: 34807
b: refs/heads/master
c: fa38c12
h: refs/heads/master
i:
  34805: 372942b
  34803: b004dbc
  34799: 930d1fd
v: v3

Author: pcwalton

[refs]

@@ -1,5 +1,5 @@
 ---
-refs/heads/master: 141ef23aa714c9572da6fd616e7bdb96ea40ea07
+refs/heads/master: fa38c1290119c1ceca77db38c0075f7412d296d7
 refs/heads/snap-stage1: e33de59e47c5076a89eadeb38f4934f58a3618a6
 refs/heads/snap-stage3: eb8fd119c65c67f3b1b8268cc7341c22d39b7b61
 refs/heads/try: d324a424d8f84b1eb049b12cf34182bda91b0024

trunk/src/test/compile-fail/issue-2766-a.rs

@@ -1,13 +1,13 @@
 mod stream {
     #[legacy_exports];
-    enum stream<T: Send> { send(T, server::stream<T>), }
+    enum Stream<T: Send> { send(T, server::Stream<T>), }
     mod server {
         #[legacy_exports];
-        impl<T: Send> stream<T> {
-            fn recv() -> extern fn(+v: stream<T>) -> stream::stream<T> {
+        impl<T: Send> Stream<T> {
+            fn recv() -> extern fn(+v: Stream<T>) -> stream::Stream<T> {
               // resolve really should report just one error here.
               // Change the test case when it changes.
-              fn recv(+pipe: stream<T>) -> stream::stream<T> { //~ ERROR attempt to use a type argument out of scope
+              fn recv(+pipe: Stream<T>) -> stream::Stream<T> { //~ ERROR attempt to use a type argument out of scope
                 //~^ ERROR use of undeclared type name
                 //~^^ ERROR attempt to use a type argument out of scope
                 //~^^^ ERROR use of undeclared type name
@@ -16,7 +16,7 @@ mod stream {
                 recv
             }
         }
-        type stream<T: Send> = pipes::RecvPacket<stream::stream<T>>;
+        type Stream<T: Send> = pipes::RecvPacket<stream::Stream<T>>;
     }
 }
 

trunk/src/test/compile-fail/issue-3099-a.rs

@@ -1,5 +1,5 @@
 enum a { b, c }
 
-enum a { d, e } //~ ERROR Duplicate definition of type a
+enum a { d, e } //~ ERROR duplicate definition of type a
 
 fn main() {}

trunk/src/test/compile-fail/issue-3099-b.rs

@@ -2,6 +2,6 @@
 mod a {}
 
 #[legacy_exports]
-mod a {} //~ ERROR Duplicate definition of module a
+mod a {} //~ ERROR duplicate definition of type a
 
 fn main() {}

trunk/src/test/compile-fail/issue-3099.rs

@@ -2,7 +2,7 @@ fn a(x: ~str) -> ~str {
     fmt!("First function with %s", x)
 }
 
-fn a(x: ~str, y: ~str) -> ~str { //~ ERROR Duplicate definition of value a
+fn a(x: ~str, y: ~str) -> ~str { //~ ERROR duplicate definition of value a
     fmt!("Second function with %s and %s", x, y)
 }