From 8d9961b75377a7bd2656b5aa1451710de8c86f60 Mon Sep 17 00:00:00 2001
From: Aleksey Kladov <aleksey.kladov@gmail.com>
Date: Sat, 28 Jul 2018 13:07:10 +0300
Subject: Migrate to text-unit

---
 src/parser/event.rs | 8 +++++---
 src/parser/input.rs | 4 ++--
 2 files changed, 7 insertions(+), 5 deletions(-)

(limited to 'src/parser')

diff --git a/src/parser/event.rs b/src/parser/event.rs
index 1c0905a38..ac8a55de9 100644
--- a/src/parser/event.rs
+++ b/src/parser/event.rs
@@ -1,5 +1,7 @@
-use {ErrorMsg, File, FileBuilder, Sink, SyntaxKind, TextUnit, Token};
-use syntax_kinds::TOMBSTONE;
+use {
+    ErrorMsg, File, FileBuilder, Sink, SyntaxKind, Token,
+    syntax_kinds::TOMBSTONE,
+};
 use super::is_insignificant;
 
 /// `Parser` produces a flat list of `Event`s.
@@ -133,7 +135,7 @@ pub(super) fn to_file(text: String, tokens: &[Token], events: Vec<Event>) -> Fil
                     builder.leaf(token.kind, token.len);
                     idx += 1
                 }
-                let mut len = TextUnit::new(0);
+                let mut len = 0.into();
                 for _ in 0..n_raw_tokens {
                     len += tokens[idx].len;
                     idx += 1;
diff --git a/src/parser/input.rs b/src/parser/input.rs
index 13589467b..9b400b959 100644
--- a/src/parser/input.rs
+++ b/src/parser/input.rs
@@ -14,7 +14,7 @@ impl<'t> ParserInput<'t> {
     pub fn new(text: &'t str, raw_tokens: &'t [Token]) -> ParserInput<'t> {
         let mut tokens = Vec::new();
         let mut start_offsets = Vec::new();
-        let mut len = TextUnit::new(0);
+        let mut len = 0.into();
         for &token in raw_tokens.iter() {
             if !is_insignificant(token.kind) {
                 tokens.push(token);
@@ -44,7 +44,7 @@ impl<'t> ParserInput<'t> {
         if !(idx < self.tokens.len()) {
             return "";
         }
-        let range = TextRange::from_len(self.start_offsets[idx], self.tokens[idx].len);
+        let range = TextRange::offset_len(self.start_offsets[idx], self.tokens[idx].len);
         &self.text[range]
     }
 }
-- 
cgit v1.2.3