diff options
Diffstat (limited to 'src/parse')
| -rw-r--r-- | src/parse/lines.rs | 6 | ||||
| -rw-r--r-- | src/parse/resolve.rs | 4 |
2 files changed, 5 insertions, 5 deletions
diff --git a/src/parse/lines.rs b/src/parse/lines.rs index c47b7534..8693af44 100644 --- a/src/parse/lines.rs +++ b/src/parse/lines.rs @@ -1,5 +1,5 @@ use super::Scanner; -use crate::syntax::{Location, Offset, Pos}; +use crate::syntax::{Location, Pos}; /// Enables conversion of byte position to locations. pub struct LineMap<'s> { @@ -44,7 +44,7 @@ impl<'s> LineMap<'s> { pub fn pos(&self, location: Location) -> Option<Pos> { // Determine the boundaries of the line. let line_idx = location.line.checked_sub(1)? as usize; - let line_start = self.line_starts.get(line_idx)?; + let line_start = *self.line_starts.get(line_idx)?; let line_end = self .line_starts .get(location.line as usize) @@ -64,7 +64,7 @@ impl<'s> LineMap<'s> { 0 }; - Some(line_start.offset(Pos(line_offset as u32))) + Some(line_start + line_offset) } } diff --git a/src/parse/resolve.rs b/src/parse/resolve.rs index 4592acbc..88e11784 100644 --- a/src/parse/resolve.rs +++ b/src/parse/resolve.rs @@ -1,5 +1,5 @@ use super::{is_newline, Scanner}; -use crate::syntax::{Ident, NodeRaw, Offset, Pos}; +use crate::syntax::{Ident, NodeRaw, Pos}; /// Resolve all escape sequences in a string. pub fn resolve_string(string: &str) -> String { @@ -52,7 +52,7 @@ pub fn resolve_raw(text: &str, backticks: usize, start: Pos) -> NodeRaw { let (tag, inner) = split_at_lang_tag(text); let (lines, had_newline) = trim_and_split_raw(inner); NodeRaw { - lang: Ident::new(tag, start .. start.offset(tag.len())), + lang: Ident::new(tag, start .. start + tag.len()), lines, block: had_newline, } |