From 50b16309a5aa7904b998a33b37ad931b863587ec Mon Sep 17 00:00:00 2001
From: Scott Richmond <kredati@users.noreply.github.com>
Date: Sun, 29 Jun 2025 18:04:00 -0400
Subject: [PATCH] Update chumsky, lose ariadne

---
 Cargo.lock    | 80 +++++++++++++--------------------------------------
 src/parser.rs |  8 +++---
 2 files changed, 24 insertions(+), 64 deletions(-)

diff --git a/Cargo.lock b/Cargo.lock
index 706f3a1..2853529 100644
--- a/Cargo.lock
+++ b/Cargo.lock
@@ -2,18 +2,6 @@
 # It is not intended for manual editing.
 version = 4
 
-[[package]]
-name = "ahash"
-version = "0.8.11"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "e89da841a80418a9b391ebaea17f5c112ffaaa96f621d2c285b5174da76b9011"
-dependencies = [
- "cfg-if",
- "once_cell",
- "version_check",
- "zerocopy",
-]
-
 [[package]]
 name = "aho-corasick"
 version = "1.1.3"
@@ -29,15 +17,6 @@ version = "0.2.18"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "5c6cb57a04249c6480766f7f7cef5467412af1490f8d1e243141daddada3264f"
 
-[[package]]
-name = "ariadne"
-version = "0.5.0"
-source = "git+https://github.com/zesterer/ariadne#143e1713f58f816fd768bdf70c28b997d9d001d3"
-dependencies = [
- "unicode-width",
- "yansi",
-]
-
 [[package]]
 name = "autocfg"
 version = "1.4.0"
@@ -73,8 +52,9 @@ checksum = "baf1de4339761588bc0619e3cbc0120ee582ebb74b53b4efbf79117bd2da40fd"
 
 [[package]]
 name = "chumsky"
-version = "1.0.0-alpha.7"
-source = "git+https://github.com/zesterer/chumsky#24540b33860d85e2965dc6110b141ee49e9dd1b7"
+version = "0.10.1"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "14377e276b2c8300513dff55ba4cc4142b44e5d6de6d00eb5b2307d650bb4ec1"
 dependencies = [
  "hashbrown",
  "regex-automata 0.3.9",
@@ -85,13 +65,26 @@ dependencies = [
 ]
 
 [[package]]
-name = "hashbrown"
-version = "0.14.5"
+name = "equivalent"
+version = "1.0.2"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "e5274423e17b7c9fc20b6e7e208532f9b19825d82dfd615708b70edd83df41f1"
+checksum = "877a4ace8713b0bcf2a4e7eec82529c029f1d0619886d18145fea96c3ffe5c0f"
+
+[[package]]
+name = "foldhash"
+version = "0.1.5"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "d9c4f5dac5e15c24eb999c26181a6ca40b39fe946cbe4c263c7209467bc83af2"
+
+[[package]]
+name = "hashbrown"
+version = "0.15.4"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "5971ac85611da7067dbfcabef3c70ebb5606018acd9e2a3903a0da507521e0d5"
 dependencies = [
- "ahash",
  "allocator-api2",
+ "equivalent",
+ "foldhash",
 ]
 
 [[package]]
@@ -258,7 +251,6 @@ checksum = "2b15c43186be67a4fd63bee50d0303afffcef381492ebe2c5d87f324e1b8815c"
 name = "rudus"
 version = "0.0.1"
 dependencies = [
- "ariadne",
  "chumsky",
  "imbl",
  "num-derive",
@@ -336,12 +328,6 @@ version = "1.12.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "f6ccf251212114b54433ec949fd6a7841275f9ada20dddd2f29e9ceea4501493"
 
-[[package]]
-name = "unicode-width"
-version = "0.1.14"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "7dd6e30e90baa6f72411720665d41d89b9a3d039dc45b8faea1ddd07f617f6af"
-
 [[package]]
 name = "version_check"
 version = "0.9.5"
@@ -478,29 +464,3 @@ name = "windows_x86_64_msvc"
 version = "0.52.6"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "589f6da84c646204747d1270a2a5661ea66ed1cced2631d546fdfb155959f9ec"
-
-[[package]]
-name = "yansi"
-version = "1.0.1"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "cfe53a6657fd280eaa890a3bc59152892ffa3e30101319d168b781ed6529b049"
-
-[[package]]
-name = "zerocopy"
-version = "0.7.35"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "1b9b4fd18abc82b8136838da5d50bae7bdea537c574d8dc1a34ed098d6c166f0"
-dependencies = [
- "zerocopy-derive",
-]
-
-[[package]]
-name = "zerocopy-derive"
-version = "0.7.35"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "fa4f8080344d4671fb4e831a13ad1e68092748387dfc4f55e356242fae12ce3e"
-dependencies = [
- "proc-macro2",
- "quote",
- "syn",
-]
diff --git a/src/parser.rs b/src/parser.rs
index e13bc5c..c95ecbe 100644
--- a/src/parser.rs
+++ b/src/parser.rs
@@ -516,7 +516,7 @@ fn parse_string(s: &'static str, span: SimpleSpan) -> Result<Vec<Spanned<StringP
                         if !current_part.is_empty() {
                             parts.push((
                                 StringPart::Data(current_part),
-                                SimpleSpan::new(start, start + i),
+                                SimpleSpan::new(span.context(), start..start + i),
                             ));
                         };
                         current_part = String::new();
@@ -534,7 +534,7 @@ fn parse_string(s: &'static str, span: SimpleSpan) -> Result<Vec<Spanned<StringP
                 if is_word {
                     parts.push((
                         StringPart::Word(current_part.clone()),
-                        SimpleSpan::new(start, start + i),
+                        SimpleSpan::new(span.context(), start..start + i),
                     ));
                     current_part = String::new();
                     start = i;
@@ -563,13 +563,13 @@ fn parse_string(s: &'static str, span: SimpleSpan) -> Result<Vec<Spanned<StringP
     if current_part == s {
         parts.push((
             StringPart::Inline(current_part),
-            SimpleSpan::new(start, span.end),
+            SimpleSpan::new(span.context(), start..span.end),
         ))
     } else if !current_part.is_empty() {
         let part_len = current_part.len();
         parts.push((
             StringPart::Data(current_part),
-            SimpleSpan::new(start, part_len),
+            SimpleSpan::new(span.context(), start..part_len),
         ))
     }