---

alexcrichton · alexcrichton · commit f5187f8f8dcb · 2014-09-29T10:13:31.000-07:00
yaml --- r: 135224 b: refs/heads/snap-stage3 c: d3e1718 h: refs/heads/master v: v3
diff --git a/[refs] b/[refs]
@@ -1,7 +1,7 @@
 ---
 refs/heads/master: 74090504219e4e37c1a6d9fdd8600f44b51c7b04
 refs/heads/snap-stage1: e33de59e47c5076a89eadeb38f4934f58a3618a6
-refs/heads/snap-stage3: 1ae44c2059e0de3e29d53c7f40001c982028fcb2
+refs/heads/snap-stage3: d3e171861f0fd8f3a61ad28d70f675ea9dc712b8
 refs/heads/try: 14378ea357c06c23607ca61ade44f60a7a64a1c7
 refs/tags/release-0.1: 1f5c5126e96c79d22cb7862f75304136e204f105
 refs/heads/ndm: f3868061cd7988080c30d6d5bf352a5a5fe2460b
diff --git a/branches/snap-stage3/src/test/compile-fail/asm-src-loc.rs b/branches/snap-stage3/src/test/compile-fail/asm-src-loc.rs
@@ -12,6 +12,6 @@
 
 fn main() {
     unsafe {
-        asm!("nowayisthisavalidinstruction"); //~ ERROR invalid instruction mnemonic
+        asm!("nowayisthisavalidinstruction"); //~ ERROR invalid instruction
     }
 }
diff --git a/branches/snap-stage3/src/test/compile-fail/issue-16465.rs b/branches/snap-stage3/src/test/compile-fail/issue-16465.rs
@@ -17,7 +17,7 @@ struct Foo<T>{
 type FooInt = Foo<int>;
 
 impl Drop for FooInt {
-//~^ ERROR cannot implement a destructor on a structure with type parameters 
+//~^ ERROR cannot implement a destructor on a structure with type parameters
     fn drop(&mut self){}
 }
 
diff --git a/branches/snap-stage3/src/test/compile-fail/pat-range-bad-dots.rs b/branches/snap-stage3/src/test/compile-fail/pat-range-bad-dots.rs
@@ -8,6 +8,8 @@
 // option. This file may not be copied, modified, or distributed
 // except according to those terms.
 
+// ignore-test
+
 pub fn main() {
     match 22i {
         0 .. 3 => {} //~ ERROR expected `=>`, found `..`

Original file line number	Diff line number	Diff line change
`@@ -12,6 +12,6 @@`
`12`	`12`
`13`	`13`	`fn main() {`
`14`	`14`	`unsafe {`
`15`		`- asm!("nowayisthisavalidinstruction"); //~ ERROR invalid instruction mnemonic`
	`15`	`+ asm!("nowayisthisavalidinstruction"); //~ ERROR invalid instruction`
`16`	`16`	`}`
`17`	`17`	`}`
Original file line number	Diff line number	Diff line change
`@@ -17,7 +17,7 @@ struct Foo<T>{`
`17`	`17`	`type FooInt = Foo<int>;`
`18`	`18`
`19`	`19`	`impl Drop for FooInt {`
`20`		`-//~^ ERROR cannot implement a destructor on a structure with type parameters`
	`20`	`+//~^ ERROR cannot implement a destructor on a structure with type parameters`
`21`	`21`	`fn drop(&mut self){}`
`22`	`22`	`}`
`23`	`23`