Updated everything and moved to hard tab indentation

2025-01-08 19:20:34 +01:00
parent 7cdfe7e3c4
commit 52c8d1c95a
100 changed files with 5949 additions and 5998 deletions
--- a/.editorconfig
+++ b/.editorconfig
@@ -8,7 +8,7 @@ root = true
 end_of_line = lf
 insert_final_newline = true
 charset = utf-8
-indent_style = space
+indent_style = tab
 indent_size = 2

 [Makefile]
--- a/Cargo.lock
+++ b/Cargo.lock
@@ -28,15 +28,15 @@ dependencies = [

 [[package]]
 name = "allocator-api2"
-version = "0.2.16"
+version = "0.2.21"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "0942ffc6dcaadf03badf6e6a2d0228460359d5e34b57ccdc720b7382dfbd5ec5"
+checksum = "683d7910e743518b0e34f1186f92494becacb047c7b6bf616c96772180fef923"

 [[package]]
 name = "anstream"
-version = "0.6.15"
+version = "0.6.18"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "64e15c1ab1f89faffbf04a634d5e1962e9074f2741eef6d97f3c4e322426d526"
+checksum = "8acc5369981196006228e28809f761875c0327210a891e941f4c683b3a99529b"
 dependencies = [
 "anstyle",
 "anstyle-parse",
@@ -49,33 +49,33 @@ dependencies = [

 [[package]]
 name = "anstyle"
-version = "1.0.8"
+version = "1.0.10"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "1bec1de6f59aedf83baf9ff929c98f2ad654b97c9510f4e70cf6f661d49fd5b1"
+checksum = "55cc3b69f167a1ef2e161439aa98aed94e6028e5f9a59be9a6ffb47aef1651f9"

 [[package]]
 name = "anstyle-parse"
-version = "0.2.5"
+version = "0.2.6"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "eb47de1e80c2b463c735db5b217a0ddc39d612e7ac9e2e96a5aed1f57616c1cb"
+checksum = "3b2d16507662817a6a20a9ea92df6652ee4f94f914589377d69f3b21bc5798a9"
 dependencies = [
 "utf8parse",
 ]

 [[package]]
 name = "anstyle-query"
-version = "1.1.1"
+version = "1.1.2"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "6d36fc52c7f6c869915e99412912f22093507da8d9e942ceaf66fe4b7c14422a"
+checksum = "79947af37f4177cfead1110013d678905c37501914fba0efea834c3fe9a8d60c"
 dependencies = [
 "windows-sys",
 ]

 [[package]]
 name = "anstyle-wincon"
-version = "3.0.4"
+version = "3.0.6"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "5bf74e1b6e971609db8ca7a9ce79fd5768ab6ae46441c572e46cf596f59e57f8"
+checksum = "2109dbce0e72be3ec00bed26e6a7479ca384ad226efdd66db8fa2e3a38c83125"
 dependencies = [
 "anstyle",
 "windows-sys",
@@ -83,15 +83,15 @@ dependencies = [

 [[package]]
 name = "arrayvec"
-version = "0.7.4"
+version = "0.7.6"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "96d30a06541fbafbc7f82ed10c06164cfbd2c401138f6addd8404629c4b16711"
+checksum = "7c02d123df017efcdfbd739ef81735b36c5ba83ec3c59c80a9d7ecc718f92e50"

 [[package]]
 name = "autocfg"
-version = "1.1.0"
+version = "1.4.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "d468802bab17cbc0cc575e9b053f41e72aa36bfa6b7f55e3529ffa43161b97fa"
+checksum = "ace50bade8e6234aa140d9a2f552bbee1db4d353f69b8217bc503490fc1a9f26"

 [[package]]
 name = "bitvec"
@@ -116,9 +116,9 @@ dependencies = [

 [[package]]
 name = "borsh"
-version = "1.5.1"
+version = "1.5.3"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "a6362ed55def622cddc70a4746a68554d7b687713770de539e59a739b249f8ed"
+checksum = "2506947f73ad44e344215ccd6403ac2ae18cd8e046e581a441bf8d199f257f03"
 dependencies = [
 "borsh-derive",
 "cfg_aliases",
@@ -126,16 +126,15 @@ dependencies = [

 [[package]]
 name = "borsh-derive"
-version = "1.5.1"
+version = "1.5.3"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "c3ef8005764f53cd4dca619f5bf64cafd4664dada50ece25e4d81de54c80cc0b"
+checksum = "c2593a3b8b938bd68373196c9832f516be11fa487ef4ae745eb282e6a56a7244"
 dependencies = [
 "once_cell",
 "proc-macro-crate",
- "proc-macro2 1.0.78",
- "quote 1.0.35",
- "syn 2.0.52",
- "syn_derive",
+ "proc-macro2 1.0.92",
+ "quote 1.0.38",
+ "syn 2.0.95",
 ]

 [[package]]
@@ -155,22 +154,28 @@ version = "0.6.12"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "3db406d29fbcd95542e92559bed4d8ad92636d1ca8b3b72ede10b4bcc010e659"
 dependencies = [
- "proc-macro2 1.0.78",
- "quote 1.0.35",
+ "proc-macro2 1.0.92",
+ "quote 1.0.38",
 "syn 1.0.109",
 ]

 [[package]]
-name = "bytes"
-version = "1.6.1"
+name = "byteorder"
+version = "1.5.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "a12916984aab3fa6e39d655a33e09c0071eb36d6ab3aea5c2d78551f1df6d952"
+checksum = "1fd0f2584146f6f2ef48085050886acf353beff7305ebd1ae69500e27c67f64b"
+
+[[package]]
+name = "bytes"
+version = "1.9.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "325918d6fe32f23b19878fe4b34794ae41fc19ddbe53b10571a4874d44ffd39b"

 [[package]]
 name = "camino"
-version = "1.1.7"
+version = "1.1.9"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "e0ec6b951b160caa93cc0c7b209e5a3bff7aae9062213451ac99493cd844c239"
+checksum = "8b96ec4966b5813e2c0507c1f86115c8c5abaadc3980879c3424042a02fd1ad3"

 [[package]]
 name = "cfg-if"
@@ -186,9 +191,9 @@ checksum = "613afe47fcd5fac7ccf1db93babcb082c5994d996f20b8b159f2ad1658eb5724"

 [[package]]
 name = "clap"
-version = "4.5.4"
+version = "4.5.24"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "90bc066a67923782aa8515dbaea16946c5bcc5addbd668bb80af688e53e548a0"
+checksum = "9560b07a799281c7e0958b9296854d6fafd4c5f31444a7e5bb1ad6dde5ccf1bd"
 dependencies = [
 "clap_builder",
 "clap_derive",
@@ -196,51 +201,51 @@ dependencies = [

 [[package]]
 name = "clap_builder"
-version = "4.5.2"
+version = "4.5.24"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "ae129e2e766ae0ec03484e609954119f123cc1fe650337e155d03b022f24f7b4"
+checksum = "874e0dd3eb68bf99058751ac9712f622e61e6f393a94f7128fa26e3f02f5c7cd"
 dependencies = [
 "anstream",
 "anstyle",
 "clap_lex",
- "strsim 0.11.1",
+ "strsim",
 ]

 [[package]]
 name = "clap_derive"
-version = "4.5.4"
+version = "4.5.24"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "528131438037fd55894f62d6e9f068b8f45ac57ffa77517819645d10aed04f64"
+checksum = "54b755194d6389280185988721fffba69495eed5ee9feeee9a599b53db80318c"
 dependencies = [
 "heck",
- "proc-macro2 1.0.78",
- "quote 1.0.35",
- "syn 2.0.52",
+ "proc-macro2 1.0.92",
+ "quote 1.0.38",
+ "syn 2.0.95",
 ]

 [[package]]
 name = "clap_lex"
-version = "0.7.2"
+version = "0.7.4"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "1462739cb27611015575c0c11df5df7601141071f07518d56fcc1be504cbec97"
+checksum = "f46ad14479a25103f283c0f10005961cf086d8dc42205bb44c46ac563475dca6"

 [[package]]
 name = "colorchoice"
-version = "1.0.2"
+version = "1.0.3"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "d3fd119d74b830634cea2a0f58bbd0d54540518a14397557951e79340abc28c0"
+checksum = "5b63caa9aa9397e2d9480a9b13673856c78d8ac123288526c37d7839f2a86990"

 [[package]]
 name = "const_panic"
-version = "0.2.8"
+version = "0.2.11"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "6051f239ecec86fde3410901ab7860d458d160371533842974fc61f96d15879b"
+checksum = "53857514f72ee4a2b583de67401e3ff63a5472ca4acf289d09a9ea7636dfec17"

 [[package]]
 name = "cpufeatures"
-version = "0.2.12"
+version = "0.2.16"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "53fe5e26ff1b7aef8bca9c6080520cfb8d9333c7568e1829cef191a9723e5504"
+checksum = "16b80225097f2e5ae4e7179dd2266824648f3e2f49d9134d584b76389d31c4c3"
 dependencies = [
 "libc",
 ]
@@ -257,9 +262,9 @@ dependencies = [

 [[package]]
 name = "darling"
-version = "0.20.8"
+version = "0.20.10"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "54e36fcd13ed84ffdfda6f5be89b31287cbb80c439841fe69e04841435464391"
+checksum = "6f63b86c8a8826a49b8c21f08a2d07338eec8d900540f8630dc76284be802989"
 dependencies = [
 "darling_core",
 "darling_macro",
@@ -267,27 +272,27 @@ dependencies = [

 [[package]]
 name = "darling_core"
-version = "0.20.8"
+version = "0.20.10"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "9c2cf1c23a687a1feeb728783b993c4e1ad83d99f351801977dd809b48d0a70f"
+checksum = "95133861a8032aaea082871032f5815eb9e98cef03fa916ab4500513994df9e5"
 dependencies = [
 "fnv",
 "ident_case",
- "proc-macro2 1.0.78",
- "quote 1.0.35",
- "strsim 0.10.0",
- "syn 2.0.52",
+ "proc-macro2 1.0.92",
+ "quote 1.0.38",
+ "strsim",
+ "syn 2.0.95",
 ]

 [[package]]
 name = "darling_macro"
-version = "0.20.8"
+version = "0.20.10"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "a668eda54683121533a393014d8692171709ff57a7d61f187b6e782719f8933f"
+checksum = "d336a2a514f6ccccaa3e09b02d41d35330c07ddf03a62165fcec10bb561c7806"
 dependencies = [
 "darling_core",
- "quote 1.0.35",
- "syn 2.0.52",
+ "quote 1.0.38",
+ "syn 2.0.95",
 ]

 [[package]]
@@ -319,9 +324,9 @@ checksum = "0d6ef0072f8a535281e4876be788938b528e9a1d43900b82c2569af7da799125"

 [[package]]
 name = "either"
-version = "1.10.0"
+version = "1.13.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "11157ac094ffbdde99aa67b23417ebdd801842852b500e395a45a9c0aac03e4a"
+checksum = "60b1af1c220855b6ceac025d3f6ecdd2b7c4894bfe9cd9bda4fbb4bc7c0d4cf0"

 [[package]]
 name = "equivalent"
@@ -359,9 +364,9 @@ dependencies = [

 [[package]]
 name = "getrandom"
-version = "0.2.14"
+version = "0.2.15"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "94b22e06ecb0110981051723910cbf0b5f5e09a2062dd7663334ee79a9d1286c"
+checksum = "c4567c8db10ae91089c99af84c68c38da3ec2f087c3f82960bcdbf3656b6f4d7"
 dependencies = [
 "cfg-if",
 "libc",
@@ -377,12 +382,6 @@ dependencies = [
 "ahash 0.7.8",
 ]

-[[package]]
-name = "hashbrown"
-version = "0.14.5"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "e5274423e17b7c9fc20b6e7e208532f9b19825d82dfd615708b70edd83df41f1"
-
 [[package]]
 name = "hashbrown"
 version = "0.15.2"
@@ -408,12 +407,12 @@ checksum = "b9e0384b61958566e926dc50660321d12159025e767c18e043daf26b70104c39"

 [[package]]
 name = "indexmap"
-version = "2.2.6"
+version = "2.7.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "168fb715dda47215e360912c096649d23d58bf392ac62f73919e831745e40f26"
+checksum = "62f822373a4fe84d4bb149bf54e584a7f4abec90e072ed49cda0edea5b95471f"
 dependencies = [
 "equivalent",
- "hashbrown 0.14.5",
+ "hashbrown 0.15.2",
 ]

 [[package]]
@@ -422,15 +421,6 @@ version = "1.70.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "7943c866cc5cd64cbc25b2e01621d07fa8eb2a1a23160ee81ce38704e97b8ecf"

-[[package]]
-name = "itertools"
-version = "0.13.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "413ee7dfc52ee1a4949ceeb7dbc8a33f2d6c088194d9f922fb8318faf1f01186"
-dependencies = [
- "either",
-]
-
 [[package]]
 name = "itertools"
 version = "0.14.0"
@@ -442,15 +432,15 @@ dependencies = [

 [[package]]
 name = "itoa"
-version = "1.0.11"
+version = "1.0.14"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "49f1f14873335454500d59611f1cf4a4b0f786f9ac11f4312a78e4cf2566695b"
+checksum = "d75a2a4b1b190afb6f5425f10f6a8f959d2ea0b9c2b1d79553551850539e4674"

 [[package]]
 name = "konst"
-version = "0.3.9"
+version = "0.3.16"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "50a0ba6de5f7af397afff922f22c149ff605c766cd3269cf6c1cd5e466dbe3b9"
+checksum = "4381b9b00c55f251f2ebe9473aef7c117e96828def1a7cb3bd3f0f903c6894e9"
 dependencies = [
 "const_panic",
 "konst_kernel",
@@ -460,18 +450,18 @@ dependencies = [

 [[package]]
 name = "konst_kernel"
-version = "0.3.9"
+version = "0.3.15"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "be0a455a1719220fd6adf756088e1c69a85bf14b6a9e24537a5cc04f503edb2b"
+checksum = "e4b1eb7788f3824c629b1116a7a9060d6e898c358ebff59070093d51103dcc3c"
 dependencies = [
 "typewit",
 ]

 [[package]]
 name = "konst_proc_macros"
-version = "0.3.0"
+version = "0.3.10"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "4e28ab1dc35e09d60c2b8c90d12a9a8d9666c876c10a3739a3196db0103b6043"
+checksum = "00af7901ba50898c9e545c24d5c580c96a982298134e8037d8978b6594782c07"

 [[package]]
 name = "lazy_static"
@@ -481,9 +471,9 @@ checksum = "bbd2bcb4c963f2ddae06a2efc7e9f3591312473c50c6685e1f298068316e66fe"

 [[package]]
 name = "libc"
-version = "0.2.153"
+version = "0.2.169"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "9c198f91728a82281a64e1f4f9eeb25d82cb32a5de251c6bd1b5154d63a8e7bd"
+checksum = "b5aba8db14291edd000dfcc4d620c7ebfb122c613afb886ca8803fa4e128a20a"

 [[package]]
 name = "memchr"
@@ -508,9 +498,9 @@ dependencies = [

 [[package]]
 name = "once_cell"
-version = "1.19.0"
+version = "1.20.2"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "3fdb12b2476b595f9358c5161aa467c2438859caa136dec86c26fdd2efe17b92"
+checksum = "1261fe7e33c73b354eab43b1273a57c8f967d0391e80353e51f764ac02cf6775"

 [[package]]
 name = "orchid-api"
@@ -526,18 +516,18 @@ name = "orchid-api-derive"
 version = "0.1.0"
 dependencies = [
 "darling",
- "itertools 0.13.0",
+ "itertools",
 "orchid-api-traits",
- "proc-macro2 1.0.78",
- "quote 1.0.35",
- "syn 2.0.52",
+ "proc-macro2 1.0.92",
+ "quote 1.0.38",
+ "syn 2.0.95",
 ]

 [[package]]
 name = "orchid-api-traits"
 version = "0.1.0"
 dependencies = [
- "itertools 0.13.0",
+ "itertools",
 "never",
 "ordered-float",
 ]
@@ -549,7 +539,7 @@ dependencies = [
 "derive_destructure",
 "dyn-clone",
 "hashbrown 0.15.2",
- "itertools 0.14.0",
+ "itertools",
 "lazy_static",
 "never",
 "num-traits",
@@ -571,7 +561,7 @@ dependencies = [
 "derive_destructure",
 "dyn-clone",
 "hashbrown 0.15.2",
- "itertools 0.14.0",
+ "itertools",
 "konst",
 "lazy_static",
 "never",
@@ -592,7 +582,7 @@ version = "0.1.0"
 dependencies = [
 "derive_destructure",
 "hashbrown 0.15.2",
- "itertools 0.14.0",
+ "itertools",
 "lazy_static",
 "never",
 "num-traits",
@@ -609,7 +599,7 @@ dependencies = [
 name = "orchid-std"
 version = "0.1.0"
 dependencies = [
- "itertools 0.13.0",
+ "itertools",
 "never",
 "once_cell",
 "orchid-api",
@@ -626,16 +616,16 @@ version = "0.1.0"
 dependencies = [
 "camino",
 "clap",
- "itertools 0.13.0",
+ "itertools",
 "orchid-base",
 "orchid-host",
 ]

 [[package]]
 name = "ordered-float"
-version = "4.2.1"
+version = "4.6.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "19ff2cf528c6c03d9ed653d6c4ce1dc0582dc4af309790ad92f07c1cd551b0be"
+checksum = "7bb71e1b3fa6ca1c61f383464aaf2bb0e2f8e772a1f01d486832464de363b951"
 dependencies = [
 "num-traits",
 ]
@@ -648,42 +638,22 @@ checksum = "57c0d7b74b563b49d38dae00a0c37d4d6de9b432382b2892f0574ddcae73fd0a"

 [[package]]
 name = "ppv-lite86"
-version = "0.2.17"
+version = "0.2.20"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "5b40af805b3121feab8a3c29f04d8ad262fa8e0561883e7653e024ae4479e6de"
+checksum = "77957b295656769bb8ad2b6a6b09d897d94f05c41b069aede1fcdaa675eaea04"
+dependencies = [
+ "zerocopy",
+]

 [[package]]
 name = "proc-macro-crate"
-version = "3.1.0"
+version = "3.2.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "6d37c51ca738a55da99dc0c4a34860fd675453b8b36209178c2249bb13651284"
+checksum = "8ecf48c7ca261d60b74ab1a7b20da18bede46776b2e55535cb958eb595c5fa7b"
 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 1.0.78",
- "quote 1.0.35",
- "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 1.0.78",
- "quote 1.0.35",
- "version_check",
-]
-
 [[package]]
 name = "proc-macro2"
 version = "0.4.30"
@@ -695,9 +665,9 @@ dependencies = [

 [[package]]
 name = "proc-macro2"
-version = "1.0.78"
+version = "1.0.92"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "e2422ad645d89c99f8f3e6b88a9fdeca7fabeac836b1002371c4367c8f984aae"
+checksum = "37d3544b3f2748c54e147655edb5025752e2303145b5aefb3c3ea2c78b973bb0"
 dependencies = [
 "unicode-ident",
 ]
@@ -717,8 +687,8 @@ version = "0.1.4"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "16b845dbfca988fa33db069c0e230574d15a3088f147a87b64c7589eb662c9ac"
 dependencies = [
- "proc-macro2 1.0.78",
- "quote 1.0.35",
+ "proc-macro2 1.0.92",
+ "quote 1.0.38",
 "syn 1.0.109",
 ]

@@ -733,11 +703,11 @@ dependencies = [

 [[package]]
 name = "quote"
-version = "1.0.35"
+version = "1.0.38"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "291ec9ab5efd934aaf503a6466c5d5251535d108ee747472c3977cc5acc868ef"
+checksum = "0e4dccaaaf89514f546c693ddc140f729f958c247918a13380cccc6078391acc"
 dependencies = [
- "proc-macro2 1.0.78",
+ "proc-macro2 1.0.92",
 ]

 [[package]]
@@ -787,9 +757,9 @@ dependencies = [

 [[package]]
 name = "rkyv"
-version = "0.7.44"
+version = "0.7.45"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "5cba464629b3394fc4dbc6f940ff8f5b4ff5c7aef40f29166fd4ad12acbc99c0"
+checksum = "9008cd6385b9e161d8229e1f6549dd23c3d022f132a2ea37ac3a10ac4935779b"
 dependencies = [
 "bitvec",
 "bytecheck",
@@ -805,20 +775,20 @@ dependencies = [

 [[package]]
 name = "rkyv_derive"
-version = "0.7.44"
+version = "0.7.45"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "a7dddfff8de25e6f62b9d64e6e432bf1c6736c57d20323e15ee10435fbda7c65"
+checksum = "503d1d27590a2b0a3a4ca4c94755aa2875657196ecbf401a42eff41d7de532c0"
 dependencies = [
- "proc-macro2 1.0.78",
- "quote 1.0.35",
+ "proc-macro2 1.0.92",
+ "quote 1.0.38",
 "syn 1.0.109",
 ]

 [[package]]
 name = "rust-embed"
-version = "8.3.0"
+version = "8.5.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "fb78f46d0066053d16d4ca7b898e9343bc3530f71c61d5ad84cd404ada068745"
+checksum = "fa66af4a4fdd5e7ebc276f115e895611a34739a9c1c01028383d612d550953c0"
 dependencies = [
 "rust-embed-impl",
 "rust-embed-utils",
@@ -827,22 +797,22 @@ dependencies = [

 [[package]]
 name = "rust-embed-impl"
-version = "8.3.0"
+version = "8.5.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "b91ac2a3c6c0520a3fb3dd89321177c3c692937c4eb21893378219da10c44fc8"
+checksum = "6125dbc8867951125eec87294137f4e9c2c96566e61bf72c45095a7c77761478"
 dependencies = [
- "proc-macro2 1.0.78",
- "quote 1.0.35",
+ "proc-macro2 1.0.92",
+ "quote 1.0.38",
 "rust-embed-utils",
- "syn 2.0.52",
+ "syn 2.0.95",
 "walkdir",
 ]

 [[package]]
 name = "rust-embed-utils"
-version = "8.3.0"
+version = "8.5.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "86f69089032567ffff4eada41c573fc43ff466c7db7c5688b2e7969584345581"
+checksum = "2e5347777e9aacb56039b0e1f28785929a8a3b709e87482e7442c72e7c12529d"
 dependencies = [
 "sha2",
 "walkdir",
@@ -850,9 +820,9 @@ dependencies = [

 [[package]]
 name = "rust_decimal"
-version = "1.35.0"
+version = "1.36.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "1790d1c4c0ca81211399e0e0af16333276f375209e71a37b67698a373db5b47a"
+checksum = "b082d80e3e3cc52b2ed634388d436fe1f4de6af5786cc2de9ba9737527bdf555"
 dependencies = [
 "arrayvec",
 "borsh",
@@ -887,31 +857,32 @@ checksum = "1c107b6f4780854c8b126e228ea8869f4d7b71260f962fefb57b996b8959ba6b"

 [[package]]
 name = "serde"
-version = "1.0.204"
+version = "1.0.217"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "bc76f558e0cbb2a839d37354c575f1dc3fdc6546b5be373ba43d95f231bf7c12"
+checksum = "02fc4265df13d6fa1d00ecff087228cc0a2b5f3c0e87e258d8b94a156e984c70"
 dependencies = [
 "serde_derive",
 ]

 [[package]]
 name = "serde_derive"
-version = "1.0.204"
+version = "1.0.217"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "e0cd7e117be63d3c3678776753929474f3b04a43a080c744d6b0ae2a8c28e222"
+checksum = "5a9bf7cf98d04a2b28aead066b7496853d4779c9cc183c440dbac457641e19a0"
 dependencies = [
- "proc-macro2 1.0.78",
- "quote 1.0.35",
- "syn 2.0.52",
+ "proc-macro2 1.0.92",
+ "quote 1.0.38",
+ "syn 2.0.95",
 ]

 [[package]]
 name = "serde_json"
-version = "1.0.120"
+version = "1.0.135"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "4e0d21c9a8cae1235ad58a00c11cb40d4b1e5c784f1ef2c537876ed6ffd8b7c5"
+checksum = "2b0d7ba2887406110130a978386c4e1befb98c674b4fba677954e4db976630d9"
 dependencies = [
 "itoa",
+ "memchr",
 "ryu",
 "serde",
 ]
@@ -929,20 +900,14 @@ dependencies = [

 [[package]]
 name = "simdutf8"
-version = "0.1.4"
+version = "0.1.5"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "f27f6278552951f1f2b8cf9da965d10969b2efdea95a6ec47987ab46edfe263a"
+checksum = "e3a9fe34e3e7a50316060351f37187a3f546bce95496156754b601a5fa71b76e"

 [[package]]
 name = "stdio-perftest"
 version = "0.1.0"

-[[package]]
-name = "strsim"
-version = "0.10.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "73473c0e59e6d5812c5dfe2a064a6444949f089e20eec9a2e5506596494e4623"
-
 [[package]]
 name = "strsim"
 version = "0.11.1"
@@ -972,34 +937,22 @@ version = "1.0.109"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "72b64191b275b66ffe2469e8af2c1cfe3bafa67b529ead792a6d0160888b4237"
 dependencies = [
- "proc-macro2 1.0.78",
- "quote 1.0.35",
+ "proc-macro2 1.0.92",
+ "quote 1.0.38",
 "unicode-ident",
 ]

 [[package]]
 name = "syn"
-version = "2.0.52"
+version = "2.0.95"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "b699d15b36d1f02c3e7c69f8ffef53de37aefae075d8488d4ba1a7788d574a07"
+checksum = "46f71c0377baf4ef1cc3e3402ded576dccc315800fbc62dfc7fe04b009773b4a"
 dependencies = [
- "proc-macro2 1.0.78",
- "quote 1.0.35",
+ "proc-macro2 1.0.92",
+ "quote 1.0.38",
 "unicode-ident",
 ]

-[[package]]
-name = "syn_derive"
-version = "0.1.8"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "1329189c02ff984e9736652b1631330da25eaa6bc639089ed4915d25446cbe7b"
-dependencies = [
- "proc-macro-error",
- "proc-macro2 1.0.78",
- "quote 1.0.35",
- "syn 2.0.52",
-]
-
 [[package]]
 name = "tap"
 version = "1.0.1"
@@ -1008,9 +961,9 @@ checksum = "55937e1799185b12863d447f42597ed69d9928686b8d88a1df17376a097d8369"

 [[package]]
 name = "tinyvec"
-version = "1.8.0"
+version = "1.8.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "445e881f4f6d382d5f27c034e25eb92edd7c784ceab92a0937db7f2e9471b938"
+checksum = "022db8904dfa342efe721985167e9fcd16c29b226db4397ed752a761cfce81e8"
 dependencies = [
 "tinyvec_macros",
 ]
@@ -1023,15 +976,15 @@ checksum = "1f3ccbac311fea05f86f61904b462b55fb3df8837a366dfc601a0161d0532f20"

 [[package]]
 name = "toml_datetime"
-version = "0.6.6"
+version = "0.6.8"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "4badfd56924ae69bcc9039335b2e017639ce3f9b001c393c1b2d1ef846ce2cbf"
+checksum = "0dd7358ecb8fc2f8d014bf86f6f638ce72ba252a2c3a2572f2a795f1d23efb41"

 [[package]]
 name = "toml_edit"
-version = "0.21.1"
+version = "0.22.22"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "6a8534fd7f78b5405e860340ad6575217ce99f38d4d5c8f2442cb5ecb50090e1"
+checksum = "4ae48d6208a266e853d946088ed816055e556cc6028c5e8e2b84d9fa5dd7c7f5"
 dependencies = [
 "indexmap",
 "toml_datetime",
@@ -1044,8 +997,8 @@ version = "0.3.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "b79e2e9c9ab44c6d7c20d5976961b47e8f49ac199154daa514b77cd1ab536625"
 dependencies = [
- "proc-macro2 1.0.78",
- "quote 1.0.35",
+ "proc-macro2 1.0.92",
+ "quote 1.0.38",
 "syn 1.0.109",
 ]

@@ -1057,9 +1010,9 @@ checksum = "42ff0bf0c66b8238c6f3b578df37d0b7848e55df8577b3f74f92a69acceeb825"

 [[package]]
 name = "typewit"
-version = "1.9.0"
+version = "1.11.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "c6fb9ae6a3cafaf0a5d14c2302ca525f9ae8e07a0f0e6949de88d882c37a6e24"
+checksum = "cb77c29baba9e4d3a6182d51fa75e3215c7fd1dab8f4ea9d107c716878e55fc0"
 dependencies = [
 "typewit_proc_macros",
 ]
@@ -1072,9 +1025,9 @@ checksum = "e36a83ea2b3c704935a01b4642946aadd445cea40b10935e3f8bd8052b8193d6"

 [[package]]
 name = "unicode-ident"
-version = "1.0.12"
+version = "1.0.14"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "3354b9ac3fae1ff6755cb6db53683adb661634f67557942dea4facebec0fee4b"
+checksum = "adb9e6ca4f869e1180728b7950e35922a7fc6397f7b641499e8f3ef06e50dc83"

 [[package]]
 name = "unicode-xid"
@@ -1090,21 +1043,21 @@ checksum = "06abde3611657adf66d383f00b093d7faecc7fa57071cce2578660c9f1010821"

 [[package]]
 name = "uuid"
-version = "1.10.0"
+version = "1.11.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "81dfa00651efa65069b0b6b651f4aaa31ba9e3c3ce0137aaad053604ee7e0314"
+checksum = "f8c5f0a0af699448548ad1a2fbf920fb4bee257eae39953ba95cb84891a0446a"

 [[package]]
 name = "version_check"
-version = "0.9.4"
+version = "0.9.5"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "49874b5167b65d7193b8aba1567f5c7d93d001cafc34600cee003eda787e483f"
+checksum = "0b928f33d975fc6ad9f86c8f283853ad26bdd5b10b7f1542aa2fa15e2289105a"

 [[package]]
 name = "walkdir"
-version = "2.4.0"
+version = "2.5.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "d71d857dc86794ca4c280d616f7da00d2dbfd8cd788846559a6813e6aa4b54ee"
+checksum = "29790946404f91d9c5d06f9874efddea1dc06c5efe94541a7d6863108e3a5e4b"
 dependencies = [
 "same-file",
 "winapi-util",
@@ -1116,42 +1069,20 @@ version = "0.11.0+wasi-snapshot-preview1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "9c8d87e72b64a3b4db28d11ce29237c246188f4f51057d65a7eab63b7987e423"

-[[package]]
-name = "winapi"
-version = "0.3.9"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "5c839a674fcd7a98952e593242ea400abe93992746761e38641405d28b00f419"
-dependencies = [
- "winapi-i686-pc-windows-gnu",
- "winapi-x86_64-pc-windows-gnu",
-]
-
-[[package]]
-name = "winapi-i686-pc-windows-gnu"
-version = "0.4.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "ac3b87c63620426dd9b991e5ce0329eff545bccbbb34f3be09ff6fb6ab51b7b6"
-
 [[package]]
 name = "winapi-util"
-version = "0.1.6"
+version = "0.1.9"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "f29e6f9198ba0d26b4c9f07dbe6f9ed633e1f3d5b8b414090084349e46a52596"
+checksum = "cf221c93e13a30d793f7645a0e7762c55d169dbb0a49671918a2319d289b10bb"
 dependencies = [
- "winapi",
+ "windows-sys",
 ]

-[[package]]
-name = "winapi-x86_64-pc-windows-gnu"
-version = "0.4.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "712e227841d057c1ee1cd2fb22fa7e5a5461ae8e48fa2ca79ec42cfc1931183f"
-
 [[package]]
 name = "windows-sys"
-version = "0.52.0"
+version = "0.59.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "282be5f36a8ce781fad8c8ae18fa3f9beff57ec1b52cb3de0789201425d9a33d"
+checksum = "1e38bc4d79ed67fd075bcc251a1c39b32a1776bbe92e5bef1f0bf1f8c531853b"
 dependencies = [
 "windows-targets",
 ]
@@ -1222,9 +1153,9 @@ checksum = "589f6da84c646204747d1270a2a5661ea66ed1cced2631d546fdfb155959f9ec"

 [[package]]
 name = "winnow"
-version = "0.5.40"
+version = "0.6.22"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "f593a95398737aeed53e489c785df13f3618e41dbcd6718c6addbf1395aa6876"
+checksum = "39281189af81c07ec09db316b302a3e67bf9bd7cbf6c820b50e35fee9c2fa980"
 dependencies = [
 "memchr",
 ]
@@ -1247,20 +1178,21 @@ dependencies = [

 [[package]]
 name = "zerocopy"
-version = "0.7.32"
+version = "0.7.35"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "74d4d3961e53fa4c9a25a8637fc2bfaf2595b3d3ae34875568a5cf64787716be"
+checksum = "1b9b4fd18abc82b8136838da5d50bae7bdea537c574d8dc1a34ed098d6c166f0"
 dependencies = [
+ "byteorder",
 "zerocopy-derive",
 ]

 [[package]]
 name = "zerocopy-derive"
-version = "0.7.32"
+version = "0.7.35"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "9ce1b18ccd8e73a9321186f97e46f9f04b778851177567b1975109d26a08d2a6"
+checksum = "fa4f8080344d4671fb4e831a13ad1e68092748387dfc4f55e356242fae12ce3e"
 dependencies = [
- "proc-macro2 1.0.78",
- "quote 1.0.35",
- "syn 2.0.52",
+ "proc-macro2 1.0.92",
+ "quote 1.0.38",
+ "syn 2.0.95",
 ]
--- a/orchid-api-derive/Cargo.toml
+++ b/orchid-api-derive/Cargo.toml
@@ -9,9 +9,9 @@ proc-macro = true
 # See more keys and their definitions at https://doc.rust-lang.org/cargo/reference/manifest.html

 [dependencies]
-quote = "1.0.35"
-syn = { version = "2.0.52" }
+quote = "1.0.38"
+syn = { version = "2.0.95" }
 orchid-api-traits = { version = "0.1.0", path = "../orchid-api-traits" }
-proc-macro2 = "1.0.78"
-darling = "0.20.8"
-itertools = "0.13.0"
+proc-macro2 = "1.0.92"
+darling = "0.20.10"
+itertools = "0.14.0"
--- a/orchid-api-traits/Cargo.toml
+++ b/orchid-api-traits/Cargo.toml
@@ -6,6 +6,6 @@ edition = "2021"
 # See more keys and their definitions at https://doc.rust-lang.org/cargo/reference/manifest.html

 [dependencies]
-itertools = "0.13.0"
+itertools = "0.14.0"
 never = "0.1.0"
-ordered-float = "4.2"
+ordered-float = "4.6.0"
--- a/orchid-api/Cargo.toml
+++ b/orchid-api/Cargo.toml
@@ -6,6 +6,6 @@ edition = "2021"
 # See more keys and their definitions at https://doc.rust-lang.org/cargo/reference/manifest.html

 [dependencies]
-ordered-float = "4.2.0"
+ordered-float = "4.6.0"
 orchid-api-traits = { version = "0.1.0", path = "../orchid-api-traits" }
 orchid-api-derive = { version = "0.1.0", path = "../orchid-api-derive" }
--- a/orchid-api/src/atom.rs
+++ b/orchid-api/src/atom.rs
@@ -3,7 +3,9 @@ use std::num::NonZeroU64;
 use orchid_api_derive::{Coding, Hierarchy};
 use orchid_api_traits::Request;

-use crate::{ExprTicket, Expression, ExtHostReq, HostExtNotif, HostExtReq, OrcResult, SysId, TStrv};
+use crate::{
+	ExprTicket, Expression, ExtHostReq, HostExtNotif, HostExtReq, OrcResult, SysId, TStrv,
+};

 pub type AtomData = Vec<u8>;

--- a/orchid-api/src/macros.rs
+++ b/orchid-api/src/macros.rs
@@ -5,7 +5,9 @@ use orchid_api_derive::{Coding, Hierarchy};
 use orchid_api_traits::Request;
 use ordered_float::NotNan;

-use crate::{Atom, Comment, ExtHostReq, HostExtReq, Location, OrcResult, Paren, ParsId, SysId, TStr, TStrv};
+use crate::{
+	Atom, Comment, ExtHostReq, HostExtReq, Location, OrcResult, Paren, ParsId, SysId, TStr, TStrv,
+};

 #[derive(Clone, Copy, Debug, Coding, PartialEq, Eq, PartialOrd, Ord, Hash)]
 pub struct MacroTreeId(pub NonZeroU64);
@@ -44,8 +46,8 @@ pub struct MacroRule {
 #[derive(Clone, Copy, Debug, Coding, PartialEq, Eq, Hash)]
 pub struct MacroId(pub NonZeroU64);

-/// After a pattern matches, this call executes the body of the macro. This request returns None
-/// if an inner nested request raised an exception
+/// After a pattern matches, this call executes the body of the macro. This
+/// request returns None if an inner nested request raised an exception
 #[derive(Clone, Debug, Coding, Hierarchy)]
 #[extends(HostExtReq)]
 pub struct ApplyMacro {
@@ -53,7 +55,8 @@ pub struct ApplyMacro {
 	pub id: MacroId,
 	/// Recursion token
 	pub run_id: ParsId,
-  /// Must contain exactly the keys that were specified as placeholders in the pattern
+	/// Must contain exactly the keys that were specified as placeholders in the
+	/// pattern
 	pub params: HashMap<TStr, Vec<MacroTree>>,
 }
 impl Request for ApplyMacro {
--- a/orchid-api/src/proto.rs
+++ b/orchid-api/src/proto.rs
@@ -25,7 +25,7 @@
 use std::io::{Read, Write};

 use orchid_api_derive::{Coding, Hierarchy};
-use orchid_api_traits::{read_exact, write_exact, Channel, Decode, Encode, MsgSet, Request};
+use orchid_api_traits::{Channel, Decode, Encode, MsgSet, Request, read_exact, write_exact};

 use crate::{atom, expr, interner, lexer, logging, macros, parser, system, tree, vfs};

--- a/orchid-base/Cargo.toml
+++ b/orchid-base/Cargo.toml
@@ -10,14 +10,14 @@ derive_destructure = "1.0.0"
 dyn-clone = "1.0.17"
 hashbrown = "0.15.2"
 itertools = "0.14.0"
-lazy_static = "1.4.0"
+lazy_static = "1.5.0"
 never = "0.1.0"
 num-traits = "0.2.19"
 orchid-api = { version = "0.1.0", path = "../orchid-api" }
 orchid-api-derive = { version = "0.1.0", path = "../orchid-api-derive" }
 orchid-api-traits = { version = "0.1.0", path = "../orchid-api-traits" }
-ordered-float = "4.2.0"
-rust-embed = "8.3.0"
-rust_decimal = "1.35.0"
-substack = "1.1.0"
+ordered-float = "4.6.0"
+rust-embed = "8.5.0"
+rust_decimal = "1.36.0"
+substack = "1.1.1"
 trait-set = "0.3.0"
--- a/orchid-base/src/event.rs
+++ b/orchid-base/src/event.rs
@@ -1,8 +1,8 @@
 //! Multiple-listener-single-delivery event system.

 use std::mem;
-use std::sync::mpsc::{self, sync_channel};
 use std::sync::Mutex;
+use std::sync::mpsc::{self, sync_channel};

 struct Reply<T, U> {
 	resub: bool,
--- a/orchid-base/src/interner.rs
+++ b/orchid-base/src/interner.rs
@@ -2,7 +2,7 @@ use std::borrow::Borrow;
 use std::hash::BuildHasher as _;
 use std::num::NonZeroU64;
 use std::ops::{Deref, DerefMut};
-use std::sync::{atomic, Arc, Mutex, MutexGuard};
+use std::sync::{Arc, Mutex, MutexGuard, atomic};
 use std::{fmt, hash, mem};

 use hashbrown::{HashMap, HashSet};
@@ -25,7 +25,8 @@ pub struct Tok<T: Interned> {
 impl<T: Interned> Tok<T> {
 	pub fn new(data: Arc<T>, marker: T::Marker) -> Self { Self { data, marker: ForceSized(marker) } }
 	pub fn to_api(&self) -> T::Marker { self.marker.0 }
-  pub fn from_api<M>(marker: M) -> Self where M: InternMarker<Interned = T> {
+	pub fn from_api<M>(marker: M) -> Self
+	where M: InternMarker<Interned = T> {
 		deintern(marker)
 	}
 	pub fn arc(&self) -> Arc<T> { self.data.clone() }
@@ -330,7 +331,7 @@ pub fn sweep_master(retained: api::Retained) {
 mod test {
 	use std::num::NonZero;

-  use orchid_api_traits::{enc_vec, Decode};
+	use orchid_api_traits::{Decode, enc_vec};

 	use super::*;
 	use crate::api;
--- a/orchid-base/src/lib.rs
+++ b/orchid-base/src/lib.rs
@@ -1,18 +1,20 @@
 use orchid_api as api;

+pub mod box_cow;
 pub mod boxed_iter;
+pub mod char_filter;
 pub mod clone;
 pub mod combine;
-pub mod event;
-pub mod msg;
-pub mod box_cow;
-pub mod char_filter;
 pub mod error;
+pub mod event;
 pub mod id_store;
 pub mod interner;
 pub mod join;
 pub mod location;
 pub mod logging;
+pub mod macros;
+mod match_mapping;
+pub mod msg;
 pub mod name;
 pub mod number;
 pub mod parse;
@@ -22,5 +24,3 @@ pub mod sequence;
 pub mod side;
 pub mod tokens;
 pub mod tree;
-pub mod macros;
-mod match_mapping;
--- a/orchid-base/src/location.rs
+++ b/orchid-base/src/location.rs
@@ -1,15 +1,14 @@
 //! Structures that show where code or semantic elements came from

-use crate::match_mapping;
 use std::fmt;
 use std::hash::Hash;
 use std::ops::Range;

 use trait_set::trait_set;

-use crate::interner::{intern, Tok};
+use crate::interner::{Tok, intern};
 use crate::name::Sym;
-use crate::{api, intern, sym};
+use crate::{api, intern, match_mapping, sym};

 trait_set! {
 	pub trait GetSrc = FnMut(&Sym) -> Tok<String>;
@@ -92,9 +91,7 @@ impl SourceRange {
 			(false, _) => format!("{sl}:{sc}..{el}:{ec}"),
 		}
 	}
-  pub fn zw(path: Sym, pos: u32) -> Self {
-    Self { path, range: pos..pos }
-  }
+	pub fn zw(path: Sym, pos: u32) -> Self { Self { path, range: pos..pos } }
 	fn from_api(api: &api::SourceRange) -> Self {
 		Self { path: Sym::from_api(api.path), range: api.range.clone() }
 	}
@@ -121,10 +118,7 @@ impl CodeGenInfo {
 	/// Syntactic location
 	pub fn pos(&self) -> Pos { Pos::Gen(self.clone()) }
 	fn from_api(api: &api::CodeGenInfo) -> Self {
-    Self {
-      generator: Sym::from_api(api.generator),
-      details: Tok::from_api(api.details),
-    }
+		Self { generator: Sym::from_api(api.generator), details: Tok::from_api(api.details) }
 	}
 	fn to_api(&self) -> api::CodeGenInfo {
 		api::CodeGenInfo { generator: self.generator.to_api(), details: self.details.to_api() }
--- a/orchid-base/src/logging.rs
+++ b/orchid-base/src/logging.rs
@@ -1,6 +1,6 @@
 use std::fmt::Arguments;
 use std::fs::File;
-use std::io::{stderr, Write};
+use std::io::{Write, stderr};

 pub use api::LogStrategy;
 use itertools::Itertools;
--- a/orchid-base/src/match_mapping.rs
+++ b/orchid-base/src/match_mapping.rs
@@ -1,6 +1,6 @@
-/// A shorthand for mapping over enums with identical structure. Used for converting between
-/// owned enums and the corresponding API enums that only differ in the type of their
-/// fields.
+/// A shorthand for mapping over enums with identical structure. Used for
+/// converting between owned enums and the corresponding API enums that only
+/// differ in the type of their fields.
 ///
 /// The basic form is
 /// ```ignore
--- a/orchid-base/src/name.rs
+++ b/orchid-base/src/name.rs
@@ -12,7 +12,7 @@ use itertools::Itertools;
 use trait_set::trait_set;

 use crate::api;
-use crate::interner::{intern, InternMarker, Tok};
+use crate::interner::{InternMarker, Tok, intern};

 trait_set! {
 	/// Traits that all name iterators should implement
@@ -92,7 +92,7 @@ impl<T: NameIndex> Index<T> for PathSlice {
 mod idx_impls {
 	use std::ops;

-  use super::{conv_range, NameIndex, PathSlice};
+	use super::{NameIndex, PathSlice, conv_range};
 	use crate::interner::Tok;

 	impl NameIndex for u16 {
@@ -495,7 +495,7 @@ mod test {
 	use std::borrow::Borrow;

 	use super::{PathSlice, Sym, VName};
-  use crate::interner::{intern, Tok};
+	use crate::interner::{Tok, intern};
 	use crate::name::VPath;

 	#[test]
--- a/orchid-base/src/number.rs
+++ b/orchid-base/src/number.rs
@@ -1,11 +1,11 @@
 use std::num::IntErrorKind;
 use std::ops::Range;

+use num_traits::ToPrimitive;
 use ordered_float::NotNan;
 use rust_decimal::Decimal;
-use num_traits::ToPrimitive;

-use crate::error::{mk_err, OrcErr};
+use crate::error::{OrcErr, mk_err};
 use crate::intern;
 use crate::location::Pos;

@@ -153,7 +153,7 @@ pub fn print_nat16(num: NotNan<f64>) -> String {

 #[cfg(test)]
 mod test {
-  use super::{parse_num, Numeric};
+	use super::{Numeric, parse_num};

 	#[test]
 	fn just_ints() {
--- a/orchid-base/src/parse.rs
+++ b/orchid-base/src/parse.rs
@@ -3,8 +3,8 @@ use std::ops::{Deref, Range};

 use itertools::Itertools;

-use crate::error::{mk_err, mk_errv, OrcRes, Reporter};
-use crate::interner::{intern, Tok};
+use crate::error::{OrcRes, Reporter, mk_err, mk_errv};
+use crate::interner::{Tok, intern};
 use crate::location::Pos;
 use crate::name::VPath;
 use crate::tree::{AtomRepr, ExtraTok, Paren, TokTree, Token};
@@ -216,12 +216,13 @@ pub fn parse_multiname<'a, 'b, A: AtomRepr, X: ExtraTok>(
 				Token::Name(ntok) => {
 					let nopt = match ntok {
 						n if *n == globstar => None,
-            n if n.starts_with(op_char) =>
+						n if n.starts_with(op_char) => {
 							return Err(mk_errv(
 								intern!(str: "Unescaped operator in multiname"),
 								"Operators in multinames should be enclosed in []",
 								[Pos::Range(name.range.clone()).into()],
-              )),
+							));
+						},
 						n => Some(n.clone()),
 					};
 					vec![(vec![], nopt, Pos::Range(name.range.clone()))]
@@ -258,12 +259,13 @@ pub fn parse_multiname<'a, 'b, A: AtomRepr, X: ExtraTok>(
 					}
 					ok
 				},
-        t =>
+				t => {
 					return Err(mk_errv(
 						intern!(str: "Unrecognized name end"),
 						format!("Names cannot end with {t} tokens"),
 						[Pos::Range(name.range.clone()).into()],
-          )),
+					));
+				},
 			};
 			Ok(Parsed { output, tail })
 		}
@@ -284,8 +286,8 @@ pub struct Import {
 }
 impl Import {
 	// pub fn from_api(i: api::CompName) -> Self {
-  //   Self { path: VPath::new(i.path.into_iter().map(deintern)), name: i.name.map(deintern) }
-  // }
+	//   Self { path: VPath::new(i.path.into_iter().map(deintern)), name:
+	// i.name.map(deintern) } }
 	// pub fn to_api(&self) -> api::CompName {
 	//   api::CompName {
 	//     path: self.path.iter().map(|t| t.marker()).collect(),
--- a/orchid-base/src/reqnot.rs
+++ b/orchid-base/src/reqnot.rs
@@ -3,12 +3,12 @@ use std::cell::RefCell;
 use std::marker::PhantomData;
 use std::ops::{BitAnd, Deref};
 use std::sync::atomic::{AtomicBool, Ordering};
-use std::sync::mpsc::{sync_channel, SyncSender};
+use std::sync::mpsc::{SyncSender, sync_channel};
 use std::sync::{Arc, Mutex};
 use std::{mem, thread};

 use derive_destructure::destructure;
-use dyn_clone::{clone_box, DynClone};
+use dyn_clone::{DynClone, clone_box};
 use hashbrown::HashMap;
 use orchid_api_traits::{Channel, Coding, Decode, Encode, MsgSet, Request};
 use trait_set::trait_set;
--- a/orchid-base/src/tree.rs
+++ b/orchid-base/src/tree.rs
@@ -6,20 +6,19 @@ use std::marker::PhantomData;
 use std::ops::Range;
 use std::sync::Arc;

+pub use api::PhKind;
 use itertools::Itertools;
 use never::Never;
 use ordered_float::NotNan;
 use trait_set::trait_set;

-use crate::{api, match_mapping};
 use crate::error::OrcErrv;
 use crate::interner::Tok;
 use crate::location::Pos;
 use crate::name::PathSlice;
 use crate::parse::Snippet;
 use crate::tokens::PARENS;
-
-pub use api::PhKind as PhKind;
+use crate::{api, match_mapping};

 trait_set! {
 	pub trait RecurCB<'a, A: AtomRepr, X: ExtraTok> = Fn(TokTree<'a, A, X>) -> TokTree<'a, A, X>;
@@ -184,7 +183,7 @@ pub fn vname_tv<'a: 'b, 'b, A: AtomRepr + 'a, X: ExtraTok + 'a>(
 }

 pub fn wrap_tokv<'a, A: AtomRepr, X: ExtraTok>(
-  items: impl IntoIterator<Item = TokTree<'a, A, X>>
+	items: impl IntoIterator<Item = TokTree<'a, A, X>>,
 ) -> TokTree<'a, A, X> {
 	let items_v = items.into_iter().collect_vec();
 	match items_v.len() {
@@ -216,9 +215,7 @@ pub enum Token<'a, A: AtomRepr, X: ExtraTok> {
 }
 impl<'a, A: AtomRepr, X: ExtraTok> Token<'a, A, X> {
 	pub fn at(self, range: Range<u32>) -> TokTree<'a, A, X> { TokTree { range, tok: self } }
-  pub fn is_kw(&self, tk: Tok<String>) -> bool {
-    matches!(self, Token::Name(n) if *n == tk)
-  }
+	pub fn is_kw(&self, tk: Tok<String>) -> bool { matches!(self, Token::Name(n) if *n == tk) }
 	pub fn as_s(&self, par: Paren) -> Option<&[TokTree<'a, A, X>]> {
 		match self {
 			Self::S(p, b) if *p == par => Some(b),
@@ -253,11 +250,13 @@ impl<A: AtomRepr, X: ExtraTok> Display for Token<'_, A, X> {
 			Self::Ph(Ph { kind, name }) => match &kind {
 				PhKind::Scalar => write!(f, "${name}"),
 				PhKind::Vector { at_least_one, priority } => {
-          if *at_least_one { write!(f, ".")? }
+					if *at_least_one {
+						write!(f, ".")?
+					}
 					write!(f, "..${name}")?;
 					if 0 < *priority { write!(f, "{priority}") } else { Ok(()) }
-        }
-      }
+				},
+			},
 			Self::S(p, b) => {
 				let (lp, rp, _) = PARENS.iter().find(|(_, _, par)| par == p).unwrap();
 				write!(f, "{lp} ")?;
--- a/orchid-extension/Cargo.toml
+++ b/orchid-extension/Cargo.toml
@@ -11,15 +11,15 @@ derive_destructure = "1.0.0"
 dyn-clone = "1.0.17"
 hashbrown = "0.15.2"
 itertools = "0.14.0"
-konst = "0.3.9"
+konst = "0.3.16"
 lazy_static = "1.5.0"
 never = "0.1.0"
-once_cell = "1.19.0"
+once_cell = "1.20.2"
 orchid-api = { version = "0.1.0", path = "../orchid-api" }
 orchid-api-derive = { version = "0.1.0", path = "../orchid-api-derive" }
 orchid-api-traits = { version = "0.1.0", path = "../orchid-api-traits" }
 orchid-base = { version = "0.1.0", path = "../orchid-base" }
-ordered-float = "4.2.0"
+ordered-float = "4.6.0"
 paste = "1.0.15"
-substack = "1.1.0"
+substack = "1.1.1"
 trait-set = "0.3.0"
--- a/orchid-extension/src/atom.rs
+++ b/orchid-extension/src/atom.rs
@@ -1,13 +1,13 @@
-use std::any::{type_name, Any, TypeId};
+use std::any::{Any, TypeId, type_name};
 use std::fmt;
 use std::io::{Read, Write};
 use std::marker::PhantomData;
 use std::ops::Deref;
 use std::sync::{Arc, OnceLock};

-use dyn_clone::{clone_box, DynClone};
-use orchid_api_traits::{enc_vec, Coding, Decode, Encode, Request};
-use orchid_base::error::{mk_err, OrcErr, OrcRes};
+use dyn_clone::{DynClone, clone_box};
+use orchid_api_traits::{Coding, Decode, Encode, Request, enc_vec};
+use orchid_base::error::{OrcErr, OrcRes, mk_err};
 use orchid_base::intern;
 use orchid_base::location::Pos;
 use orchid_base::name::Sym;
@@ -18,7 +18,7 @@ use trait_set::trait_set;
 use crate::api;
 // use crate::error::{ProjectError, ProjectResult};
 use crate::expr::{Expr, ExprData, ExprHandle, ExprKind};
-use crate::system::{atom_info_for, downcast_atom, DynSystemCard, SysCtx};
+use crate::system::{DynSystemCard, SysCtx, atom_info_for, downcast_atom};

 pub trait AtomCard: 'static + Sized {
 	type Data: Clone + Coding + Sized;
@@ -93,7 +93,7 @@ impl ForeignAtom<'static> {
 		let rep = self.ctx.reqnot.request(api::Fwd(
 			self.atom.clone(),
 			Sym::parse(M::NAME).unwrap().tok().to_api(),
-      enc_vec(&m)
+			enc_vec(&m),
 		))?;
 		Some(M::Response::decode(&mut &rep[..]))
 	}
@@ -145,25 +145,26 @@ pub struct MethodSet<A: AtomCard> {
 	handlers: Vec<AtomReqHandler<A>>,
 }
 impl<A: AtomCard> MethodSet<A> {
-  pub fn new() -> Self { Self{ handlers: vec![] } }
+	pub fn new() -> Self { Self { handlers: vec![] } }

-  pub fn handle<M: AtomMethod>(mut self) -> Self where A: Supports<M> {
+	pub fn handle<M: AtomMethod>(mut self) -> Self
+	where A: Supports<M> {
 		self.handlers.push(AtomReqHandler {
 			key: Sym::parse(M::NAME).expect("AtomMethod::NAME cannoot be empty"),
-      cb: Box::new(move |
-        a: &A,
-        ctx: SysCtx,
-        req: &mut dyn Read,
-        rep: &mut dyn Write
-      | {
+			cb: Box::new(move |a: &A, ctx: SysCtx, req: &mut dyn Read, rep: &mut dyn Write| {
 				Supports::<M>::handle(a, ctx, M::decode(req)).encode(rep);
-      })
+			}),
 		});
 		self
 	}

 	pub(crate) fn dispatch(
-    &self, atom: &A, ctx: SysCtx, key: Sym, req: &mut dyn Read, rep: &mut dyn Write
+		&self,
+		atom: &A,
+		ctx: SysCtx,
+		key: Sym,
+		req: &mut dyn Read,
+		rep: &mut dyn Write,
 	) -> bool {
 		match self.handlers.iter().find(|h| h.key == key) {
 			None => false,
@@ -176,9 +177,7 @@ impl<A: AtomCard> MethodSet<A> {
 }

 impl<A: AtomCard> Default for MethodSet<A> {
-    fn default() -> Self {
-        Self::new()
-    }
+	fn default() -> Self { Self::new() }
 }

 #[derive(Clone)]
@@ -198,13 +197,19 @@ impl<A: AtomicFeatures> TypAtom<'static, A> {
 	}
 }
 impl<A: AtomicFeatures> TypAtom<'_, A> {
-  pub fn request<M: AtomMethod>(&self, req: M) -> M::Response where A: Supports<M> {
+	pub fn request<M: AtomMethod>(&self, req: M) -> M::Response
+	where A: Supports<M> {
 		M::Response::decode(
-      &mut &self.data.ctx.reqnot.request(api::Fwd(
+			&mut &self
+				.data
+				.ctx
+				.reqnot
+				.request(api::Fwd(
 					self.data.atom.clone(),
 					Sym::parse(M::NAME).unwrap().tok().to_api(),
-        enc_vec(&req)
-      )).unwrap()[..]
+					enc_vec(&req),
+				))
+				.unwrap()[..],
 		)
 	}
 }
@@ -222,7 +227,8 @@ pub trait AtomDynfo: Send + Sync + 'static {
 	fn call(&self, ctx: AtomCtx<'_>, arg: api::ExprTicket) -> Expr;
 	fn call_ref(&self, ctx: AtomCtx<'_>, arg: api::ExprTicket) -> Expr;
 	fn print(&self, ctx: AtomCtx<'_>) -> String;
-  fn handle_req(&self, ctx: AtomCtx<'_>, key: Sym, req: &mut dyn Read, rep: &mut dyn Write) -> bool;
+	fn handle_req(&self, ctx: AtomCtx<'_>, key: Sym, req: &mut dyn Read, rep: &mut dyn Write)
+	-> bool;
 	fn command(&self, ctx: AtomCtx<'_>) -> OrcRes<Option<Expr>>;
 	fn serialize(&self, ctx: AtomCtx<'_>, write: &mut dyn Write) -> Option<Vec<api::ExprTicket>>;
 	fn deserialize(&self, ctx: SysCtx, data: &[u8], refs: &[api::ExprTicket]) -> api::Atom;
--- a/orchid-extension/src/conv.rs
+++ b/orchid-extension/src/conv.rs
@@ -1,9 +1,9 @@
-use orchid_base::error::{mk_err, OrcErr, OrcRes};
+use orchid_base::error::{OrcErr, OrcRes, mk_err};
 use orchid_base::intern;
 use orchid_base::location::Pos;

 use crate::atom::{AtomicFeatures, ToAtom, TypAtom};
-use crate::expr::{atom, bot, Expr};
+use crate::expr::{Expr, atom, bot};
 use crate::system::downcast_atom;

 pub trait TryFromExpr: Sized {
--- a/orchid-extension/src/entrypoint.rs
+++ b/orchid-extension/src/entrypoint.rs
@@ -6,10 +6,10 @@ use std::{mem, process, thread};

 use hashbrown::HashMap;
 use itertools::Itertools;
-use orchid_api_traits::{enc_vec, Decode, Encode};
+use orchid_api_traits::{Decode, Encode, enc_vec};
 use orchid_base::char_filter::{char_filter_match, char_filter_union, mk_char_filter};
 use orchid_base::clone;
-use orchid_base::interner::{init_replica, sweep_replica, Tok};
+use orchid_base::interner::{Tok, init_replica, sweep_replica};
 use orchid_base::logging::Logger;
 use orchid_base::macros::{mtreev_from_api, mtreev_to_api};
 use orchid_base::name::{PathSlice, Sym};
@@ -22,12 +22,12 @@ use crate::api;
 use crate::atom::{AtomCtx, AtomDynfo};
 use crate::atom_owned::OBJ_STORE;
 use crate::fs::VirtFS;
-use crate::lexer::{err_cascade, err_not_applicable, LexContext};
-use crate::macros::{apply_rule, RuleCtx};
+use crate::lexer::{LexContext, err_cascade, err_not_applicable};
+use crate::macros::{RuleCtx, apply_rule};
 use crate::msg::{recv_parent_msg, send_parent_msg};
-use crate::system::{atom_by_idx, SysCtx};
+use crate::system::{SysCtx, atom_by_idx};
 use crate::system_ctor::{CtedObj, DynSystemCtor};
-use crate::tree::{do_extra, GenTok, GenTokTree, LazyMemberFactory, TIACtxImpl};
+use crate::tree::{GenTok, GenTokTree, LazyMemberFactory, TIACtxImpl, do_extra};

 pub type ExtReq = RequestHandle<api::ExtMsgSet>;
 pub type ExtReqNot = ReqNot<api::ExtMsgSet>;
--- a/orchid-extension/src/expr.rs
+++ b/orchid-extension/src/expr.rs
@@ -1,9 +1,8 @@
+use std::fmt;
 use std::ops::Deref;
 use std::sync::{Arc, OnceLock};
-use std::{backtrace, fmt};

 use derive_destructure::destructure;
-use orchid_base::clone;
 use orchid_base::error::{OrcErr, OrcErrv};
 use orchid_base::interner::Tok;
 use orchid_base::location::Pos;
--- a/orchid-extension/src/func_atom.rs
+++ b/orchid-extension/src/func_atom.rs
@@ -85,7 +85,8 @@ impl OwnedAtom for Fun {
 	}
 }

-/// An Atom representing a partially applied native lambda. These are not serializable.
+/// An Atom representing a partially applied native lambda. These are not
+/// serializable.
 ///
 /// See [Fun] for the serializable variant
 #[derive(Clone)]
--- a/orchid-extension/src/lexer.rs
+++ b/orchid-extension/src/lexer.rs
@@ -1,6 +1,6 @@
 use std::ops::{Range, RangeInclusive};

-use orchid_base::error::{mk_err, OrcErr, OrcRes};
+use orchid_base::error::{OrcErr, OrcRes, mk_err};
 use orchid_base::intern;
 use orchid_base::interner::Tok;
 use orchid_base::location::Pos;
--- a/orchid-extension/src/lib.rs
+++ b/orchid-extension/src/lib.rs
@@ -9,10 +9,10 @@ pub mod expr;
 pub mod fs;
 pub mod func_atom;
 pub mod lexer;
+pub mod macros;
 pub mod msg;
 pub mod other_system;
 pub mod parser;
 pub mod system;
 pub mod system_ctor;
 pub mod tree;
-pub mod macros;
--- a/orchid-extension/src/macros.rs
+++ b/orchid-extension/src/macros.rs
@@ -1,10 +1,21 @@
+use std::num::NonZero;
+use std::sync::RwLock;
+
 use ahash::HashMap;
 use lazy_static::lazy_static;
 use never::Never;
-use orchid_base::{error::OrcRes, interner::{intern, Tok}, location::Pos, macros::{mtreev_from_api, mtreev_to_api, MTree}, parse::Comment, reqnot::Requester};
+use orchid_base::error::OrcRes;
+use orchid_base::interner::{Tok, intern};
+use orchid_base::location::Pos;
+use orchid_base::macros::{MTree, mtreev_from_api, mtreev_to_api};
+use orchid_base::parse::Comment;
+use orchid_base::reqnot::Requester;
 use trait_set::trait_set;
-use crate::{api, atom::AtomFactory, lexer::err_cascade, system::SysCtx};
-use std::{num::NonZero, sync::RwLock};
+
+use crate::api;
+use crate::atom::AtomFactory;
+use crate::lexer::err_cascade;
+use crate::system::SysCtx;

 pub trait Macro {
 	fn pattern() -> MTree<'static, Never>;
@@ -30,14 +41,11 @@ pub struct RuleCtx<'a> {
 }
 impl<'a> RuleCtx<'a> {
 	pub fn recurse(&mut self, tree: &[MTree<'a, Never>]) -> OrcRes<Vec<MTree<'a, Never>>> {
-    let req = api::RunMacros{
-      run_id: self.run_id,
-      query: mtreev_to_api(tree, &mut |b| match *b {})
-    };
-    Ok(mtreev_from_api(
-      &self.sys.reqnot.request(req).ok_or_else(err_cascade)?,
-      &mut |_| panic!("Returned atom from Rule recursion")
-    ))
+		let req =
+			api::RunMacros { run_id: self.run_id, query: mtreev_to_api(tree, &mut |b| match *b {}) };
+		Ok(mtreev_from_api(&self.sys.reqnot.request(req).ok_or_else(err_cascade)?, &mut |_| {
+			panic!("Returned atom from Rule recursion")
+		}))
 	}
 	pub fn getv(&mut self, key: &Tok<String>) -> Vec<MTree<'a, Never>> {
 		self.args.remove(key).expect("Key not found")
@@ -48,7 +56,9 @@ impl<'a> RuleCtx<'a> {
 		v.into_iter().next().unwrap()
 	}
 	pub fn unused_arg<'b>(&mut self, keys: impl IntoIterator<Item = &'b Tok<String>>) {
-    keys.into_iter().for_each(|k| {self.getv(k);});
+		keys.into_iter().for_each(|k| {
+			self.getv(k);
+		});
 	}
 }

@@ -56,7 +66,7 @@ trait_set! {
 	pub trait RuleCB = for<'a> Fn(RuleCtx<'a>) -> OrcRes<Vec<MTree<'a, AtomFactory>>> + Send + Sync;
 }

-lazy_static!{
+lazy_static! {
 	static ref RULES: RwLock<HashMap<api::MacroId, Box<dyn RuleCB>>> = RwLock::default();
 }

@@ -79,7 +89,7 @@ impl Rule {
 pub fn rule_cmt<'a>(
 	cmt: impl IntoIterator<Item = &'a str>,
 	pattern: Vec<MTree<'static, Never>>,
-  apply: impl RuleCB + 'static
+	apply: impl RuleCB + 'static,
 ) -> Rule {
 	let mut rules = RULES.write().unwrap();
 	let id = api::MacroId(NonZero::new(rules.len() as u64 + 1).unwrap());
@@ -94,7 +104,7 @@ pub fn rule(pattern: Vec<MTree<'static, Never>>, apply: impl RuleCB + 'static) -

 pub(crate) fn apply_rule(
 	id: api::MacroId,
-  ctx: RuleCtx<'static>
+	ctx: RuleCtx<'static>,
 ) -> OrcRes<Vec<MTree<'static, AtomFactory>>> {
 	let rules = RULES.read().unwrap();
 	rules[&id](ctx)
--- a/orchid-extension/src/system.rs
+++ b/orchid-extension/src/system.rs
@@ -10,11 +10,10 @@ use orchid_base::logging::Logger;
 use orchid_base::reqnot::{Receipt, ReqNot};

 use crate::api;
-use crate::atom::{get_info, AtomCtx, AtomDynfo, AtomicFeatures, ForeignAtom, TypAtom};
+use crate::atom::{AtomCtx, AtomDynfo, AtomicFeatures, ForeignAtom, TypAtom, get_info};
 use crate::entrypoint::ExtReq;
 use crate::fs::DeclFs;
 use crate::func_atom::Fun;
-// use crate::fun::Fun;
 use crate::lexer::LexerObj;
 use crate::parser::ParserObj;
 use crate::system_ctor::{CtedObj, SystemCtor};
@@ -62,10 +61,7 @@ pub fn atom_by_idx(
 	}
 }

-pub fn resolv_atom(
-  sys: &(impl DynSystemCard + ?Sized),
-  atom: &api::Atom,
-) -> Box<dyn AtomDynfo> {
+pub fn resolv_atom(sys: &(impl DynSystemCard + ?Sized), atom: &api::Atom) -> Box<dyn AtomDynfo> {
 	let tid = api::AtomId::decode(&mut &atom.data[..8]);
 	atom_by_idx(sys, tid).expect("Value of nonexistent type found")
 }
--- a/orchid-extension/src/system_ctor.rs
+++ b/orchid-extension/src/system_ctor.rs
@@ -1,7 +1,7 @@
 use std::any::Any;
 use std::sync::Arc;

-use orchid_base::boxed_iter::{box_empty, box_once, BoxedIter};
+use orchid_base::boxed_iter::{BoxedIter, box_empty, box_once};
 use ordered_float::NotNan;

 use crate::api;
--- a/orchid-extension/src/tree.rs
+++ b/orchid-extension/src/tree.rs
@@ -15,7 +15,7 @@ use trait_set::trait_set;

 use crate::api;
 use crate::atom::{AtomFactory, ForeignAtom};
-use crate::conv::{ToExpr, TryFromExpr};
+use crate::conv::ToExpr;
 use crate::entrypoint::MemberRecord;
 use crate::expr::Expr;
 use crate::func_atom::{ExprFunc, Fun};
@@ -150,7 +150,7 @@ impl MemKind {
 		match self {
 			Self::Lazy(lazy) => api::MemberKind::Lazy(ctx.with_lazy(lazy)),
 			Self::Const(c) =>
-        api::MemberKind::Const(c.api_return(ctx.sys(), &mut |_| panic!("Slot found in const tree"))),
+				api::MemberKind::Const(c.api_return(ctx.sys(), &mut |_| panic!("Slot in const tree"))),
 			Self::Mod { imports, items } => api::MemberKind::Module(api::Module {
 				items: (imports.into_iter())
 					.map(|t| GenItemKind::Import(t).gen())
--- a/orchid-host/Cargo.toml
+++ b/orchid-host/Cargo.toml
@@ -9,13 +9,13 @@ edition = "2021"
 derive_destructure = "1.0.0"
 hashbrown = "0.15.2"
 itertools = "0.14.0"
-lazy_static = "1.4.0"
+lazy_static = "1.5.0"
 never = "0.1.0"
 num-traits = "0.2.19"
 orchid-api = { version = "0.1.0", path = "../orchid-api" }
 orchid-api-traits = { version = "0.1.0", path = "../orchid-api-traits" }
 orchid-base = { version = "0.1.0", path = "../orchid-base" }
-ordered-float = "4.2.0"
+ordered-float = "4.6.0"
 paste = "1.0.15"
 substack = "1.1.1"
 trait-set = "0.3.0"
--- a/orchid-host/src/expr.rs
+++ b/orchid-host/src/expr.rs
@@ -127,13 +127,14 @@ impl PathSet {
 			K::Arg(id2) => (id == *id2).then(|| Self { steps: VecDeque::new(), next: None }),
 			K::Bottom(_) | K::Const(_) | K::NewAtom(_) | K::Slot(_) => None,
 			K::Lambda(_, b) => Self::from_api(id, &b.kind),
-      K::Call(l, r) | K::Seq(l, r) =>
+			K::Call(l, r) | K::Seq(l, r) => {
 				match (Self::from_api(id, &l.kind), Self::from_api(id, &r.kind)) {
 					(Some(a), Some(b)) =>
 						Some(Self { steps: VecDeque::new(), next: Some((Box::new(a), Box::new(b))) }),
 					(Some(l), None) => Some(l.after(Step::Left)),
 					(None, Some(r)) => Some(r.after(Step::Right)),
 					(None, None) => None,
+				}
 			},
 		}
 	}
--- a/orchid-host/src/lex.rs
+++ b/orchid-host/src/lex.rs
@@ -2,14 +2,14 @@ use std::num::NonZeroU64;
 use std::sync::Arc;

 use hashbrown::HashMap;
-use orchid_base::error::{mk_errv, OrcErrv, OrcRes};
-use orchid_base::{intern, match_mapping};
-use orchid_base::interner::{intern, Tok};
+use orchid_base::error::{OrcErrv, OrcRes, mk_errv};
+use orchid_base::interner::{Tok, intern};
 use orchid_base::location::Pos;
 use orchid_base::number::{num_to_err, parse_num};
 use orchid_base::parse::{name_char, name_start, op_char, unrep_space};
 use orchid_base::tokens::PARENS;
 use orchid_base::tree::Ph;
+use orchid_base::{intern, match_mapping};

 use crate::api;
 use crate::extension::{AtomHand, System};
@@ -123,8 +123,8 @@ pub fn lex_once(ctx: &mut LexCtx) -> OrcRes<ParsTokTree> {
 			ctx.trim_ws();
 		}
 		ParsTok::S(*paren, body)
-  } else if ctx.strip_prefix("macro") &&
-    !ctx.tail.chars().next().is_some_and(|x| x.is_ascii_alphabetic())
+	} else if ctx.strip_prefix("macro")
+		&& !ctx.tail.chars().next().is_some_and(|x| x.is_ascii_alphabetic())
 	{
 		ctx.strip_prefix("macro");
 		if ctx.strip_char('(') {
@@ -191,7 +191,7 @@ fn tt_to_owned(api: &api::TokenTree, ctx: &mut LexCtx<'_>) -> ParsTokTree {

 fn ttv_to_owned<'a>(
 	api: impl IntoIterator<Item = &'a api::TokenTree>,
-  ctx: &mut LexCtx<'_>
+	ctx: &mut LexCtx<'_>,
 ) -> Vec<ParsTokTree> {
 	api.into_iter().map(|t| tt_to_owned(t, ctx)).collect()
 }
--- a/orchid-host/src/lib.rs
+++ b/orchid-host/src/lib.rs
@@ -4,8 +4,8 @@ pub mod child;
 pub mod expr;
 pub mod extension;
 pub mod lex;
+pub mod macros;
 pub mod parse;
+pub mod rule;
 pub mod subprocess;
 pub mod tree;
-pub mod macros;
-pub mod rule;
--- a/orchid-host/src/parse.rs
+++ b/orchid-host/src/parse.rs
@@ -3,22 +3,24 @@ use std::{iter, thread};

 use itertools::Itertools;
 use never::Never;
-use orchid_base::error::{mk_err, mk_errv, OrcErrv, OrcRes, Reporter};
+use orchid_base::error::{OrcErrv, OrcRes, Reporter, mk_err, mk_errv};
 use orchid_base::intern;
 use orchid_base::interner::Tok;
 use orchid_base::location::Pos;
 use orchid_base::macros::{MTok, MTree};
 use orchid_base::name::Sym;
 use orchid_base::parse::{
-  expect_end, line_items, parse_multiname, strip_fluff, try_pop_no_fluff, Comment, Import,
-  Parsed, Snippet,
+	Comment, Import, Parsed, Snippet, expect_end, line_items, parse_multiname, strip_fluff,
+	try_pop_no_fluff,
 };
 use orchid_base::tree::{Paren, TokTree, Token};
 use substack::Substack;

 use crate::extension::{AtomHand, System};
 use crate::macros::MacTree;
-use crate::tree::{Code, CodeLocator, Item, ItemKind, Member, MemberKind, Module, ParsTokTree, Rule, RuleKind};
+use crate::tree::{
+	Code, CodeLocator, Item, ItemKind, Member, MemberKind, Module, ParsTokTree, Rule, RuleKind,
+};

 type ParsSnippet<'a> = Snippet<'a, 'static, AtomHand, Never>;

@@ -30,7 +32,7 @@ pub trait ParseCtx: Send + Sync {
 pub fn parse_items(
 	ctx: &impl ParseCtx,
 	path: Substack<Tok<String>>,
-  items: ParsSnippet
+	items: ParsSnippet,
 ) -> OrcRes<Vec<Item>> {
 	let lines = line_items(items);
 	let mut ok = iter::from_fn(|| None).take(lines.len()).collect_vec();
@@ -142,42 +144,47 @@ pub fn parse_exportable_item(
 pub fn parse_module(
 	ctx: &impl ParseCtx,
 	path: Substack<Tok<String>>,
-  tail: ParsSnippet
+	tail: ParsSnippet,
 ) -> OrcRes<(Tok<String>, Module)> {
 	let (name, tail) = match try_pop_no_fluff(tail)? {
 		Parsed { output: TokTree { tok: Token::Name(n), .. }, tail } => (n.clone(), tail),
-    Parsed { output, .. } =>
+		Parsed { output, .. } => {
 			return Err(mk_errv(
 				intern!(str: "Missing module name"),
 				format!("A name was expected, {output} was found"),
 				[Pos::Range(output.range.clone()).into()],
-      )),
+			));
+		},
 	};
 	let Parsed { output, tail: surplus } = try_pop_no_fluff(tail)?;
 	expect_end(surplus)?;
-  let body = output.as_s(Paren::Round).ok_or_else(|| mk_errv(
+	let body = output.as_s(Paren::Round).ok_or_else(|| {
+		mk_errv(
 			intern!(str: "Expected module body"),
 			format!("A ( block ) was expected, {output} was found"),
 			[Pos::Range(output.range.clone()).into()],
-  ))?;
+		)
+	})?;
 	let path = path.push(name.clone());
 	Ok((name, Module::new(parse_items(ctx, path, body)?)))
 }

 pub fn parse_const(tail: ParsSnippet) -> OrcRes<(Tok<String>, Vec<ParsTokTree>)> {
 	let Parsed { output, tail } = try_pop_no_fluff(tail)?;
-  let name = output.as_name().ok_or_else(|| mk_errv(
+	let name = output.as_name().ok_or_else(|| {
+		mk_errv(
 			intern!(str: "Missing module name"),
 			format!("A name was expected, {output} was found"),
 			[Pos::Range(output.range.clone()).into()],
-  ))?;
+		)
+	})?;
 	let Parsed { output, tail } = try_pop_no_fluff(tail)?;
 	if !output.is_kw(intern!(str: "=")) {
 		return Err(mk_errv(
 			intern!(str: "Missing walrus := separator"),
 			format!("Expected operator := , found {output}"),
 			[Pos::Range(output.range.clone()).into()],
-    ))
+		));
 	}
 	try_pop_no_fluff(tail)?;
 	Ok((name, tail.iter().flat_map(strip_fluff).collect_vec()))
@@ -187,38 +194,41 @@ pub fn parse_mtree(mut snip: ParsSnippet<'_>) -> OrcRes<Vec<MacTree>> {
 	let mut mtreev = Vec::new();
 	while let Some((ttree, tail)) = snip.pop_front() {
 		let (range, tok, tail) = match &ttree.tok {
-      Token::S(p, b) => (
-        ttree.range.clone(),
-        MTok::S(*p, parse_mtree(Snippet::new(ttree, b))?),
-        tail,
-      ),
+			Token::S(p, b) =>
+				(ttree.range.clone(), MTok::S(*p, parse_mtree(Snippet::new(ttree, b))?), tail),
 			Token::Name(tok) => {
 				let mut segments = vec![tok.clone()];
 				let mut end = ttree.range.end;
 				while let Some((TokTree { tok: Token::NS, .. }, tail)) = snip.pop_front() {
 					let Parsed { output, tail } = try_pop_no_fluff(tail)?;
-          segments.push(output.as_name().ok_or_else(|| mk_errv(
+					segments.push(output.as_name().ok_or_else(|| {
+						mk_errv(
 							intern!(str: "Namespaced name interrupted"),
 							"In expression context, :: must always be followed by a name.\n\
            ::() is permitted only in import and export items",
-            [Pos::Range(output.range.clone()).into()]
-          ))?);
+							[Pos::Range(output.range.clone()).into()],
+						)
+					})?);
 					snip = tail;
 					end = output.range.end;
 				}
 				(ttree.range.start..end, MTok::Name(Sym::new(segments).unwrap()), snip)
 			},
-      Token::NS => return Err(mk_errv(
+			Token::NS => {
+				return Err(mk_errv(
 					intern!(str: "Unexpected :: in macro pattern"),
 					":: can only follow a name outside export statements",
-        [Pos::Range(ttree.range.clone()).into()]
-      )),
+					[Pos::Range(ttree.range.clone()).into()],
+				));
+			},
 			Token::Ph(ph) => (ttree.range.clone(), MTok::Ph(ph.clone()), tail),
-      Token::Atom(_) | Token::Macro(_) => return Err(mk_errv(
+			Token::Atom(_) | Token::Macro(_) => {
+				return Err(mk_errv(
 					intern!(str: "Unsupported token in macro patterns"),
 					format!("Macro patterns can only contain names, braces, and lambda, not {ttree}."),
-        [Pos::Range(ttree.range.clone()).into()]
-      )),
+					[Pos::Range(ttree.range.clone()).into()],
+				));
+			},
 			Token::BR | Token::Comment(_) => continue,
 			Token::Bottom(e) => return Err(e.clone()),
 			Token::LambdaHead(arg) => (
@@ -234,14 +244,20 @@ pub fn parse_mtree(mut snip: ParsSnippet<'_>) -> OrcRes<Vec<MacTree>> {
 	Ok(mtreev)
 }

-pub fn parse_macro(tail: ParsSnippet, macro_i: u16, path: Substack<Tok<String>>) -> OrcRes<Vec<Rule>> {
+pub fn parse_macro(
+	tail: ParsSnippet,
+	macro_i: u16,
+	path: Substack<Tok<String>>,
+) -> OrcRes<Vec<Rule>> {
 	let (surplus, prev, block) = match try_pop_no_fluff(tail)? {
-    Parsed { tail, output: o@TokTree { tok: Token::S(Paren::Round, b), .. } } => (tail, o, b),
-    Parsed { output, .. } => return Err(mk_errv(
+		Parsed { tail, output: o @ TokTree { tok: Token::S(Paren::Round, b), .. } } => (tail, o, b),
+		Parsed { output, .. } => {
+			return Err(mk_errv(
 				intern!(str: "m"),
 				"Macro blocks must either start with a block or a ..$:number",
-      [Pos::Range(output.range.clone()).into()]
-    )),
+				[Pos::Range(output.range.clone()).into()],
+			));
+		},
 	};
 	expect_end(surplus)?;
 	let mut errors = Vec::new();
@@ -252,9 +268,9 @@ pub fn parse_macro(tail: ParsSnippet, macro_i: u16, path: Substack<Tok<String>>)
 			errors.extend(mk_errv(
 				intern!(str: "non-rule in macro"),
 				format!("Expected `rule`, got {output}"),
-        [Pos::Range(output.range.clone()).into()]
+				[Pos::Range(output.range.clone()).into()],
 			));
-      continue
+			continue;
 		};
 		let (pat, body) = match tail.split_once(|t| t.is_kw(intern!(str: "=>"))) {
 			Some((a, b)) => (a, b),
@@ -264,8 +280,8 @@ pub fn parse_macro(tail: ParsSnippet, macro_i: u16, path: Substack<Tok<String>>)
 					"The pattern and body of a rule must be separated by a =>",
 					[Pos::Range(tail.pos()).into()],
 				));
-        continue
-      }
+				continue;
+			},
 		};
 		rules.push(Rule {
 			comments: item.output,
@@ -274,7 +290,7 @@ pub fn parse_macro(tail: ParsSnippet, macro_i: u16, path: Substack<Tok<String>>)
 			kind: RuleKind::Native(Code::from_code(
 				CodeLocator::to_rule(path.unreverse(), macro_i, i as u16),
 				body.to_vec(),
-      ))
+			)),
 		})
 	}
 	if let Ok(e) = OrcErrv::new(errors) { Err(e) } else { Ok(rules) }
--- a/orchid-host/src/rule/any_match.rs
+++ b/orchid-host/src/rule/any_match.rs
@@ -1,7 +1,8 @@
+use orchid_base::name::Sym;
+
 use super::scal_match::scalv_match;
 use super::shared::AnyMatcher;
 use super::vec_match::vec_match;
-use orchid_base::name::Sym;
 use crate::macros::MacTree;
 use crate::rule::state::MatchState;

--- a/orchid-host/src/rule/build.rs
+++ b/orchid-host/src/rule/build.rs
@@ -1,6 +1,6 @@
+use itertools::Itertools;
 use orchid_api::PhKind;
 use orchid_base::interner::Tok;
-use itertools::Itertools;
 use orchid_base::side::Side;
 use orchid_base::tree::Ph;

@@ -97,8 +97,7 @@ fn mk_scalar(pattern: &MacTree) -> ScalMatcher {
 			PhKind::Vector { .. } => {
 				panic!("Scalar matcher cannot be built from vector pattern")
 			},
-      PhKind::Scalar =>
-        ScalMatcher::Placeh { key: name.clone() },
+			PhKind::Scalar => ScalMatcher::Placeh { key: name.clone() },
 		},
 		MacTok::S(c, body) => ScalMatcher::S(*c, Box::new(mk_any(body))),
 		MacTok::Lambda(arg, body) => ScalMatcher::Lambda(Box::new(mk_any(arg)), Box::new(mk_any(body))),
@@ -111,24 +110,24 @@ mod test {
 	use std::sync::Arc;

 	use orchid_api::PhKind;
-use orchid_base::{intern, location::SourceRange, sym, tree::Ph, tokens::Paren};
+	use orchid_base::location::SourceRange;
+	use orchid_base::tokens::Paren;
+	use orchid_base::tree::Ph;
+	use orchid_base::{intern, sym};

-use crate::macros::{MacTok, MacTree};
-
-use super::mk_any;
+	use super::mk_any;
+	use crate::macros::{MacTok, MacTree};

 	#[test]
 	fn test_scan() {
-    let ex = |tok: MacTok| MacTree{ tok: Arc::new(tok), pos: SourceRange::mock().pos() };
+		let ex = |tok: MacTok| MacTree { tok: Arc::new(tok), pos: SourceRange::mock().pos() };
 		let pattern = vec![
 			ex(MacTok::Ph(Ph {
 				kind: PhKind::Vector { priority: 0, at_least_one: false },
 				name: intern!(str: "::prefix"),
 			})),
 			ex(MacTok::Name(sym!(prelude::do))),
-      ex(MacTok::S(
-        Paren::Round,
-        vec![
+			ex(MacTok::S(Paren::Round, vec![
 				ex(MacTok::Ph(Ph {
 					kind: PhKind::Vector { priority: 0, at_least_one: false },
 					name: intern!(str: "expr"),
@@ -138,8 +137,7 @@ use super::mk_any;
 					kind: PhKind::Vector { priority: 1, at_least_one: false },
 					name: intern!(str: "rest"),
 				})),
-        ],
-      )),
+			])),
 			ex(MacTok::Ph(Ph {
 				kind: PhKind::Vector { priority: 0, at_least_one: false },
 				name: intern!(str: "::suffix"),
--- a/orchid-host/src/rule/matcher.rs
+++ b/orchid-host/src/rule/matcher.rs
@@ -37,17 +37,19 @@ impl NamedMatcher {
 		}
 	}
 	/// Also returns the tail, if any, which should be matched further
-  /// Note that due to how priod works below, the main usable information from the tail is
-  /// its length
+	/// Note that due to how priod works below, the main usable information from
+	/// the tail is its length
 	pub fn apply<'a>(
 		&self,
 		seq: &'a [MacTree],
 		save_loc: impl Fn(Sym) -> bool,
 	) -> Option<(MatchState<'a>, &'a [MacTree])> {
-    any_match(&self.0, seq, &save_loc).map(|mut state| match state.remove(intern!(str: "::after")) {
+		any_match(&self.0, seq, &save_loc).map(|mut state| {
+			match state.remove(intern!(str: "::after")) {
 				Some(StateEntry::Scalar(_)) => panic!("::after can never be a scalar entry!"),
 				Some(StateEntry::Vec(v)) => (state, v),
 				None => (state, &[][..]),
+			}
 		})
 	}
 }
@@ -62,8 +64,7 @@ pub struct PriodMatcher(VecMatcher);
 impl PriodMatcher {
 	pub fn new(pattern: &[MacTree]) -> Self {
 		assert!(
-      pattern.first().and_then(vec_attrs).is_some()
-      && pattern.last().and_then(vec_attrs).is_some(),
+			pattern.first().and_then(vec_attrs).is_some() && pattern.last().and_then(vec_attrs).is_some(),
 			"Prioritized matchers must start and end with a vectorial",
 		);
 		Self(mk_vec(pattern))
--- a/orchid-host/src/rule/mod.rs
+++ b/orchid-host/src/rule/mod.rs
@@ -4,10 +4,9 @@
 //!
 //! convert pattern into hierarchy of plain, scan, middle
 //! - plain: accept any sequence or any non-empty sequence
-//! - scan: a single scalar pattern moves LTR or RTL, submatchers on either
-//!   side
-//! - middle: two scalar patterns walk over all permutations of matches
-//!   while getting progressively closer to each other
+//! - scan: a single scalar pattern moves LTR or RTL, submatchers on either side
+//! - middle: two scalar patterns walk over all permutations of matches while
+//!   getting progressively closer to each other
 //!
 //! # Application
 //!
@@ -16,10 +15,10 @@

 mod any_match;
 mod build;
+pub mod matcher;
 mod scal_match;
 pub mod shared;
-mod vec_match;
 pub mod state;
 mod vec_attrs;
-pub mod matcher;
+mod vec_match;
 // pub mod matcher;
--- a/orchid-host/src/rule/state.rs
+++ b/orchid-host/src/rule/state.rs
@@ -15,16 +15,14 @@ enum StackAction {
 	Call {
 		target: Box<dyn FnOnce(Box<dyn Any>) -> StackAction>,
 		param: Box<dyn Any>,
-    tail: Box<dyn FnOnce(Box<dyn Any>) -> StackAction>
-  }
+		tail: Box<dyn FnOnce(Box<dyn Any>) -> StackAction>,
+	},
 }

 struct Trampoline {
-  stack: Vec<Box<dyn FnOnce(Box<dyn Any>) -> StackAction>>
+	stack: Vec<Box<dyn FnOnce(Box<dyn Any>) -> StackAction>>,
 }

-
-
 #[derive(Clone, Copy, Debug)]
 pub enum StateEntry<'a> {
 	Vec(&'a [MacTree]),
--- a/orchid-host/src/rule/vec_match.rs
+++ b/orchid-host/src/rule/vec_match.rs
@@ -1,11 +1,12 @@
 use std::cmp::Ordering;

 use itertools::Itertools;
+use orchid_base::name::Sym;

 use super::scal_match::scalv_match;
 use super::shared::VecMatcher;
-use orchid_base::name::Sym;
-use crate::{macros::MacTree, rule::state::{MatchState, StateEntry}};
+use crate::macros::MacTree;
+use crate::rule::state::{MatchState, StateEntry};

 #[must_use]
 pub fn vec_match<'a>(
--- a/orchid-host/src/subprocess.rs
+++ b/orchid-host/src/subprocess.rs
@@ -1,7 +1,7 @@
 use std::io::{self, BufRead as _, Write};
 use std::path::PathBuf;
-use std::sync::mpsc::{sync_channel, SyncSender};
 use std::sync::Mutex;
+use std::sync::mpsc::{SyncSender, sync_channel};
 use std::{process, thread};

 use orchid_api_traits::{Decode, Encode};
@@ -54,21 +54,14 @@ impl Subprocess {
 				logger.log(buf);
 			}
 		})?;
-    Ok(Self {
-      child: Mutex::new(child),
-      stdin: Mutex::new(stdin),
-      set_onmessage,
-      header,
-    })
+		Ok(Self { child: Mutex::new(child), stdin: Mutex::new(stdin), set_onmessage, header })
 	}
 }
 impl Drop for Subprocess {
 	fn drop(&mut self) { self.child.lock().unwrap().wait().expect("Extension exited with error"); }
 }
 impl ExtensionPort for Subprocess {
-  fn set_onmessage(&self, callback: OnMessage) {
-    self.set_onmessage.send(callback).unwrap();
-  }
+	fn set_onmessage(&self, callback: OnMessage) { self.set_onmessage.send(callback).unwrap(); }
 	fn header(&self) -> &orchid_api::ExtensionHeader { &self.header }
 	fn send(&self, msg: &[u8]) {
 		if msg.starts_with(&[0, 0, 0, 0x1c]) {
--- a/orchid-host/src/tree.rs
+++ b/orchid-host/src/tree.rs
@@ -4,14 +4,14 @@ use std::sync::{Mutex, OnceLock};
 use itertools::Itertools;
 use never::Never;
 use orchid_base::error::OrcRes;
-use orchid_base::interner::{intern, Tok};
+use orchid_base::interner::{Tok, intern};
 use orchid_base::location::Pos;
 use orchid_base::macros::mtreev_from_api;
 use orchid_base::name::Sym;
 use orchid_base::parse::{Comment, Import};
 use orchid_base::tree::{TokTree, Token};
 use ordered_float::NotNan;
-use substack::{with_iter_stack, Substack};
+use substack::{Substack, with_iter_stack};

 use crate::api;
 use crate::expr::Expr;
@@ -33,28 +33,26 @@ pub enum ItemKind {
 	Member(Member),
 	Export(Tok<String>),
 	Import(Import),
-  Macro(Option<NotNan<f64>>, Vec<Rule>)
+	Macro(Option<NotNan<f64>>, Vec<Rule>),
 }

 impl Item {
-  pub fn from_api(
-    tree: api::Item,
-    path: Substack<Tok<String>>,
-    sys: &System
-  ) -> Self {
+	pub fn from_api(tree: api::Item, path: Substack<Tok<String>>, sys: &System) -> Self {
 		let kind = match tree.kind {
 			api::ItemKind::Member(m) => ItemKind::Member(Member::from_api(m, path, sys)),
 			api::ItemKind::Import(i) =>
-        ItemKind::Import(Import{ path: Sym::from_api(i).iter().collect(), name: None }),
+				ItemKind::Import(Import { path: Sym::from_api(i).iter().collect(), name: None }),
 			api::ItemKind::Export(e) => ItemKind::Export(Tok::from_api(e)),
 			api::ItemKind::Macro(api::MacroBlock { priority, rules }) => ItemKind::Macro(priority, {
 				Vec::from_iter(rules.into_iter().map(|api| Rule {
 					pos: Pos::from_api(&api.location),
-          pattern: mtreev_from_api(&api.pattern, &mut |a| MacTok::Atom(AtomHand::from_api(a.clone()))),
+					pattern: mtreev_from_api(&api.pattern, &mut |a| {
+						MacTok::Atom(AtomHand::from_api(a.clone()))
+					}),
 					kind: RuleKind::Remote(sys.clone(), api.id),
-          comments: api.comments.iter().map(Comment::from_api).collect_vec()
+					comments: api.comments.iter().map(Comment::from_api).collect_vec(),
 				}))
-      })
+			}),
 		};
 		let comments = tree.comments.iter().map(Comment::from_api).collect_vec();
 		Self { pos: Pos::from_api(&tree.location), comments, kind }
@@ -68,19 +66,16 @@ pub struct Member {
 	pub lazy: Mutex<Option<LazyMemberHandle>>,
 }
 impl Member {
-  pub fn from_api(
-    api: api::Member,
-    path: Substack<Tok<String>>,
-    sys: &System,
-  ) -> Self {
+	pub fn from_api(api: api::Member, path: Substack<Tok<String>>, sys: &System) -> Self {
 		let name = Tok::from_api(api.name);
 		let full_path = path.push(name.clone());
 		let kind = match api.kind {
-      api::MemberKind::Lazy(id) =>
-        return LazyMemberHandle(id, sys.clone(), intern(&full_path.unreverse())).into_member(name),
+			api::MemberKind::Lazy(id) => {
+				return LazyMemberHandle(id, sys.clone(), intern(&full_path.unreverse())).into_member(name);
+			},
 			api::MemberKind::Const(c) => MemberKind::Const(Code::from_expr(
 				CodeLocator::to_const(full_path.unreverse()),
-        Expr::from_api(&c, &mut ())
+				Expr::from_api(&c, &mut ()),
 			)),
 			api::MemberKind::Module(m) => MemberKind::Mod(Module::from_api(m, full_path, sys)),
 		};
@@ -176,12 +171,13 @@ impl Code {

 /// Selects a code element
 ///
-/// Either the steps point to a constant and rule_loc is None, or the steps point to a module and
-/// rule_loc selects a macro rule within that module
+/// Either the steps point to a constant and rule_loc is None, or the steps
+/// point to a module and rule_loc selects a macro rule within that module
 #[derive(Clone, Debug, Hash, PartialEq, Eq)]
 pub struct CodeLocator {
 	steps: Tok<Vec<Tok<String>>>,
-  /// Index of a macro block in the module demarked by the steps, and a rule in that macro
+	/// Index of a macro block in the module demarked by the steps, and a rule in
+	/// that macro
 	rule_loc: Option<(u16, u16)>,
 }
 impl CodeLocator {
--- a/orchid-std/Cargo.toml
+++ b/orchid-std/Cargo.toml
@@ -4,12 +4,12 @@ version = "0.1.0"
 edition = "2021"

 [dependencies]
-itertools = "0.13.0"
+itertools = "0.14.0"
 never = "0.1.0"
-once_cell = "1.19.0"
+once_cell = "1.20.2"
 orchid-api = { version = "0.1.0", path = "../orchid-api" }
 orchid-api-derive = { version = "0.1.0", path = "../orchid-api-derive" }
 orchid-api-traits = { version = "0.1.0", path = "../orchid-api-traits" }
 orchid-base = { version = "0.1.0", path = "../orchid-base" }
 orchid-extension = { version = "0.1.0", path = "../orchid-extension" }
-ordered-float = "4.2.1"
+ordered-float = "4.6.0"
--- a/orchid-std/src/number/num_atom.rs
+++ b/orchid-std/src/number/num_atom.rs
@@ -1,6 +1,6 @@
 use orchid_api_derive::Coding;
 use orchid_base::error::OrcRes;
-use orchid_extension::atom::{AtomFactory, MethodSet, Atomic, AtomicFeatures, ToAtom, TypAtom};
+use orchid_extension::atom::{AtomFactory, Atomic, AtomicFeatures, MethodSet, ToAtom, TypAtom};
 use orchid_extension::atom_thin::{ThinAtom, ThinVariant};
 use orchid_extension::conv::TryFromExpr;
 use orchid_extension::expr::Expr;
@@ -11,9 +11,7 @@ pub struct Int(pub i64);
 impl Atomic for Int {
 	type Variant = ThinVariant;
 	type Data = Self;
-  fn reg_reqs() -> MethodSet<Self> {
-    MethodSet::new()
-  }
+	fn reg_reqs() -> MethodSet<Self> { MethodSet::new() }
 }
 impl ThinAtom for Int {}
 impl TryFromExpr for Int {
--- a/orchid-std/src/number/num_lexer.rs
+++ b/orchid-std/src/number/num_lexer.rs
@@ -1,7 +1,7 @@
 use std::ops::RangeInclusive;

 use orchid_base::error::OrcRes;
-use orchid_base::number::{num_to_err, parse_num, Numeric};
+use orchid_base::number::{Numeric, num_to_err, parse_num};
 use orchid_extension::atom::AtomicFeatures;
 use orchid_extension::lexer::{LexContext, Lexer};
 use orchid_extension::tree::{GenTok, GenTokTree};
--- a/orchid-std/src/std.rs
+++ b/orchid-std/src/std.rs
@@ -7,12 +7,12 @@ use orchid_extension::entrypoint::ExtReq;
 use orchid_extension::fs::DeclFs;
 use orchid_extension::system::{System, SystemCard};
 use orchid_extension::system_ctor::SystemCtor;
-use orchid_extension::tree::{comments, fun, module, root_mod, MemKind};
+use orchid_extension::tree::{MemKind, comments, fun, module, root_mod};

+use crate::OrcString;
 use crate::number::num_atom::{Float, Int};
 use crate::string::str_atom::{IntStrAtom, StrAtom};
 use crate::string::str_lexer::StringLexer;
-use crate::OrcString;

 #[derive(Default)]
 pub struct StdSystem;
--- a/orchid-std/src/string/str_atom.rs
+++ b/orchid-std/src/string/str_atom.rs
@@ -5,9 +5,9 @@ use std::sync::Arc;

 use orchid_api_derive::Coding;
 use orchid_api_traits::{Encode, Request};
-use orchid_base::error::{mk_errv, OrcRes};
+use orchid_base::error::{OrcRes, mk_errv};
 use orchid_base::intern;
-use orchid_base::interner::{intern, Tok};
+use orchid_base::interner::{Tok, intern};
 use orchid_extension::atom::{AtomMethod, Atomic, MethodSet, Supports, TypAtom};
 use orchid_extension::atom_owned::{DeserializeCtx, OwnedAtom, OwnedVariant};
 use orchid_extension::conv::TryFromExpr;
--- a/orchid-std/src/string/str_lexer.rs
+++ b/orchid-std/src/string/str_lexer.rs
@@ -1,11 +1,11 @@
 use itertools::Itertools;
-use orchid_base::error::{mk_err, mk_errv, OrcErr, OrcRes};
+use orchid_base::error::{OrcErr, OrcRes, mk_err, mk_errv};
 use orchid_base::interner::intern;
 use orchid_base::location::Pos;
 use orchid_base::tree::{vname_tv, wrap_tokv};
 use orchid_base::{intern, vname};
 use orchid_extension::atom::AtomicFeatures;
-use orchid_extension::lexer::{err_not_applicable, LexContext, Lexer};
+use orchid_extension::lexer::{LexContext, Lexer, err_not_applicable};
 use orchid_extension::tree::{GenTok, GenTokTree};

 use super::str_atom::IntStrAtom;
--- a/orchid.code-workspace
+++ b/orchid.code-workspace
@@ -23,9 +23,9 @@
 			"editor.glyphMargin": false,
 			"editor.rulers": [],
 			"editor.guides.indentation": false,
-			"editor.formatOnSave": true,
 			"editor.formatOnType": true,
 		},
+		"editor.formatOnSave": true,
 		"rust-analyzer.showUnlinkedFileNotification": false,
 		"rust-analyzer.checkOnSave": true,
 		"rust-analyzer.check.command": "clippy",
--- a/orcx/Cargo.toml
+++ b/orcx/Cargo.toml
@@ -6,8 +6,8 @@ edition = "2021"
 # See more keys and their definitions at https://doc.rust-lang.org/cargo/reference/manifest.html

 [dependencies]
-camino = "1.1.7"
-clap = { version = "=4.5.4", features = ["derive"] }
-itertools = "0.13.0"
+camino = "1.1.9"
+clap = { version = "4.5.24", features = ["derive"] }
+itertools = "0.14.0"
 orchid-base = { version = "0.1.0", path = "../orchid-base" }
 orchid-host = { version = "0.1.0", path = "../orchid-host" }
--- a/orcx/src/main.rs
+++ b/orcx/src/main.rs
@@ -9,7 +9,7 @@ use itertools::Itertools;
 use orchid_base::interner::intern;
 use orchid_base::logging::{LogStrategy, Logger};
 use orchid_base::tree::ttv_fmt;
-use orchid_host::extension::{init_systems, Extension};
+use orchid_host::extension::{Extension, init_systems};
 use orchid_host::lex::lex;
 use orchid_host::subprocess::Subprocess;

--- a/rustfmt.toml
+++ b/rustfmt.toml
@@ -1,16 +1,20 @@
 # meta
 format_code_in_doc_comments = true
 unstable_features = true
-version = "Two"
+style_edition = "2024"

 # space
 tab_spaces = 2
+hard_tabs = true
 max_width = 100
 error_on_line_overflow = true
+error_on_unformatted = true
 format_macro_matchers = true
 newline_style = "Unix"
 normalize_comments = true
 wrap_comments = true
+comment_width = 80
+doc_comment_code_block_width = 80
 overflow_delimited_expr = true
 use_small_heuristics = "Max"
 fn_single_line = true
--- a/stdio-perftest/src/main.rs
+++ b/stdio-perftest/src/main.rs
@@ -1,5 +1,5 @@
 use std::env::{self, args};
-use std::io::{stdin, BufRead, BufReader, Write};
+use std::io::{BufRead, BufReader, Write, stdin};
 use std::process;
 use std::time::SystemTime;

--- a/xtask/Cargo.toml
+++ b/xtask/Cargo.toml
@@ -4,4 +4,4 @@ version = "0.1.0"
 edition = "2021"

 [dependencies]
-clap = { version = "=4.5.4", features = ["derive"] }
+clap = { version = "4.5.24", features = ["derive"] }