Merge pull request #399 from dtolnay/carriagereturn

Revert "Require \r whitespace to be followed by \n"
dtolnay · Jul 9, 2023 · 9c812bc · 9c812bc
2 parents bdfb5c1 + 261ad4d
commit 9c812bc
Show file tree

Hide file tree

Showing 2 changed files with 3 additions and 7 deletions.
diff --git a/src/parse.rs b/src/parse.rs
@@ -104,14 +104,10 @@ fn skip_whitespace(input: Cursor) -> Cursor {
             }
         }
         match byte {
-            b' ' | 0x09..=0x0c => {
+            b' ' | 0x09..=0x0d => {
                 s = s.advance(1);
                 continue;
             }
-            b'\r' if s.as_bytes().get(1) == Some(&b'\n') => {
-                s = s.advance(2);
-                continue;
-            }
             b if b <= 0x7f => {}
             _ => {
                 let ch = s.chars().next().unwrap();

diff --git a/tests/test.rs b/tests/test.rs
@@ -739,8 +739,8 @@ fn whitespace() {
     let tokens = various_spaces.parse::<TokenStream>().unwrap();
     assert_eq!(tokens.into_iter().count(), 0);
 
-    let lone_carriage_return = " \r ";
-    lone_carriage_return.parse::<TokenStream>().unwrap_err();
+    let lone_carriage_returns = " \r \r\r\n ";
+    lone_carriage_returns.parse::<TokenStream>().unwrap();
 }
 
 #[test]