Replaced ByteIndex::start() with ByteIndex(0) --- now that it's j…

…ust an index, `0` is clearer than `start` (which made sense when there was other data beyond just the current byte)
sharkdp · Sep 24, 2024 · e6bb921 · e6bb921
1 parent e467dcf
commit e6bb921
Show file tree

Hide file tree

Showing 3 changed files with 9 additions and 13 deletions.
diff --git a/numbat/src/ffi/lookup.rs b/numbat/src/ffi/lookup.rs
@@ -21,8 +21,8 @@ pub fn _get_chemical_element_data_raw(mut args: Args) -> Result<Value> {
         .find(|e| e.name().to_lowercase() == pattern || e.symbol().to_lowercase() == pattern)
     {
         let unknown_span = Span {
-            start: ByteIndex::start(),
-            end: ByteIndex::start(),
+            start: ByteIndex(0),
+            end: ByteIndex(0),
             code_source_id: 0,
         };
 

diff --git a/numbat/src/span.rs b/numbat/src/span.rs
@@ -25,10 +25,6 @@ impl AddAssign<u32> for ByteIndex {
 }
 
 impl ByteIndex {
-    pub fn start() -> Self {
-        Self(0)
-    }
-
     pub fn single_character_span(self, code_source_id: usize) -> Span {
         Span {
             start: self,
@@ -73,8 +69,8 @@ impl Span {
     #[cfg(test)]
     pub fn dummy() -> Span {
         Self {
-            start: ByteIndex::start(),
-            end: ByteIndex::start(),
+            start: ByteIndex(0),
+            end: ByteIndex(0),
             code_source_id: 0,
         }
     }

diff --git a/numbat/src/tokenizer.rs b/numbat/src/tokenizer.rs
@@ -253,13 +253,13 @@ fn char_at(s: &str, byte_index: usize) -> Option<char> {
 impl Tokenizer {
     fn new(code_source_id: usize) -> Self {
         Tokenizer {
-            current: ByteIndex::start(),
-            last: ByteIndex::start(),
-            token_start: ByteIndex::start(),
+            current: ByteIndex(0),
+            last: ByteIndex(0),
+            token_start: ByteIndex(0),
 
             code_source_id,
-            string_start: ByteIndex::start(),
-            interpolation_start: ByteIndex::start(),
+            string_start: ByteIndex(0),
+            interpolation_start: ByteIndex(0),
             interpolation_state: InterpolationState::Outside,
         }
     }