chore(deps): bump serde_json from 1.0.140 to 1.0.145

Bumps [serde_json](https://github.com/serde-rs/json) from 1.0.140 to 1.0.145. - [Release notes](https://github.com/serde-rs/json/releases) - [Commits](https://github.com/serde-rs/json/compare/v1.0.140...v1.0.145) --- updated-dependencies: - dependency-name: serde_json dependency-version: 1.0.145 dependency-type: direct:production update-type: version-update:semver-patch ... Signed-off-by: dependabot[bot] <support@github.com>
2025-09-15 20:36:30 +00:00
3 changed files with 131 additions and 185 deletions
--- a/Cargo.lock
+++ b/Cargo.lock
@@ -40,12 +40,6 @@ dependencies = [
 "memchr",
 ]

-[[package]]
-name = "allocator-api2"
-version = "0.2.21"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "683d7910e743518b0e34f1186f92494becacb047c7b6bf616c96772180fef923"
-
 [[package]]
 name = "anstream"
 version = "0.6.19"
@@ -119,7 +113,7 @@ checksum = "e539d3fca749fcee5236ab05e93a52867dd549cc157c8cb7f99595f3cedffdb5"
 dependencies = [
 "proc-macro2",
 "quote",
- "syn 2.0.101",
+ "syn",
 ]

 [[package]]
@@ -136,7 +130,7 @@ checksum = "ffdcb70bdbc4d478427380519163274ac86e52916e10f0a8889adf0f96d3fee7"
 dependencies = [
 "proc-macro2",
 "quote",
- "syn 2.0.101",
+ "syn",
 ]

 [[package]]
@@ -166,12 +160,6 @@ version = "0.13.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "9e1b586273c5702936fe7b7d6896644d8be71e6314cfe09d3167c95f712589e8"

-[[package]]
-name = "base64"
-version = "0.21.7"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "9d297deb1925b89f2ccc13d7635fa0714f12c87adce1c75356b39ca9b7178567"
-
 [[package]]
 name = "base64"
 version = "0.22.1"
@@ -237,7 +225,7 @@ checksum = "7ecc273b49b3205b83d648f0690daa588925572cc5063745bfe547fe7ec8e1a1"
 dependencies = [
 "proc-macro2",
 "quote",
- "syn 2.0.101",
+ "syn",
 ]

 [[package]]
@@ -332,15 +320,6 @@ version = "1.0.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "baf1de4339761588bc0619e3cbc0120ee582ebb74b53b4efbf79117bd2da40fd"

-[[package]]
-name = "chumsky"
-version = "0.9.3"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "8eebd66744a15ded14960ab4ccdbfb51ad3b81f51f3f04a80adac98c985396c9"
-dependencies = [
- "hashbrown 0.14.5",
-]
-
 [[package]]
 name = "clap"
 version = "4.5.45"
@@ -369,10 +348,10 @@ version = "4.5.45"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "14cb31bb0a7d536caef2639baa7fad459e15c3144efefa6dbd1c84562c4739f6"
 dependencies = [
- "heck 0.5.0",
+ "heck",
 "proc-macro2",
 "quote",
- "syn 2.0.101",
+ "syn",
 ]

 [[package]]
@@ -492,7 +471,7 @@ dependencies = [
 "proc-macro2",
 "quote",
 "strsim",
- "syn 2.0.101",
+ "syn",
 ]

 [[package]]
@@ -503,7 +482,7 @@ checksum = "fc34b93ccb385b40dc71c6fceac4b2ad23662c7eeb248cf10d529b7e055b6ead"
 dependencies = [
 "darling_core",
 "quote",
- "syn 2.0.101",
+ "syn",
 ]

 [[package]]
@@ -536,7 +515,7 @@ checksum = "30542c1ad912e0e3d22a1935c290e12e8a29d704a420177a31faad4a601a0800"
 dependencies = [
 "proc-macro2",
 "quote",
- "syn 2.0.101",
+ "syn",
 ]

 [[package]]
@@ -557,7 +536,7 @@ dependencies = [
 "darling",
 "proc-macro2",
 "quote",
- "syn 2.0.101",
+ "syn",
 ]

 [[package]]
@@ -567,7 +546,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "ab63b0e2bf4d5928aff72e83a7dace85d7bba5fe12dcc3c5a572d78caffd3f3c"
 dependencies = [
 "derive_builder_core",
- "syn 2.0.101",
+ "syn",
 ]

 [[package]]
@@ -587,7 +566,7 @@ checksum = "bda628edc44c4bb645fbe0f758797143e4e07926f7ebf4e9bdfbd3d2ce621df3"
 dependencies = [
 "proc-macro2",
 "quote",
- "syn 2.0.101",
+ "syn",
 "unicode-xid",
 ]

@@ -620,7 +599,7 @@ checksum = "97369cbbc041bc366949bc74d34658d6cda5621039731c6310521892a3a20ae0"
 dependencies = [
 "proc-macro2",
 "quote",
- "syn 2.0.101",
+ "syn",
 ]

 [[package]]
@@ -669,10 +648,10 @@ version = "0.6.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "a1e6a265c649f3f5979b601d26f1d05ada116434c87741c9493cb56218f76cbc"
 dependencies = [
- "heck 0.5.0",
+ "heck",
 "proc-macro2",
 "quote",
- "syn 2.0.101",
+ "syn",
 ]

 [[package]]
@@ -819,7 +798,7 @@ checksum = "162ee34ebcb7c64a8abebc059ce0fee27c2262618d7b60ed8faf72fef13c3650"
 dependencies = [
 "proc-macro2",
 "quote",
- "syn 2.0.101",
+ "syn",
 ]

 [[package]]
@@ -1156,10 +1135,6 @@ name = "hashbrown"
 version = "0.14.5"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "e5274423e17b7c9fc20b6e7e208532f9b19825d82dfd615708b70edd83df41f1"
-dependencies = [
- "ahash",
- "allocator-api2",
-]

 [[package]]
 name = "hashbrown"
@@ -1167,15 +1142,6 @@ version = "0.15.3"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "84b26c544d002229e640969970a2e74021aadf6e2f96372b9c58eff97de08eb3"

-[[package]]
-name = "heck"
-version = "0.4.1"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "95505c38b4572b2d910cecb0281560f54b440a19336cbbcb27bf6ce6adc6f5a8"
-dependencies = [
- "unicode-segmentation",
-]
-
 [[package]]
 name = "heck"
 version = "0.5.0"
@@ -1534,39 +1500,12 @@ version = "6.3.4"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "12661358400b02cbbf1fbd05f0a483335490e8a6bd1867620f2eeb78f304a22f"
 dependencies = [
- "miette 7.6.0",
+ "miette",
 "num",
 "thiserror 1.0.69",
 "winnow 0.6.24",
 ]

-[[package]]
-name = "knuffel"
-version = "3.2.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "04bee6ddc6071011314b1ce4f7705fef6c009401dba4fd22cb0009db6a177413"
-dependencies = [
- "base64 0.21.7",
- "chumsky",
- "knuffel-derive",
- "miette 5.10.0",
- "thiserror 1.0.69",
- "unicode-width 0.1.14",
-]
-
-[[package]]
-name = "knuffel-derive"
-version = "3.2.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "91977f56c49cfb961e3d840e2e7c6e4a56bde7283898cf606861f1421348283d"
-dependencies = [
- "heck 0.4.1",
- "proc-macro-error",
- "proc-macro2",
- "quote",
- "syn 1.0.109",
-]
-
 [[package]]
 name = "lazy_static"
 version = "1.5.0"
@@ -1678,18 +1617,6 @@ dependencies = [
 "stable_deref_trait",
 ]

-[[package]]
-name = "miette"
-version = "5.10.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "59bb584eaeeab6bd0226ccf3509a69d7936d148cf3d036ad350abe35e8c6856e"
-dependencies = [
- "miette-derive 5.10.0",
- "once_cell",
- "thiserror 1.0.69",
- "unicode-width 0.1.14",
-]
-
 [[package]]
 name = "miette"
 version = "7.6.0"
@@ -1697,21 +1624,10 @@ source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "5f98efec8807c63c752b5bd61f862c165c115b0a35685bdcfd9238c7aeb592b7"
 dependencies = [
 "cfg-if",
- "miette-derive 7.6.0",
+ "miette-derive",
 "unicode-width 0.1.14",
 ]

-[[package]]
-name = "miette-derive"
-version = "5.10.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "49e7bc1560b95a3c4a25d03de42fe76ca718ab92d1a22a55b9b4cf67b3ae635c"
-dependencies = [
- "proc-macro2",
- "quote",
- "syn 2.0.101",
-]
-
 [[package]]
 name = "miette-derive"
 version = "7.6.0"
@@ -1720,7 +1636,7 @@ checksum = "db5b29714e950dbb20d5e6f74f9dcec4edbcc1067bb7f8ed198c097b8c1a818b"
 dependencies = [
 "proc-macro2",
 "quote",
- "syn 2.0.101",
+ "syn",
 ]

 [[package]]
@@ -1773,7 +1689,7 @@ checksum = "c402a4092d5e204f32c9e155431046831fa712637043c58cb73bc6bc6c9663b5"
 dependencies = [
 "proc-macro2",
 "quote",
- "syn 2.0.101",
+ "syn",
 ]

 [[package]]
@@ -1916,7 +1832,7 @@ dependencies = [
 "proc-macro-crate",
 "proc-macro2",
 "quote",
- "syn 2.0.101",
+ "syn",
 ]

 [[package]]
@@ -1991,7 +1907,7 @@ checksum = "a948666b637a0f465e8564c73e89d4dde00d72d4d473cc972f390fc3dcee7d9c"
 dependencies = [
 "proc-macro2",
 "quote",
- "syn 2.0.101",
+ "syn",
 ]

 [[package]]
@@ -2066,7 +1982,7 @@ checksum = "6e918e4ff8c4549eb882f14b3a4bc8c8bc93de829416eacf579f1207a8fbf861"
 dependencies = [
 "proc-macro2",
 "quote",
- "syn 2.0.101",
+ "syn",
 ]

 [[package]]
@@ -2120,30 +2036,6 @@ dependencies = [
 "toml_edit",
 ]

-[[package]]
-name = "proc-macro-error"
-version = "1.0.4"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "da25490ff9892aab3fcf7c36f08cfb902dd3e71ca0f9f9517bea02a73a5ce38c"
-dependencies = [
- "proc-macro-error-attr",
- "proc-macro2",
- "quote",
- "syn 1.0.109",
- "version_check",
-]
-
-[[package]]
-name = "proc-macro-error-attr"
-version = "1.0.4"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "a1be40180e52ecc98ad80b184934baf3d0d29f979574e439af5a55274b35f869"
-dependencies = [
- "proc-macro2",
- "quote",
- "version_check",
-]
-
 [[package]]
 name = "proc-macro2"
 version = "1.0.95"
@@ -2557,35 +2449,46 @@ checksum = "1bc711410fbe7399f390ca1c3b60ad0f53f80e95c5eb935e52268a0e2cd49acc"

 [[package]]
 name = "serde"
-version = "1.0.219"
+version = "1.0.224"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "5f0e2c6ed6606019b4e29e69dbaba95b11854410e5347d525002456dbbb786b6"
+checksum = "6aaeb1e94f53b16384af593c71e20b095e958dab1d26939c1b70645c5cfbcc0b"
+dependencies = [
+ "serde_core",
+ "serde_derive",
+]
+
+[[package]]
+name = "serde_core"
+version = "1.0.224"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "32f39390fa6346e24defbcdd3d9544ba8a19985d0af74df8501fbfe9a64341ab"
 dependencies = [
 "serde_derive",
 ]

 [[package]]
 name = "serde_derive"
-version = "1.0.219"
+version = "1.0.224"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "5b0276cf7f2c73365f7157c8123c21cd9a50fbbd844757af28ca1f5925fc2a00"
+checksum = "87ff78ab5e8561c9a675bfc1785cb07ae721f0ee53329a595cefd8c04c2ac4e0"
 dependencies = [
 "proc-macro2",
 "quote",
- "syn 2.0.101",
+ "syn",
 ]

 [[package]]
 name = "serde_json"
-version = "1.0.140"
+version = "1.0.145"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "20068b6e96dc6c9bd23e01df8827e6c7e1f2fddd43c21810382803c136b99373"
+checksum = "402a6f66d8c709116cf22f558eab210f5a50187f702eb4d7e5ef38d9a7f1c79c"
 dependencies = [
 "indexmap",
 "itoa",
 "memchr",
 "ryu",
 "serde",
+ "serde_core",
 ]

 [[package]]
@@ -2605,7 +2508,7 @@ checksum = "175ee3e80ae9982737ca543e96133087cbd9a485eecc3bc4de9c1a37b47ea59c"
 dependencies = [
 "proc-macro2",
 "quote",
- "syn 2.0.101",
+ "syn",
 ]

 [[package]]
@@ -2648,7 +2551,6 @@ dependencies = [
 "hf-hub",
 "hora",
 "kdl",
- "knuffel",
 "serde_json",
 "tokenizers",
 "tokio",
@@ -2741,17 +2643,6 @@ version = "2.6.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "13c2bddecc57b384dee18652358fb23172facb8a2c51ccc10d74c157bdea3292"

-[[package]]
-name = "syn"
-version = "1.0.109"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "72b64191b275b66ffe2469e8af2c1cfe3bafa67b529ead792a6d0160888b4237"
-dependencies = [
- "proc-macro2",
- "quote",
- "unicode-ident",
-]
-
 [[package]]
 name = "syn"
 version = "2.0.101"
@@ -2780,7 +2671,7 @@ checksum = "728a70f3dbaf5bab7f0c4b1ac8d7ae5ea60a4b5549c8a5914361c99147a709d2"
 dependencies = [
 "proc-macro2",
 "quote",
- "syn 2.0.101",
+ "syn",
 ]

 [[package]]
@@ -2871,7 +2762,7 @@ checksum = "4fee6c4efc90059e10f81e6d42c60a18f76588c3d74cb83a0b242a2b6c7504c1"
 dependencies = [
 "proc-macro2",
 "quote",
- "syn 2.0.101",
+ "syn",
 ]

 [[package]]
@@ -2882,7 +2773,7 @@ checksum = "7f7cf42b4507d8ea322120659672cf1b9dbb93f8f2d4ecfd6e51350ff5b17a1d"
 dependencies = [
 "proc-macro2",
 "quote",
- "syn 2.0.101",
+ "syn",
 ]

 [[package]]
@@ -2962,7 +2853,7 @@ checksum = "6e06d43f1345a3bcd39f6a56dbb7dcab2ba47e68e8ac134855e7e2bdbaf8cab8"
 dependencies = [
 "proc-macro2",
 "quote",
- "syn 2.0.101",
+ "syn",
 ]

 [[package]]
@@ -3099,7 +2990,7 @@ checksum = "84fd902d4e0b9a4b27f2f440108dc034e1758628a9b702f8ec61ad66355422fa"
 dependencies = [
 "proc-macro2",
 "quote",
- "syn 2.0.101",
+ "syn",
 ]

 [[package]]
@@ -3127,7 +3018,7 @@ checksum = "1b1ffbcf9c6f6b99d386e7444eb608ba646ae452a36b39737deb9663b610f662"
 dependencies = [
 "proc-macro2",
 "quote",
- "syn 2.0.101",
+ "syn",
 ]

 [[package]]
@@ -3431,7 +3322,7 @@ dependencies = [
 "log",
 "proc-macro2",
 "quote",
- "syn 2.0.101",
+ "syn",
 "wasm-bindgen-shared",
 ]

@@ -3466,7 +3357,7 @@ checksum = "8ae87ea40c9f689fc23f209965b6fb8a99ad69aeeb0231408be24920604395de"
 dependencies = [
 "proc-macro2",
 "quote",
- "syn 2.0.101",
+ "syn",
 "wasm-bindgen-backend",
 "wasm-bindgen-shared",
 ]
@@ -3874,7 +3765,7 @@ checksum = "2380878cad4ac9aac1e2435f3eb4020e8374b5f13c296cb75b4620ff8e229154"
 dependencies = [
 "proc-macro2",
 "quote",
- "syn 2.0.101",
+ "syn",
 "synstructure",
 ]

@@ -3886,7 +3777,7 @@ checksum = "38da3c9736e16c5d3c8c597a9aaa5d1fa565d0532ae05e27c24aa62fb32c0ab6"
 dependencies = [
 "proc-macro2",
 "quote",
- "syn 2.0.101",
+ "syn",
 "synstructure",
 ]

@@ -3907,7 +3798,7 @@ checksum = "28a6e20d751156648aa063f3800b706ee209a32c0b4d9f24be3d980b01be55ef"
 dependencies = [
 "proc-macro2",
 "quote",
- "syn 2.0.101",
+ "syn",
 ]

 [[package]]
@@ -3927,7 +3818,7 @@ checksum = "d71e5d6e06ab090c67b5e44993ec16b72dcbaabc526db883a360057678b48502"
 dependencies = [
 "proc-macro2",
 "quote",
- "syn 2.0.101",
+ "syn",
 "synstructure",
 ]

@@ -3967,7 +3858,7 @@ checksum = "5b96237efa0c878c64bd89c436f661be4e46b2f3eff1ebb976f7ef2321d2f58f"
 dependencies = [
 "proc-macro2",
 "quote",
- "syn 2.0.101",
+ "syn",
 ]

 [[package]]
--- a/Cargo.toml
+++ b/Cargo.toml
@@ -13,7 +13,7 @@ derive_more = { version = "2.0.1", features = ["display", "error"] }
 hf-hub = "0.4.2"
 hora = "0.1.1"
 kdl = "6.3.4"
-serde_json = "1.0.140"
+serde_json = "1.0.145"
 tokenizers = "0.21.4"
 tracing = "0.1.41"
 tracing-subscriber = "0.3.19"
@@ -25,4 +25,3 @@ tokio = { version = "1.45.1", features = ["io-std", "macros", "rt", "rt-multi-th
 tower-lsp = "0.20.0"
 tree-sitter-javascript = "0.23.1"
 tree-sitter-cpp = "0.23.4"
-knuffel = "3.2.0"
--- a/src/mutation.rs
+++ b/src/mutation.rs
@@ -2,34 +2,90 @@ use std::collections::HashMap;
 use std::path::Path;
 use tracing::debug;
 use tree_sitter::{Language, Node, Query, QueryCursor, StreamingIterator};
-use anyhow::Result;

-#[derive(knuffel::Decode, Debug)]
+use anyhow::{Result, bail};
+use kdl::KdlDocument;
+
+#[derive(Debug)]
+pub struct Mutation {
+    pub expression: String,
+    pub substitute: Vec<Substitute>,
+}
+
 pub struct MutationCollection {
-    #[knuffel(child, unwrap(argument))]
    pub description: String,
-    #[knuffel(children)]
-    mutations: Vec<Mutation>,
+    pub mutations: Vec<Mutation>,
 }

-#[derive(knuffel::Decode, Debug)]
-struct Mutation {
-    #[knuffel(child, unwrap(argument))]
-    expression: String,
-    #[knuffel(child, unwrap(children))]
-    substitute: Vec<Substitute>,
-}
-
-#[derive(knuffel::Decode, Debug)]
-enum Substitute {
-    Literal(#[knuffel(argument)] String),
-    Capture(#[knuffel(argument)] String),
+#[derive(Debug)]
+pub enum Substitute {
+    Literal(String),
+    Capture(String),
 }

 pub fn from_path<P: AsRef<Path>>(path: P) -> Result<MutationCollection> {
-    let contents = std::fs::read_to_string(&path)?;
-    let val = knuffel::parse(path.as_ref().to_str().unwrap(), &contents)?;
-    Ok(val)
+    let contents = std::fs::read_to_string(path)?;
+    let doc: KdlDocument = contents.parse()?;
+    let mut mutations = vec![];
+
+    let mut description = None;
+
+    for node in doc.nodes() {
+        let node_name = node.name().value();
+
+        if node_name != "mutation" && node_name != "description" {
+            bail!(
+                "document root must only contain `mutation` or `description` nodes: got {node_name}"
+            );
+        }
+
+        if node_name == "description" {
+            description.replace(
+                node.entry(0)
+                    .unwrap()
+                    .value()
+                    .as_string()
+                    .unwrap()
+                    .to_string(),
+            );
+            continue;
+        }
+
+        let node = node.children().unwrap();
+        let Some(expression) = node.get_arg("expression").and_then(|v| v.as_string()) else {
+            bail!("mutation node must contain an expression");
+        };
+        let Some(substitute) = node.get("substitute") else {
+            bail!("mutation node must contain an substitute");
+        };
+
+        let children = substitute.children().unwrap().nodes();
+        let mut substitute = vec![];
+        for child in children {
+            let attrib = child.entry(0).unwrap().value().as_string().unwrap();
+            let substitutor = match child.name().value() {
+                "literal" => Substitute::Literal(attrib.to_string()),
+                "capture" => Substitute::Capture(attrib.to_string()),
+                _ => unreachable!(),
+            };
+
+            substitute.push(substitutor);
+        }
+
+        mutations.push(Mutation {
+            expression: expression.to_string(),
+            substitute,
+        })
+    }
+
+    let Some(description) = description else {
+        bail!("mutation collection contains no `description`");
+    };
+
+    Ok(MutationCollection {
+        description,
+        mutations,
+    })
 }

 pub fn apply(