quit picking at this! i can't stop

Author: joshuadavidthomas

crates/djls-source/src/position.rs

@@ -41,7 +41,7 @@ impl Span {
 
     #[must_use]
     pub fn with_length_usize(self, length: usize) -> Self {
-        Self::from_parts(self.start as usize, length)
+        Self::from_parts(self.start_usize(), length)
     }
 
     /// Construct a span from integer bounds expressed as byte offsets.
@@ -62,6 +62,16 @@ impl Span {
         (self.start, self.length)
     }
 
+    #[must_use]
+    pub fn start_usize(self) -> usize {
+        self.start as usize
+    }
+
+    #[must_use]
+    pub fn length_usize(self) -> usize {
+        self.length as usize
+    }
+
     #[must_use]
     pub fn start_offset(&self) -> ByteOffset {
         ByteOffset(self.start)

crates/djls-templates/src/parser.rs

@@ -130,7 +130,7 @@ impl<'db> Parser<'db> {
                 let error_text = content.text(self.db).clone();
                 let full_span = token.full_span().unwrap_or(*span);
                 Err(ParseError::MalformedConstruct {
-                    position: full_span.start as usize,
+                    position: full_span.start_usize(),
                     content: error_text,
                 })
             }

crates/djls-templates/src/tokens.rs

@@ -86,7 +86,7 @@ impl<'db> Token<'db> {
             | Token::Error { content, .. }
             | Token::Text { content, .. }
             | Token::Variable { content, .. } => content.text(db).clone(),
-            Token::Whitespace { span, .. } => " ".repeat(span.length as usize),
+            Token::Whitespace { span, .. } => " ".repeat(span.length_usize()),
             Token::Newline { span, .. } => {
                 if span.length == 2 {
                     "\r\n".to_string()
@@ -120,7 +120,7 @@ impl<'db> Token<'db> {
                 TagDelimiter::Comment.closer()
             ),
             Token::Text { content, .. } | Token::Error { content, .. } => content.text(db).clone(),
-            Token::Whitespace { span, .. } => " ".repeat(span.length as usize),
+            Token::Whitespace { span, .. } => " ".repeat(span.length_usize()),
             Token::Newline { span, .. } => {
                 if span.length == 2 {
                     "\r\n".to_string()
@@ -155,7 +155,7 @@ impl<'db> Token<'db> {
             | Token::Error { content, .. }
             | Token::Text { content, .. }
             | Token::Variable { content, .. } => content.text(db).len(),
-            Token::Whitespace { span, .. } | Token::Newline { span, .. } => span.length as usize,
+            Token::Whitespace { span, .. } | Token::Newline { span, .. } => span.length_usize(),
             Token::Eof => 0,
         };
         u32::try_from(len).expect("Token length should fit in u32")