From fd860a975b84da9a79abfa247787e6adbd5ea34c Mon Sep 17 00:00:00 2001
From: Titus Wormer <tituswormer@gmail.com>
Date: Tue, 5 Jul 2022 13:03:09 +0200
Subject: Refactor code style

---
 src/util/span.rs | 57 +-------------------------------------------------------
 1 file changed, 1 insertion(+), 56 deletions(-)

(limited to 'src/util/span.rs')

diff --git a/src/util/span.rs b/src/util/span.rs
index 02811cc..32dd00f 100644
--- a/src/util/span.rs
+++ b/src/util/span.rs
@@ -1,20 +1,15 @@
 //! Utilities to deal with semantic labels.
 
 use crate::tokenizer::{Code, Event, EventType};
+use crate::util::codes::serialize as serialize_codes;
 
 /// A struct representing the span of an opening and closing event of a token.
 #[derive(Debug)]
 pub struct Span {
-    // To do: probably needed in the future.
-    // start: Point,
     /// Absolute offset (and `index` in `codes`) of where this span starts.
     pub start_index: usize,
-    // To do: probably needed in the future.
-    // end: Point,
     /// Absolute offset (and `index` in `codes`) of where this span ends.
     pub end_index: usize,
-    // To do: probably needed in the future.
-    // token_type: TokenType,
 }
 
 /// Get a span from an event.
@@ -29,10 +24,8 @@ pub struct Span {
 /// When `micromark` is used, this function never panics.
 pub fn from_exit_event(events: &[Event], index: usize) -> Span {
     let exit = &events[index];
-    // let end = exit.point.clone();
     let end_index = exit.index;
     let token_type = exit.token_type.clone();
-    // To do: support `enter` events if needed and walk forwards?
     assert_eq!(
         exit.event_type,
         EventType::Exit,
@@ -44,11 +37,8 @@ pub fn from_exit_event(events: &[Event], index: usize) -> Span {
         let enter = &events[enter_index];
         if enter.event_type == EventType::Enter && enter.token_type == token_type {
             return Span {
-                // start: enter.point.clone(),
                 start_index: enter.index,
-                // end,
                 end_index,
-                // token_type,
             };
         }
 
@@ -65,48 +55,3 @@ pub fn serialize(all_codes: &[Code], span: &Span, expand_tabs: bool) -> String {
 pub fn codes<'a>(codes: &'a [Code], span: &Span) -> &'a [Code] {
     &codes[span.start_index..span.end_index]
 }
-
-/// Serialize a slice of codes, optionally expanding tabs.
-fn serialize_codes(codes: &[Code], expand_tabs: bool) -> String {
-    let mut at_tab = false;
-    let mut index = 0;
-    let mut value: Vec<char> = vec![];
-
-    while index < codes.len() {
-        let code = codes[index];
-        let mut at_tab_next = false;
-
-        match code {
-            Code::CarriageReturnLineFeed => {
-                value.push('\r');
-                value.push('\n');
-            }
-            Code::Char(char) if char == '\n' || char == '\r' => {
-                value.push(char);
-            }
-            Code::Char(char) if char == '\t' => {
-                at_tab_next = true;
-                value.push(if expand_tabs { ' ' } else { char });
-            }
-            Code::VirtualSpace => {
-                if !expand_tabs && at_tab {
-                    index += 1;
-                    continue;
-                }
-                value.push(' ');
-            }
-            Code::Char(char) => {
-                value.push(char);
-            }
-            Code::None => {
-                unreachable!("unexpected EOF code in codes");
-            }
-        }
-
-        at_tab = at_tab_next;
-
-        index += 1;
-    }
-
-    value.into_iter().collect()
-}
-- 
cgit