From efe80cb9308a4ec0fabaaff845b0c0fac2229ba0 Mon Sep 17 00:00:00 2001 From: Felix Date: Tue, 13 Apr 2021 17:42:54 +0200 Subject: [PATCH] lex: drop Windows line ending support again for now --- src/lex/cursor.rs | 15 ++++----------- 1 file changed, 4 insertions(+), 11 deletions(-) diff --git a/src/lex/cursor.rs b/src/lex/cursor.rs index 7aad335..ea89db6 100644 --- a/src/lex/cursor.rs +++ b/src/lex/cursor.rs @@ -11,7 +11,7 @@ pub(crate) struct Cursor<'a> { impl<'a> Cursor<'a> { pub const fn new(stream: Chars<'a>) -> Cursor<'a> { Cursor { - stream: stream, + stream, line: 1, col: 1, } @@ -21,16 +21,9 @@ impl<'a> Cursor<'a> { let c = self.stream.next(); self.col += 1; - - match c { - Some('\n') => { - self.line += 1; - self.col = 0; - }, - Some('\r') => unsafe { - let null: *const i32 = std::ptr::null(); - std::ptr::read_volatile(null); - }, + if c == Some('\n') { + self.line += 1; + self.col = 0; } c