diff options
| author | Jakub Bukaj <jakub@jakub.cc> | 2014-11-23 10:47:25 -0500 |
|---|---|---|
| committer | Jakub Bukaj <jakub@jakub.cc> | 2014-11-23 15:23:39 -0500 |
| commit | d6b023a46750d6c2df919908bd0f1460d3d9c8a6 (patch) | |
| tree | 9d93d055fa5aa82480c4b5771aba4cca5efdfc9b | |
| parent | 69a217f37c9e0cfdc2c21ee8c4e969f4a3771734 (diff) | |
| download | rust-d6b023a46750d6c2df919908bd0f1460d3d9c8a6.tar.gz rust-d6b023a46750d6c2df919908bd0f1460d3d9c8a6.zip | |
Fixes to the roll-up
| -rw-r--r-- | src/compiletest/runtest.rs | 2 | ||||
| -rw-r--r-- | src/test/pretty/issue-19077.rs | 2 | ||||
| -rw-r--r-- | src/test/run-pass/super-fast-paren-parsing.rs | 2 |
3 files changed, 4 insertions, 2 deletions
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... |