auto merge of #16659 : brson/rust/slowparse, r=alexcrichton

Note that this contains a 9.5MB test file, but it should compress thoroughly.

1 files changed, 16 insertions, 5 deletions

diff --git a/src/libsyntax/parse/mod.rs b/src/libsyntax/parse/mod.rs
index e76e4adcd7f..17a27a5a39e 100644
--- a/src/libsyntax/parse/mod.rs
+++ b/src/libsyntax/parse/mod.rs
@@ -412,14 +412,21 @@ pub fn str_lit(lit: &str) -> String {
     loop {
         match chars.next() {
             Some((i, c)) => {
-                let em = error(i);
                 match c {
                     '\\' => {
-                        if chars.peek().expect(em.as_slice()).val1() == '\n' {
+                        let ch = chars.peek().unwrap_or_else(|| {
+                            fail!("{}", error(i).as_slice())
+                        }).val1();
+
+                        if ch == '\n' {
                             eat(&mut chars);
-                        } else if chars.peek().expect(em.as_slice()).val1() == '\r' {
+                        } else if ch == '\r' {
                             chars.next();
-                            if chars.peek().expect(em.as_slice()).val1() != '\n' {
+                            let ch = chars.peek().unwrap_or_else(|| {
+                                fail!("{}", error(i).as_slice())
+                            }).val1();
+
+                            if ch != '\n' {
                                 fail!("lexer accepted bare CR");
                             }
                             eat(&mut chars);
@@ -433,7 +440,11 @@ pub fn str_lit(lit: &str) -> String {
                         }
                     },
                     '\r' => {
-                        if chars.peek().expect(em.as_slice()).val1() != '\n' {
+                        let ch = chars.peek().unwrap_or_else(|| {
+                            fail!("{}", error(i).as_slice())
+                        }).val1();
+
+                        if ch != '\n' {
                             fail!("lexer accepted bare CR");
                         }
                         chars.next();