Merge pull request #831 from epage/span

refactor(parser): Rely on winnow for error span

Author: epage

Cargo.lock

@@ -41,7 +41,7 @@ unbounded = []
 
 [dependencies]
 indexmap = { version = "2.3.0", features = ["std"] }
-winnow = { version = "0.7.0", optional = true }
+winnow = { version = "0.7.3", optional = true }
 serde = { version = "1.0.145", optional = true }
 kstring = { version = "2.0.0", features = ["max_inline"], optional = true }
 toml_datetime = { version = "0.6.8", path = "../toml_datetime" }

crates/toml_edit/Cargo.toml

@@ -25,20 +25,7 @@ impl TomlError {
         let raw = raw.finish();
         let raw = String::from_utf8(raw.to_owned()).expect("original document was utf8");
 
-        let offset = error.offset();
-        let offset = (0..=offset)
-            .rev()
-            .find(|index| raw.is_char_boundary(*index))
-            .unwrap_or(0);
-
-        let mut indices = raw[offset..].char_indices();
-        indices.next();
-        let len = if let Some((index, _)) = indices.next() {
-            index
-        } else {
-            raw.len() - offset
-        };
-        let span = offset..(offset + len);
+        let span = error.char_span();
 
         Self {
             message,