Fixes to the roll-up

diff --git a/src/compiletest/runtest.rs b/src/compiletest/runtest.rs
index 032b2dbe8f1ffb23a20196111b5409ff9a98c1e5..5c3e5e12adbcbc325db0c88f490b67b56e4bdb16 100644 (file)
--- a/src/compiletest/runtest.rs
+++ b/src/compiletest/runtest.rs
@@ -990,7 +990,7 @@ fn to_lower( s : &str ) -> String {
         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 6214b3e450f3de19951630936c177d2c094e72e1..61274385857fe5f09aafb85426b393935bb7fe74 100644 (file)
--- 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 26cc43bcfa0baaccc49821f2569ca0c8545c2ab2..f00ba36a00450e1c8fa2646b51bb8115e75c413a 100644 (file)
--- 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...