From c5b3f8ee98203191d83d3cfca39bb0f35ee6efc2 Mon Sep 17 00:00:00 2001
From: Laurenz <laurmaedje@gmail.com>
Date: Sat, 16 Apr 2022 22:23:57 +0200
Subject: Switch to `unscanny`

---
 src/source.rs | 10 ++++++----
 1 file changed, 6 insertions(+), 4 deletions(-)

(limited to 'src/source.rs')

diff --git a/src/source.rs b/src/source.rs
index 9f2a0140..37aa96ca 100644
--- a/src/source.rs
+++ b/src/source.rs
@@ -6,9 +6,11 @@ use std::ops::Range;
 use std::path::{Path, PathBuf};
 use std::sync::Arc;
 
+use unscanny::Scanner;
+
 use crate::diag::TypResult;
 use crate::loading::{FileHash, Loader};
-use crate::parse::{is_newline, parse, Reparser, Scanner};
+use crate::parse::{is_newline, parse, Reparser};
 use crate::syntax::ast::Markup;
 use crate::syntax::{self, Category, GreenNode, RedNode};
 use crate::util::{PathExt, StrExt};
@@ -382,12 +384,12 @@ impl Line {
         let mut utf16_idx = utf16_offset;
 
         std::iter::from_fn(move || {
-            s.eat_until(|c| {
+            s.eat_until(|c: char| {
                 utf16_idx += c.len_utf16();
                 is_newline(c)
             });
 
-            if s.eof() {
+            if s.done() {
                 return None;
             }
 
@@ -396,7 +398,7 @@ impl Line {
             }
 
             Some(Line {
-                byte_idx: byte_offset + s.index(),
+                byte_idx: byte_offset + s.cursor(),
                 utf16_idx,
             })
         })
-- 
cgit v1.2.3