From 16844198979f574e53a8c3cad460a1f37754fef2 Mon Sep 17 00:00:00 2001
From: Alex Crichton <alex@alexcrichton.com>
Date: Fri, 21 Nov 2014 14:15:33 -0800
Subject: Register new snapshots

---
 src/test/compile-fail/stage0-cmp.rs | 1 -
 1 file changed, 1 deletion(-)

(limited to 'src/test')

diff --git a/src/test/compile-fail/stage0-cmp.rs b/src/test/compile-fail/stage0-cmp.rs
index 2c0772b1414..f68eb6400fa 100644
--- a/src/test/compile-fail/stage0-cmp.rs
+++ b/src/test/compile-fail/stage0-cmp.rs
@@ -30,7 +30,6 @@ pub trait PartialEq for Sized? {
     fn eq(&self, other: &Self) -> bool;
 }
 
-#[cfg(not(stage0))]  // NOTE(stage0): remove cfg after a snapshot
 #[unstable = "Trait is unstable."]
 impl<'a, Sized? T: PartialEq> PartialEq for &'a T {
     #[inline]
-- 
cgit 1.4.1-3-g733a5


From d678684236fece2e8b55515f936c9429036f2d73 Mon Sep 17 00:00:00 2001
From: Adolfo Ochagavía <aochagavia92@gmail.com>
Date: Sat, 22 Nov 2014 21:41:15 +0100
Subject: Add test

---
 src/test/pretty/issue-19077.rs | 20 ++++++++++++++++++++
 1 file changed, 20 insertions(+)
 create mode 100644 src/test/pretty/issue-19077.rs

(limited to 'src/test')

diff --git a/src/test/pretty/issue-19077.rs b/src/test/pretty/issue-19077.rs
new file mode 100644
index 00000000000..6214b3e450f
--- /dev/null
+++ b/src/test/pretty/issue-19077.rs
@@ -0,0 +1,20 @@
+// Copyright 2012 The Rust Project Developers. See the COPYRIGHT
+// file at the top-level directory of this distribution and at
+// http://rust-lang.org/COPYRIGHT.
+//
+// Licensed under the Apache License, Version 2.0 <LICENSE-APACHE or
+// http://www.apache.org/licenses/LICENSE-2.0> or the MIT license
+// <LICENSE-MIT or http://opensource.org/licenses/MIT>, at your
+// option. This file may not be copied, modified, or distributed
+// except according to those terms.
+//
+// Testing that unsafe blocks in match arms are followed by a comma
+// pp-exact
+fn main() {
+    match true {
+        true if true => (),
+        false => unsafe { },
+        true => { }
+        false => (),
+    }
+}
-- 
cgit 1.4.1-3-g733a5


From 40e1f8f8f1dec2c556e3805c75493752f766274f Mon Sep 17 00:00:00 2001
From: Adolfo Ochagavía <aochagavia92@gmail.com>
Date: Sun, 23 Nov 2014 12:27:10 +0100
Subject: Add test

---
 src/test/compile-fail/issue-19096.rs | 16 ++++++++++++++++
 1 file changed, 16 insertions(+)
 create mode 100644 src/test/compile-fail/issue-19096.rs

(limited to 'src/test')

diff --git a/src/test/compile-fail/issue-19096.rs b/src/test/compile-fail/issue-19096.rs
new file mode 100644
index 00000000000..7f42abb3acc
--- /dev/null
+++ b/src/test/compile-fail/issue-19096.rs
@@ -0,0 +1,16 @@
+// Copyright 2012 The Rust Project Developers. See the COPYRIGHT
+// file at the top-level directory of this distribution and at
+// http://rust-lang.org/COPYRIGHT.
+//
+// Licensed under the Apache License, Version 2.0 <LICENSE-APACHE or
+// http://www.apache.org/licenses/LICENSE-2.0> or the MIT license
+// <LICENSE-MIT or http://opensource.org/licenses/MIT>, at your
+// option. This file may not be copied, modified, or distributed
+// except according to those terms.
+
+#![feature(tuple_indexing)]
+
+fn main() {
+    let t = (42i, 42i);
+    t.0::<int>; //~ ERROR expected one of `;`, `}`, found `::`
+}
-- 
cgit 1.4.1-3-g733a5


From d6b023a46750d6c2df919908bd0f1460d3d9c8a6 Mon Sep 17 00:00:00 2001
From: Jakub Bukaj <jakub@jakub.cc>
Date: Sun, 23 Nov 2014 10:47:25 -0500
Subject: Fixes to the roll-up

---
 src/compiletest/runtest.rs                    | 2 +-
 src/test/pretty/issue-19077.rs                | 2 +-
 src/test/run-pass/super-fast-paren-parsing.rs | 2 ++
 3 files changed, 4 insertions(+), 2 deletions(-)

(limited to 'src/test')

diff --git a/src/compiletest/runtest.rs b/src/compiletest/runtest.rs
index 032b2dbe8f1..5c3e5e12adb 100644
--- a/src/compiletest/runtest.rs
+++ b/src/compiletest/runtest.rs
@@ -990,7 +990,7 @@ fn check_expected_errors(expected_errors: Vec<errors::ExpectedError> ,
         let i = s.chars();
         let c : Vec<char> = i.map( |c| {
             if c.is_ascii() {
-                c.to_ascii().to_lowercase().to_char()
+                c.to_ascii().to_lowercase().as_char()
             } else {
                 c
             }
diff --git a/src/test/pretty/issue-19077.rs b/src/test/pretty/issue-19077.rs
index 6214b3e450f..61274385857 100644
--- a/src/test/pretty/issue-19077.rs
+++ b/src/test/pretty/issue-19077.rs
@@ -13,7 +13,7 @@
 fn main() {
     match true {
         true if true => (),
-        false => unsafe { },
+        false if false => unsafe { },
         true => { }
         false => (),
     }
diff --git a/src/test/run-pass/super-fast-paren-parsing.rs b/src/test/run-pass/super-fast-paren-parsing.rs
index 26cc43bcfa0..f00ba36a004 100644
--- a/src/test/run-pass/super-fast-paren-parsing.rs
+++ b/src/test/run-pass/super-fast-paren-parsing.rs
@@ -8,6 +8,8 @@
 // option. This file may not be copied, modified, or distributed
 // except according to those terms.
 
+// ignore-pretty
+//
 // exec-env:RUST_MIN_STACK=16000000
 //
 // Big stack is needed for pretty printing, a little sad...
-- 
cgit 1.4.1-3-g733a5