Split Spanned<T> from Span and expose fields

Spanned<T> wraps a value with a Span.
Public fields enable destructuring in pattern matches.

2 files changed, 7 insertions, 5 deletions

diff --git a/compiler/src/lexer/mod.rs b/compiler/src/lexer/mod.rs
index ff7d51d..464d88e 100644
--- a/compiler/src/lexer/mod.rs
+++ b/compiler/src/lexer/mod.rs
@@ -1,4 +1,4 @@
-use crate::span::{Pos, Span};
+use crate::span::{Pos, Span, Spanned};
 
 #[cfg(test)]
 mod tests;
@@ -113,7 +113,7 @@ impl<'a> Lexer<'a> {
 }
 
 impl<'a> Iterator for Lexer<'a> {
-    type Item = Span<Token<'a>>;
+    type Item = Spanned<Token<'a>>;
 
     fn next(&mut self) -> Option<Self::Item> {
         loop {
@@ -163,6 +163,6 @@ impl<'a> Iterator for Lexer<'a> {
         };
 
         let end = Pos::new(self.line, self.column, self.cursor);
-        Some(Span::new(token, start, end))
+        Some(Spanned::new(token, Span::new(start, end)))
     }
 }
diff --git a/compiler/src/lexer/tests.rs b/compiler/src/lexer/tests.rs
index 30be85a..2dce2e3 100644
--- a/compiler/src/lexer/tests.rs
+++ b/compiler/src/lexer/tests.rs
@@ -4,7 +4,7 @@ use super::Token::*;
 use super::*;
 
 fn tokenize<'a>(input: &'a str) -> Vec<Token<'a>> {
-    Lexer::new(input).map(|s| s.into_inner()).collect()
+    Lexer::new(input).map(|s| s.inner).collect()
 }
 
 #[test]
@@ -289,7 +289,9 @@ fn test_comments() {
 }
 
 fn spans(input: &str) -> Vec<(Pos, Pos)> {
-    Lexer::new(input).map(|s| (s.start(), s.end())).collect()
+    Lexer::new(input)
+        .map(|s| (s.span.start, s.span.end))
+        .collect()
 }
 
 #[test]