diff --git a/.github/workflows/test_simpleaf.yml b/.github/workflows/test_simpleaf.yml index 9632bfc..1a76298 100644 --- a/.github/workflows/test_simpleaf.yml +++ b/.github/workflows/test_simpleaf.yml @@ -14,7 +14,7 @@ jobs: if: "!contains(github.event.head_commit.message, 'skip ci')" strategy: matrix: - os: [ubuntu-latest, macos-13] + os: [ubuntu-latest, macos-15] runs-on: ${{ matrix.os }} steps: - name: Checkout repository @@ -27,9 +27,6 @@ jobs: override: true components: rustfmt - - name: Check format - run: cargo fmt -- --check - - name: Build run: cargo build --verbose --release diff --git a/.gitignore b/.gitignore index 270b9d5..9bc7a78 100644 --- a/.gitignore +++ b/.gitignore @@ -22,6 +22,10 @@ TEST_REF TEST_REF_CLAPV4 TEST_REF_ROERS blarg +gencode_v49_simpleaf/ +pbmc_1k_v3_test_quant/ +pbmc_1k_v3_test_quant_new/ +scripts/download_accessions_rush.sh # macOS Finder metadata **/.DS_Store diff --git a/Cargo.lock b/Cargo.lock index 60f74e9..6dc95fb 100644 --- a/Cargo.lock +++ b/Cargo.lock @@ -2,20 +2,11 @@ # It is not intended for manual editing. version = 4 -[[package]] -name = "addr2line" -version = "0.24.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "dfbe277e56a376000877090da837660b4427aad530e3028d44e0bffe4f89a1c1" -dependencies = [ - "gimli", -] - [[package]] name = "adler2" -version = "2.0.0" +version = "2.0.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "512761e0bb2578dd7380c6baaa0f4ce03e84f95e960231d1dec8bf4d7d6e2627" +checksum = "320119579fcad9c21884f5c4861d16174d0e06250625266f50fe6898340abefa" [[package]] name = "af-anndata" @@ -35,22 +26,22 @@ dependencies = [ [[package]] name = "ahash" -version = "0.8.11" +version = "0.8.12" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e89da841a80418a9b391ebaea17f5c112ffaaa96f621d2c285b5174da76b9011" +checksum = "5a15f179cd60c4584b8a8c596927aadc462e27f2ca70c04e0071964a73ba7a75" dependencies = [ "cfg-if", - "getrandom 0.2.16", + "getrandom 0.3.4", "once_cell", "version_check", - "zerocopy 0.7.35", + "zerocopy", ] [[package]] name = "aho-corasick" -version = "1.1.3" +version = "1.1.4" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "8e60d3430d3a69478ad0993f19238d2df97c507009a52b3c10addcd7f6bcb916" +checksum = "ddd31a130427c27518df266943a5308ed92d4b226cc639f5a8f1002816174301" dependencies = [ "memchr", ] @@ -61,12 +52,6 @@ version = "0.2.21" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "683d7910e743518b0e34f1186f92494becacb047c7b6bf616c96772180fef923" -[[package]] -name = "android-tzdata" -version = "0.1.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e999941b234f3131b00bc13c22d06e8c5ff726d1b6318ac7eb276997bbb4fef0" - [[package]] name = "android_system_properties" version = "0.1.5" @@ -84,7 +69,7 @@ checksum = "ca98137d172a44bf6eb43c84aeaf4327bf35c65c36fc6550a5f9014103839d50" dependencies = [ "anyhow", "flate2", - "indexmap 2.9.0", + "indexmap 2.13.0", "itertools 0.13.0", "log", "nalgebra-sparse", @@ -116,19 +101,19 @@ dependencies = [ [[package]] name = "annotate-snippets" -version = "0.9.2" +version = "0.10.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ccaf7e9dfbb6ab22c82e473cd1a8a7bd313c19a5b7e40970f3d89ef5a5c9e81e" +checksum = "6d9b665789884a7e8fb06c84b295e923b03ca51edbb7d08f91a6a50322ecbfe6" dependencies = [ + "anstyle", "unicode-width 0.1.14", - "yansi-term", ] [[package]] name = "anstream" -version = "0.6.18" +version = "1.0.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "8acc5369981196006228e28809f761875c0327210a891e941f4c683b3a99529b" +checksum = "824a212faf96e9acacdbd09febd34438f8f711fb84e09a8916013cd7815ca28d" dependencies = [ "anstyle", "anstyle-parse", @@ -141,44 +126,44 @@ dependencies = [ [[package]] name = "anstyle" -version = "1.0.10" +version = "1.0.14" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "55cc3b69f167a1ef2e161439aa98aed94e6028e5f9a59be9a6ffb47aef1651f9" +checksum = "940b3a0ca603d1eade50a4846a2afffd5ef57a9feac2c0e2ec2e14f9ead76000" [[package]] name = "anstyle-parse" -version = "0.2.6" +version = "1.0.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "3b2d16507662817a6a20a9ea92df6652ee4f94f914589377d69f3b21bc5798a9" +checksum = "52ce7f38b242319f7cabaa6813055467063ecdc9d355bbb4ce0c68908cd8130e" dependencies = [ "utf8parse", ] [[package]] name = "anstyle-query" -version = "1.1.2" +version = "1.1.5" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "79947af37f4177cfead1110013d678905c37501914fba0efea834c3fe9a8d60c" +checksum = "40c48f72fd53cd289104fc64099abca73db4166ad86ea0b4341abe65af83dadc" dependencies = [ - "windows-sys 0.59.0", + "windows-sys 0.61.2", ] [[package]] name = "anstyle-wincon" -version = "3.0.7" +version = "3.0.11" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ca3534e77181a9cc07539ad51f2141fe32f6c3ffd4df76db8ad92346b003ae4e" +checksum = "291e6a250ff86cd4a820112fb8898808a366d8f9f58ce16d1f538353ad55747d" dependencies = [ "anstyle", - "once_cell", - "windows-sys 0.59.0", + "once_cell_polyfill", + "windows-sys 0.61.2", ] [[package]] name = "anyhow" -version = "1.0.98" +version = "1.0.102" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e16d2d3311acee920a9eb8d33b8cbc1787ce4a264e85f964c2404b969bdcd487" +checksum = "7f202df86484c868dbad7eaa557ef785d5c66295e41b460ef922eca0723b842c" [[package]] name = "approx" @@ -189,11 +174,20 @@ dependencies = [ "num-traits", ] +[[package]] +name = "ar_archive_writer" +version = "0.5.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "7eb93bbb63b9c227414f6eb3a0adfddca591a8ce1e9b60661bb08969b87e340b" +dependencies = [ + "object", +] + [[package]] name = "argminmax" -version = "0.6.2" +version = "0.6.3" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "52424b59d69d69d5056d508b260553afd91c57e21849579cd1f50ee8b8b88eaa" +checksum = "70f13d10a41ac8d2ec79ee34178d61e6f47a29c2edfe7ef1721c7383b0359e65" dependencies = [ "num-traits", ] @@ -241,18 +235,18 @@ checksum = "c7c24de15d275a1ecfd47a380fb4d5ec9bfe0933f309ed5e705b775596a3574d" dependencies = [ "proc-macro2", "quote", - "syn 2.0.101", + "syn 2.0.117", ] [[package]] name = "async-trait" -version = "0.1.88" +version = "0.1.89" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e539d3fca749fcee5236ab05e93a52867dd549cc157c8cb7f99595f3cedffdb5" +checksum = "9035ad2d096bed7955a320ee7e2230574d28fd3c3a0f186cbea1ff3c7eed5dbb" dependencies = [ "proc-macro2", "quote", - "syn 2.0.101", + "syn 2.0.117", ] [[package]] @@ -266,9 +260,12 @@ dependencies = [ [[package]] name = "atoi_simd" -version = "0.16.0" +version = "0.16.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "4790f9e8961209112beb783d85449b508673cf4a6a419c8449b210743ac4dbe9" +checksum = "c2a49e05797ca52e312a0c658938b7d00693ef037799ef7187678f212d7684cf" +dependencies = [ + "debug_unsafe", +] [[package]] name = "atomic-waker" @@ -278,30 +275,9 @@ checksum = "1505bd5d3d116872e7271a6d4e16d81d0c8570876c8de68093a09ac269d8aac0" [[package]] name = "autocfg" -version = "1.4.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ace50bade8e6234aa140d9a2f552bbee1db4d353f69b8217bc503490fc1a9f26" - -[[package]] -name = "backtrace" -version = "0.3.74" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "8d82cb332cdfaed17ae235a638438ac4d4839913cc2af585c3c6746e8f8bee1a" -dependencies = [ - "addr2line", - "cfg-if", - "libc", - "miniz_oxide", - "object", - "rustc-demangle", - "windows-targets 0.52.6", -] - -[[package]] -name = "base64" -version = "0.21.7" +version = "1.5.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "9d297deb1925b89f2ccc13d7635fa0714f12c87adce1c75356b39ca9b7178567" +checksum = "c08606f8c3cbf4ce6ec8e28fb0014a2c086708fe954eaa885384a6165172e7e8" [[package]] name = "base64" @@ -323,21 +299,22 @@ checksum = "bef38d45163c2f1dde094a7dfd33ccf595c92905c8f8f4fdc18d06fb1037718a" [[package]] name = "bitflags" -version = "2.9.0" +version = "2.11.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "5c8214115b7bf84099f1309324e63141d4c5d7cc26862f97a0a857dbefe165bd" +checksum = "843867be96c8daad0d758b57df9392b6d8d271134fce549de6ce169ff98a92af" [[package]] name = "blake3" -version = "1.8.2" +version = "1.8.3" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "3888aaa89e4b2a40fca9848e400f6a658a5a3978de7be858e209cafa8be9a4a0" +checksum = "2468ef7d57b3fb7e16b576e8377cdbde2320c60e1491e961d11da40fc4f02a2d" dependencies = [ "arrayref", "arrayvec", "cc", "cfg-if", "constant_time_eq", + "cpufeatures", "memmap2", "serde", ] @@ -353,9 +330,9 @@ dependencies = [ [[package]] name = "bstr" -version = "1.12.0" +version = "1.12.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "234113d19d0d7d613b40e86fb654acf958910802bcceab913a4f9e7cda03b1a4" +checksum = "63044e1ae8e69f3b5a92c736ca6269b8d12fa7efe39bf34ddb06d102cf0e2cab" dependencies = [ "memchr", "serde", @@ -363,43 +340,43 @@ dependencies = [ [[package]] name = "buffer-redux" -version = "1.0.2" +version = "1.1.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "4e8acf87c5b9f5897cd3ebb9a327f420e0cae9dd4e5c1d2e36f2c84c571a58f1" +checksum = "431a9cc8d7efa49bc326729264537f5e60affce816c66edf434350778c9f4f54" dependencies = [ "memchr", ] [[package]] name = "bumpalo" -version = "3.17.0" +version = "3.20.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "1628fb46dfa0b37568d12e5edd512553eccf6a22a78e8bde00bb4aed84d5bdbf" +checksum = "5d20789868f4b01b2f2caec9f5c4e0213b41e3e5702a50157d699ae31ced2fcb" [[package]] name = "bytecount" -version = "0.6.8" +version = "0.6.9" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "5ce89b21cab1437276d2650d57e971f9d548a2d9037cc231abdc0562b97498ce" +checksum = "175812e0be2bccb6abe50bb8d566126198344f707e304f45c648fd8f2cc0365e" [[package]] name = "bytemuck" -version = "1.23.0" +version = "1.25.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "9134a6ef01ce4b366b50689c94f82c14bc72bc5d0386829828a2e2752ef7958c" +checksum = "c8efb64bd706a16a1bdde310ae86b351e4d21550d98d056f22f8a7f7a2183fec" dependencies = [ "bytemuck_derive", ] [[package]] name = "bytemuck_derive" -version = "1.9.3" +version = "1.10.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "7ecc273b49b3205b83d648f0690daa588925572cc5063745bfe547fe7ec8e1a1" +checksum = "f9abbd1bc6865053c427f7198e6af43bfdedc55ab791faed4fbd361d789575ff" dependencies = [ "proc-macro2", "quote", - "syn 2.0.101", + "syn 2.0.117", ] [[package]] @@ -410,9 +387,9 @@ checksum = "1fd0f2584146f6f2ef48085050886acf353beff7305ebd1ae69500e27c67f64b" [[package]] name = "bytes" -version = "1.10.1" +version = "1.11.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d71b6127be86fdcfddb610f7182ac57211d4b18a3e9c82eb2d17662f2227ad6a" +checksum = "1e748733b7cbc798e1434b6ac524f0c1ff2ab456fe201501e6497c8417a4fc33" [[package]] name = "bzip2" @@ -436,19 +413,20 @@ dependencies = [ [[package]] name = "castaway" -version = "0.2.3" +version = "0.2.4" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "0abae9be0aaf9ea96a3b1b8b1b55c602ca751eba1b1500220cea4ecbafe7c0d5" +checksum = "dec551ab6e7578819132c713a93c022a05d60159dc86e7a7050223577484c55a" dependencies = [ "rustversion", ] [[package]] name = "cc" -version = "1.2.20" +version = "1.2.57" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "04da6a0d40b948dfc4fa8f5bbf402b0fc1a64a28dbf7d12ffd683550f2c1b63a" +checksum = "7a0dd1ca384932ff3641c8718a02769f1698e7563dc6974ffd03346116310423" dependencies = [ + "find-msvc-tools", "jobserver", "libc", "shlex", @@ -456,17 +434,16 @@ dependencies = [ [[package]] name = "cfg-if" -version = "1.0.0" +version = "1.0.4" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "baf1de4339761588bc0619e3cbc0120ee582ebb74b53b4efbf79117bd2da40fd" +checksum = "9330f8b2ff13f34540b44e946ef35111825727b38d33286ef986142615121801" [[package]] name = "chrono" -version = "0.4.41" +version = "0.4.44" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c469d952047f47f91b68d1cba3f10d63c11d73e4636f24f08daf0278abf01c4d" +checksum = "c673075a2e0e5f4a1dde27ce9dee1ea4558c7ffe648f576438a20ca1d2acc4b0" dependencies = [ - "android-tzdata", "iana-time-zone", "js-sys", "num-traits", @@ -476,30 +453,19 @@ dependencies = [ [[package]] name = "chrono-tz" -version = "0.10.3" +version = "0.10.4" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "efdce149c370f133a071ca8ef6ea340b7b88748ab0810097a9e2976eaa34b4f3" +checksum = "a6139a8597ed92cf816dfb33f5dd6cf0bb93a6adc938f11039f371bc5bcd26c3" dependencies = [ "chrono", - "chrono-tz-build", - "phf", -] - -[[package]] -name = "chrono-tz-build" -version = "0.4.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "8f10f8c9340e31fc120ff885fcdb54a0b48e474bbd77cab557f0c30a3e569402" -dependencies = [ - "parse-zoneinfo", - "phf_codegen", + "phf 0.12.1", ] [[package]] name = "clap" -version = "4.5.37" +version = "4.6.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "eccb054f56cbd38340b380d4a8e69ef1f02f1af43db2f0cc817a4774d80ae071" +checksum = "b193af5b67834b676abd72466a96c1024e6a6ad978a1f484bd90b85c94041351" dependencies = [ "clap_builder", "clap_derive", @@ -507,49 +473,49 @@ dependencies = [ [[package]] name = "clap_builder" -version = "4.5.37" +version = "4.6.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "efd9466fac8543255d3b1fcad4762c5e116ffe808c8a3043d4263cd4fd4862a2" +checksum = "714a53001bf66416adb0e2ef5ac857140e7dc3a0c48fb28b2f10762fc4b5069f" dependencies = [ "anstream", "anstyle", "clap_lex", - "strsim 0.11.1", + "strsim", "terminal_size", ] [[package]] name = "clap_derive" -version = "4.5.32" +version = "4.6.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "09176aae279615badda0765c0c0b3f6ed53f4709118af73cf4655d85d1530cd7" +checksum = "1110bd8a634a1ab8cb04345d8d878267d57c3cf1b38d91b71af6686408bbca6a" dependencies = [ "heck", "proc-macro2", "quote", - "syn 2.0.101", + "syn 2.0.117", ] [[package]] name = "clap_lex" -version = "0.7.4" +version = "1.1.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f46ad14479a25103f283c0f10005961cf086d8dc42205bb44c46ac563475dca6" +checksum = "c8d4a3bb8b1e0c1050499d1815f5ab16d04f0959b233085fb31653fbfc9d98f9" [[package]] name = "cmake" -version = "0.1.54" +version = "0.1.57" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e7caa3f9de89ddbe2c607f4101924c5abec803763ae9534e4f4d7d8f84aa81f0" +checksum = "75443c44cd6b379beb8c5b45d85d0773baf31cce901fe7bb252f4eff3008ef7d" dependencies = [ "cc", ] [[package]] name = "cmd_lib" -version = "1.9.5" +version = "1.9.6" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "371c15a3c178d0117091bd84414545309ca979555b1aad573ef591ad58818d41" +checksum = "1af0f9b65935ff457da75535a6b6ff117ac858f03f71191188b3b696f90aec5a" dependencies = [ "cmd_lib_macros", "env_logger", @@ -561,31 +527,31 @@ dependencies = [ [[package]] name = "cmd_lib_macros" -version = "1.9.5" +version = "1.9.6" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "cb844bd05be34d91eb67101329aeba9d3337094c04fd8507d821db7ebb488eaf" +checksum = "1e69eee115667ccda8b9ed7010bcf13356ad45269fc92aa78534890b42809a64" dependencies = [ "proc-macro-error2", "proc-macro2", "quote", - "syn 2.0.101", + "syn 2.0.117", ] [[package]] name = "colorchoice" -version = "1.0.3" +version = "1.0.5" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "5b63caa9aa9397e2d9480a9b13673856c78d8ac123288526c37d7839f2a86990" +checksum = "1d07550c9036bf2ae0c684c4297d503f838287c83c53686d05370d0e139ae570" [[package]] name = "comfy-table" -version = "7.1.4" +version = "7.2.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "4a65ebfec4fb190b6f90e944a817d60499ee0744e582530e2c9900a22e591d9a" +checksum = "958c5d6ecf1f214b4c2bbbbf6ab9523a864bd136dcf71a7e8904799acfe1ad47" dependencies = [ "crossterm", "unicode-segmentation", - "unicode-width 0.2.0", + "unicode-width 0.2.2", ] [[package]] @@ -605,9 +571,9 @@ dependencies = [ [[package]] name = "constant_time_eq" -version = "0.3.1" +version = "0.4.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "7c74b8349d32d297c9134b8c88677813a227df8f779daa29bfc29c183fe3dca6" +checksum = "3d52eff69cd5e647efe296129160853a42795992097e8af39800e1060caeea9b" [[package]] name = "convert_case" @@ -631,14 +597,14 @@ dependencies = [ [[package]] name = "cookie_store" -version = "0.21.1" +version = "0.22.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "2eac901828f88a5241ee0600950ab981148a18f2f756900ffba1b125ca6a3ef9" +checksum = "15b2c103cf610ec6cae3da84a766285b42fd16aad564758459e6ecf128c75206" dependencies = [ "cookie", "document-features", "idna", - "indexmap 2.9.0", + "indexmap 2.13.0", "log", "serde", "serde_derive", @@ -664,9 +630,9 @@ dependencies = [ [[package]] name = "crc32fast" -version = "1.4.2" +version = "1.5.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a97769d94ddab943e4510d138150169a2758b5ef3eb191a9ee688de3e23ef7b3" +checksum = "9481c1c90cbf2ac953f07c8d4a58aa3945c425b7185c9154d67a65e4230da511" dependencies = [ "cfg-if", ] @@ -716,14 +682,15 @@ checksum = "d0a5c400df2834b80a4c3327b3aad3a4c4cd4de0629063962b03235697506a28" [[package]] name = "crossterm" -version = "0.28.1" +version = "0.29.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "829d955a0bb380ef178a640b91779e3987da38c9aea133b20614cfed8cdea9c6" +checksum = "d8b9f2e4c67f833b660cdb0a3523065869fb35570177239812ed4c905aeff87b" dependencies = [ - "bitflags 2.9.0", + "bitflags 2.11.0", "crossterm_winapi", + "document-features", "parking_lot", - "rustix 0.38.44", + "rustix", "winapi", ] @@ -738,9 +705,9 @@ dependencies = [ [[package]] name = "crypto-common" -version = "0.1.6" +version = "0.1.7" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "1bfb12502f3fc46cca1bb51ac28df9d618d813cdc3d2f25b9fe775a34af26bb3" +checksum = "78c8292055d1c1df0cce5d180393dc8cce0abec0a7102adb6c7b1eef6016d60a" dependencies = [ "generic-array", "typenum", @@ -748,44 +715,39 @@ dependencies = [ [[package]] name = "csv" -version = "1.3.1" +version = "1.4.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "acdc4883a9c96732e4733212c01447ebd805833b7275a73ca3ee080fd77afdaf" +checksum = "52cd9d68cf7efc6ddfaaee42e7288d3a99d613d4b50f76ce9827ae0c6e14f938" dependencies = [ "csv-core", "itoa", "ryu", - "serde", + "serde_core", ] [[package]] name = "csv-core" -version = "0.1.12" +version = "0.1.13" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "7d02f3b0da4c6504f86e9cd789d8dbafab48c2321be74e9987593de5a894d93d" +checksum = "704a3c26996a80471189265814dbc2c257598b96b8a7feae2d31ace646bb9782" dependencies = [ "memchr", ] [[package]] -name = "deranged" -version = "0.4.0" +name = "debug_unsafe" +version = "0.1.4" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "9c9e6a11ca8224451684bc0d7d5a7adbf8f2fd6887261a1cfc3c0432f9d4068e" -dependencies = [ - "powerfmt", - "serde", -] +checksum = "7eed2c4702fa172d1ce21078faa7c5203e69f5394d48cc436d25928394a867a2" [[package]] -name = "derivative" -version = "2.2.0" +name = "deranged" +version = "0.5.8" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "fcc3dd5e9e9c0b295d6e1e4d811fb6f157d5ffd784b8d202fc62eac8035a770b" +checksum = "7cd812cc2bc1d69d4764bd80df88b4317eaef9e773c75226407d9bc0876b211c" dependencies = [ - "proc-macro2", - "quote", - "syn 1.0.109", + "powerfmt", + "serde_core", ] [[package]] @@ -806,23 +768,23 @@ checksum = "97369cbbc041bc366949bc74d34658d6cda5621039731c6310521892a3a20ae0" dependencies = [ "proc-macro2", "quote", - "syn 2.0.101", + "syn 2.0.117", ] [[package]] name = "document-features" -version = "0.2.11" +version = "0.2.12" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "95249b50c6c185bee49034bcb378a49dc2b5dff0be90ff6616d31d64febab05d" +checksum = "d4b8a88685455ed29a21542a33abd9cb6510b6b129abadabdcef0f4c55bc8f61" dependencies = [ "litrs", ] [[package]] name = "dyn-clone" -version = "1.0.19" +version = "1.0.20" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "1c7a8fb8a9fbf66c1f703fe16184d10ca0ee9d23be5b4436400408ba54a95005" +checksum = "d0881ea181b1df73ff77ffaaf9c7544ecc11e82fba9b5f27b262a3c73a332555" [[package]] name = "either" @@ -839,15 +801,9 @@ dependencies = [ "once_cell", "proc-macro2", "quote", - "syn 2.0.101", + "syn 2.0.117", ] -[[package]] -name = "env_home" -version = "0.1.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c7f84e12ccf0a7ddc17a6c41c93326024c42920d7ee630d04950e6926645c0fe" - [[package]] name = "env_logger" version = "0.10.2" @@ -869,19 +825,19 @@ checksum = "877a4ace8713b0bcf2a4e7eec82529c029f1d0619886d18145fea96c3ffe5c0f" [[package]] name = "errno" -version = "0.3.11" +version = "0.3.14" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "976dd42dc7e85965fe702eb8164f21f450704bdde31faefd6471dba214cb594e" +checksum = "39cab71617ae0d63f51a36d69f866391735b51691dbda63cf6f96d042b63efeb" dependencies = [ "libc", - "windows-sys 0.59.0", + "windows-sys 0.61.2", ] [[package]] name = "ethnum" -version = "1.5.1" +version = "1.5.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "0939f82868b77ef93ce3c3c3daf2b3c526b456741da5a1a4559e590965b6026b" +checksum = "ca81e6b4777c89fd810c25a4be2b1bd93ea034fbe58e6a75216a34c6b82c539b" [[package]] name = "faccess" @@ -918,14 +874,20 @@ version = "0.1.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "2ab1300e0345c97d6d5ed20b90d53ea83e710e971215b47590ac5c6c69847b65" dependencies = [ - "thiserror 2.0.12", + "thiserror 2.0.18", ] +[[package]] +name = "find-msvc-tools" +version = "0.1.9" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "5baebc0774151f905a1a2cc41989300b1e6fbb29aff0ceffa1064fdd3088d582" + [[package]] name = "flate2" -version = "1.1.1" +version = "1.1.9" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "7ced92e76e966ca2fd84c8f7aa01a4aea65b0eb6648d72f7c8f3e2764a67fece" +checksum = "843fba2746e448b37e26a819579957415c8cef339bf08564fe8b7ddbd959573c" dependencies = [ "crc32fast", "libz-ng-sys", @@ -955,18 +917,18 @@ checksum = "d9c4f5dac5e15c24eb999c26181a6ca40b39fe946cbe4c263c7209467bc83af2" [[package]] name = "form_urlencoded" -version = "1.2.1" +version = "1.2.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e13624c2627564efccf4934284bdd98cbaa14e79b0b5a141218e507b3a823456" +checksum = "cb4cb245038516f5f85277875cdaa4f7d2c9a0fa0468de06ed190163b1581fcf" dependencies = [ "percent-encoding", ] [[package]] name = "futures" -version = "0.3.31" +version = "0.3.32" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "65bc07b1a8bc7c85c5f2e110c476c7389b4554ba72af57d8445ea63a576b0876" +checksum = "8b147ee9d1f6d097cef9ce628cd2ee62288d963e16fb287bd9286455b241382d" dependencies = [ "futures-channel", "futures-core", @@ -979,9 +941,9 @@ dependencies = [ [[package]] name = "futures-channel" -version = "0.3.31" +version = "0.3.32" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "2dff15bf788c671c1934e366d07e30c1814a8ef514e1af724a602e8a2fbe1b10" +checksum = "07bbe89c50d7a535e539b8c17bc0b49bdb77747034daa8087407d655f3f7cc1d" dependencies = [ "futures-core", "futures-sink", @@ -989,15 +951,15 @@ dependencies = [ [[package]] name = "futures-core" -version = "0.3.31" +version = "0.3.32" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "05f29059c0c2090612e8d742178b0580d2dc940c837851ad723096f87af6663e" +checksum = "7e3450815272ef58cec6d564423f6e755e25379b217b0bc688e295ba24df6b1d" [[package]] name = "futures-executor" -version = "0.3.31" +version = "0.3.32" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "1e28d1d997f585e54aebc3f97d39e72338912123a67330d723fdbb564d646c9f" +checksum = "baf29c38818342a3b26b5b923639e7b1f4a61fc5e76102d4b1981c6dc7a7579d" dependencies = [ "futures-core", "futures-task", @@ -1006,38 +968,38 @@ dependencies = [ [[package]] name = "futures-io" -version = "0.3.31" +version = "0.3.32" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "9e5c1b78ca4aae1ac06c48a526a655760685149f0d465d21f37abfe57ce075c6" +checksum = "cecba35d7ad927e23624b22ad55235f2239cfa44fd10428eecbeba6d6a717718" [[package]] name = "futures-macro" -version = "0.3.31" +version = "0.3.32" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "162ee34ebcb7c64a8abebc059ce0fee27c2262618d7b60ed8faf72fef13c3650" +checksum = "e835b70203e41293343137df5c0664546da5745f82ec9b84d40be8336958447b" dependencies = [ "proc-macro2", "quote", - "syn 2.0.101", + "syn 2.0.117", ] [[package]] name = "futures-sink" -version = "0.3.31" +version = "0.3.32" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e575fab7d1e0dcb8d0c7bcf9a63ee213816ab51902e6d244a95819acacf1d4f7" +checksum = "c39754e157331b013978ec91992bde1ac089843443c49cbc7f46150b0fad0893" [[package]] name = "futures-task" -version = "0.3.31" +version = "0.3.32" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f90f7dce0722e95104fcb095585910c0977252f286e354b5e3bd38902cd99988" +checksum = "037711b3d59c33004d3856fbdc83b99d4ff37a24768fa1be9ce3538a1cde4393" [[package]] name = "futures-util" -version = "0.3.31" +version = "0.3.32" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "9fa08315bb612088cc391249efdc3bc77536f16c91f6cf495e6fbe85b20a4a81" +checksum = "389ca41296e6190b48053de0321d02a77f32f8a5d2461dd38762c0593805c6d6" dependencies = [ "futures-channel", "futures-core", @@ -1047,7 +1009,6 @@ dependencies = [ "futures-task", "memchr", "pin-project-lite", - "pin-utils", "slab", ] @@ -1063,40 +1024,47 @@ dependencies = [ [[package]] name = "getrandom" -version = "0.2.16" +version = "0.2.17" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "335ff9f135e4384c8150d6f27c6daed433577f86b4750418338c01a1a2528592" +checksum = "ff2abc00be7fca6ebc474524697ae276ad847ad0a6b3faa4bcb027e9a4614ad0" dependencies = [ "cfg-if", "js-sys", "libc", - "wasi 0.11.0+wasi-snapshot-preview1", + "wasi", "wasm-bindgen", ] [[package]] name = "getrandom" -version = "0.3.2" +version = "0.3.4" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "73fea8450eea4bac3940448fb7ae50d91f034f941199fcd9d909a5a07aa455f0" +checksum = "899def5c37c4fd7b2664648c28120ecec138e4d395b459e5ca34f9cce2dd77fd" dependencies = [ "cfg-if", "libc", - "r-efi", - "wasi 0.14.2+wasi-0.2.4", + "r-efi 5.3.0", + "wasip2", ] [[package]] -name = "gimli" -version = "0.31.1" +name = "getrandom" +version = "0.4.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "07e28edb80900c19c28f1072f2e8aeca7fa06b23cd4169cefe1af5aa3260783f" +checksum = "0de51e6874e94e7bf76d726fc5d13ba782deca734ff60d5bb2fb2607c7406555" +dependencies = [ + "cfg-if", + "libc", + "r-efi 6.0.0", + "wasip2", + "wasip3", +] [[package]] name = "glob" -version = "0.3.2" +version = "0.3.3" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a8d1add55171497b4705a648c6b583acafb01d58050a51727785f0b2c8e0a2b2" +checksum = "0cc23270f6e1808e30a928bdc84dea0b9b4136a8bc82338574f23baf47bbd280" [[package]] name = "grangers" @@ -1129,15 +1097,6 @@ version = "0.12.3" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "8a9ee70c43aaf417c914396645a0fa852624801b24ebb7ae78fe8272889ac888" -[[package]] -name = "hashbrown" -version = "0.13.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "43a3c133739dddd0d2990f9a4bdf8eb4b21ef50e4851ca85ab661199821d510e" -dependencies = [ - "ahash", -] - [[package]] name = "hashbrown" version = "0.14.5" @@ -1152,9 +1111,9 @@ dependencies = [ [[package]] name = "hashbrown" -version = "0.15.2" +version = "0.15.5" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "bf151400ff0baff5465007dd2f3e717f3fe502074ca563069ce3a6629d07b289" +checksum = "9229cfe53dfd69f0609a49f65461bd93001ea1ef889cd5529dd176593f5338a1" dependencies = [ "allocator-api2", "equivalent", @@ -1163,13 +1122,19 @@ dependencies = [ "serde", ] +[[package]] +name = "hashbrown" +version = "0.16.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "841d1cc9bed7f9236f321df977030373f4a4163ae1a7dbfe1a51a2c1a51d9100" + [[package]] name = "hdf5-metno" version = "0.9.2" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "3167207f341f305141d3fbae48690442cb4b57771c827ccfae7b66b7cd8891bc" dependencies = [ - "bitflags 2.9.0", + "bitflags 2.11.0", "cfg-if", "hdf5-metno-derive", "hdf5-metno-sys", @@ -1182,22 +1147,22 @@ dependencies = [ [[package]] name = "hdf5-metno-derive" -version = "0.9.2" +version = "0.9.3" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "25557ccc26f5b17b8f6014c58761e5eb53e815728907071999c3957bfee23bc2" +checksum = "205c825c5140aa2791cec795068e8aa8d299862009b7fbd59bd4d876b47842c5" dependencies = [ "proc-macro-crate", "proc-macro-error2", "proc-macro2", "quote", - "syn 2.0.101", + "syn 2.0.117", ] [[package]] name = "hdf5-metno-src" -version = "0.9.4" +version = "0.9.5" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "956b57b8b4e133bcfbc874a2c9c6d4020e0da420dcfa05aea79091888f2b0763" +checksum = "36b0303729f84fb0f2dc510d28b64cb716fb13e6a139a17e88db329123ecff82" dependencies = [ "cmake", "libz-sys", @@ -1241,9 +1206,9 @@ checksum = "2304e00983f87ffb38b55b444b5e3b60a884b5d30c0fca7d82fe33449bbe55ea" [[package]] name = "hermit-abi" -version = "0.5.0" +version = "0.5.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "fbd780fe5cc30f81464441920d82ac8740e2e46b29a6fad543ddd075229ce37e" +checksum = "fc0fef456e4baa96da950455cd02c081ca953b141298e41db3fc7e36b1da849c" [[package]] name = "hex" @@ -1251,23 +1216,35 @@ version = "0.4.3" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "7f24254aa9a54b5c858eaee2f5bccdb46aaf0e486a595ed5fd8f86ba55232a70" +[[package]] +name = "hi-doc" +version = "0.1.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "d2390a0c9be1370168ef9557833bad3bfa37e1720df61d7f7034f18c07b4e006" +dependencies = [ + "num-traits", + "rand", + "random_color", + "range-map", + "smallvec", +] + [[package]] name = "home" -version = "0.5.11" +version = "0.5.12" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "589533453244b0995c858700322199b2becb13b627df2851f64a2775d024abcf" +checksum = "cc627f471c528ff0c4a49e1d5e60450c8f6461dd6d10ba9dcd3a61d3dff7728d" dependencies = [ - "windows-sys 0.59.0", + "windows-sys 0.61.2", ] [[package]] name = "http" -version = "1.3.1" +version = "1.4.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f4a85d31aea989eead29a3aaf9e1115a180df8282431156e533de47660892565" +checksum = "e3ba2a386d7f85a81f119ad7498ebe444d2e22c2af0b86b069416ace48b3311a" dependencies = [ "bytes", - "fnv", "itoa", ] @@ -1279,15 +1256,15 @@ checksum = "6dbf3de79e51f3d586ab4cb9d5c3e2c14aa28ed23d180cf89b4df0454a69cc87" [[package]] name = "humantime" -version = "2.2.0" +version = "2.3.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "9b112acc8b3adf4b107a8ec20977da0273a8c386765a3ec0229bd500a1443f9f" +checksum = "135b12329e5e3ce057a9f972339ea52bc954fe1e9358ef27f95e89716fbc5424" [[package]] name = "iana-time-zone" -version = "0.1.63" +version = "0.1.65" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b0c919e5debc312ad217002b8048a17b7d83f80703865bbfcfebb0458b0b27d8" +checksum = "e31bc9ad994ba00e440a8aa5c9ef0ec67d5cb5e5cb0cc7f8b744a35b389cc470" dependencies = [ "android_system_properties", "core-foundation-sys", @@ -1295,7 +1272,7 @@ dependencies = [ "js-sys", "log", "wasm-bindgen", - "windows-core 0.61.0", + "windows-core", ] [[package]] @@ -1309,21 +1286,22 @@ dependencies = [ [[package]] name = "icu_collections" -version = "1.5.0" +version = "2.1.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "db2fa452206ebee18c4b5c2274dbf1de17008e874b4dc4f0aea9d01ca79e4526" +checksum = "4c6b649701667bbe825c3b7e6388cb521c23d88644678e83c0c4d0a621a34b43" dependencies = [ "displaydoc", + "potential_utf", "yoke", "zerofrom", "zerovec", ] [[package]] -name = "icu_locid" -version = "1.5.0" +name = "icu_locale_core" +version = "2.1.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "13acbb8371917fc971be86fc8057c41a64b521c184808a698c02acc242dbf637" +checksum = "edba7861004dd3714265b4db54a3c390e880ab658fec5f7db895fae2046b5bb6" dependencies = [ "displaydoc", "litemap", @@ -1332,104 +1310,72 @@ dependencies = [ "zerovec", ] -[[package]] -name = "icu_locid_transform" -version = "1.5.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "01d11ac35de8e40fdeda00d9e1e9d92525f3f9d887cdd7aa81d727596788b54e" -dependencies = [ - "displaydoc", - "icu_locid", - "icu_locid_transform_data", - "icu_provider", - "tinystr", - "zerovec", -] - -[[package]] -name = "icu_locid_transform_data" -version = "1.5.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "7515e6d781098bf9f7205ab3fc7e9709d34554ae0b21ddbcb5febfa4bc7df11d" - [[package]] name = "icu_normalizer" -version = "1.5.0" +version = "2.1.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "19ce3e0da2ec68599d193c93d088142efd7f9c5d6fc9b803774855747dc6a84f" +checksum = "5f6c8828b67bf8908d82127b2054ea1b4427ff0230ee9141c54251934ab1b599" dependencies = [ - "displaydoc", "icu_collections", "icu_normalizer_data", "icu_properties", "icu_provider", "smallvec", - "utf16_iter", - "utf8_iter", - "write16", "zerovec", ] [[package]] name = "icu_normalizer_data" -version = "1.5.1" +version = "2.1.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c5e8338228bdc8ab83303f16b797e177953730f601a96c25d10cb3ab0daa0cb7" +checksum = "7aedcccd01fc5fe81e6b489c15b247b8b0690feb23304303a9e560f37efc560a" [[package]] name = "icu_properties" -version = "1.5.1" +version = "2.1.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "93d6020766cfc6302c15dbbc9c8778c37e62c14427cb7f6e601d849e092aeef5" +checksum = "020bfc02fe870ec3a66d93e677ccca0562506e5872c650f893269e08615d74ec" dependencies = [ - "displaydoc", "icu_collections", - "icu_locid_transform", + "icu_locale_core", "icu_properties_data", "icu_provider", - "tinystr", + "zerotrie", "zerovec", ] [[package]] name = "icu_properties_data" -version = "1.5.1" +version = "2.1.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "85fb8799753b75aee8d2a21d7c14d9f38921b54b3dbda10f5a3c7a7b82dba5e2" +checksum = "616c294cf8d725c6afcd8f55abc17c56464ef6211f9ed59cccffe534129c77af" [[package]] name = "icu_provider" -version = "1.5.0" +version = "2.1.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "6ed421c8a8ef78d3e2dbc98a973be2f3770cb42b606e3ab18d6237c4dfde68d9" +checksum = "85962cf0ce02e1e0a629cc34e7ca3e373ce20dda4c4d7294bbd0bf1fdb59e614" dependencies = [ "displaydoc", - "icu_locid", - "icu_provider_macros", - "stable_deref_trait", - "tinystr", + "icu_locale_core", "writeable", "yoke", "zerofrom", + "zerotrie", "zerovec", ] [[package]] -name = "icu_provider_macros" -version = "1.5.0" +name = "id-arena" +version = "2.3.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "1ec89e9337638ecdc08744df490b221a7399bf8d164eb52a665454e60e075ad6" -dependencies = [ - "proc-macro2", - "quote", - "syn 2.0.101", -] +checksum = "3d3067d79b975e8844ca9eb072e16b31c3c1c36928edf9c6789548c524d0d954" [[package]] name = "idna" -version = "1.0.3" +version = "1.1.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "686f825264d630750a544639377bae737628043f20d38bbc029e8f29ea968a7e" +checksum = "3b0875f23caa03898994f6ddc501886a45c7d3d62d04d2d90788d47be1b1e4de" dependencies = [ "idna_adapter", "smallvec", @@ -1438,9 +1384,9 @@ dependencies = [ [[package]] name = "idna_adapter" -version = "1.2.0" +version = "1.2.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "daca1df1c957320b2cf139ac61e7bd64fed304c5040df000a745aa1de3b4ef71" +checksum = "3acae9609540aa318d1bc588455225fb2085b9ed0c4f6bd0d9d5bcd86f1a0344" dependencies = [ "icu_normalizer", "icu_properties", @@ -1458,32 +1404,33 @@ dependencies = [ [[package]] name = "indexmap" -version = "2.9.0" +version = "2.13.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "cea70ddb795996207ad57735b50c5982d8844f38ba9ee5f1aedcfb708a2aa11e" +checksum = "7714e70437a7dc3ac8eb7e6f8df75fd8eb422675fc7678aff7364301092b1017" dependencies = [ "equivalent", - "hashbrown 0.15.2", + "hashbrown 0.16.1", "rayon", "serde", + "serde_core", ] [[package]] name = "is-terminal" -version = "0.4.16" +version = "0.4.17" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e04d7f318608d35d4b61ddd75cbdaee86b023ebe2bd5a66ee0915f0bf93095a9" +checksum = "3640c1c38b8e4e43584d8df18be5fc6b0aa314ce6ebf51b53313d4306cca8e46" dependencies = [ "hermit-abi", "libc", - "windows-sys 0.59.0", + "windows-sys 0.61.2", ] [[package]] name = "is_terminal_polyfill" -version = "1.70.1" +version = "1.70.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "7943c866cc5cd64cbc25b2e01621d07fa8eb2a1a23160ee81ce38704e97b8ecf" +checksum = "a6cb138bb79a146c1bd460005623e142ef0181e3d0219cb493e02f7d08a35695" [[package]] name = "itertools" @@ -1505,9 +1452,9 @@ dependencies = [ [[package]] name = "itoa" -version = "1.0.15" +version = "1.0.17" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "4a5f13b858c8d314ee3e8f639011f7ccefe71f97f96e50151fb991f267928e2c" +checksum = "92ecc6618181def0457392ccd0ee51198e065e016d1d527a7ac1b6dc7c1f09d2" [[package]] name = "itoap" @@ -1517,19 +1464,19 @@ checksum = "9028f49264629065d057f340a86acb84867925865f73bbf8d47b4d149a7e88b8" [[package]] name = "jobserver" -version = "0.1.33" +version = "0.1.34" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "38f262f097c174adebe41eb73d66ae9c06b2844fb0da69969647bbddd9b0538a" +checksum = "9afb3de4395d6b3e67a780b6de64b51c978ecf11cb9a462c66be7d4ca9039d33" dependencies = [ - "getrandom 0.3.2", + "getrandom 0.3.4", "libc", ] [[package]] name = "jrsonnet-cli" -version = "0.5.0-pre95" +version = "0.5.0-pre97" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "adcdbb712f233b3ef7bd533643aa494431cc28023b051433bb35a87cded6e7df" +checksum = "5d873c0c2cec518cda86b73bb559f6e54a91d012fa2e7f85da36f53e9326c57b" dependencies = [ "clap", "jrsonnet-evaluator", @@ -1540,13 +1487,13 @@ dependencies = [ [[package]] name = "jrsonnet-evaluator" -version = "0.5.0-pre95" +version = "0.5.0-pre97" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "0951f206ee982ef3c61ed49c2779b3649858d2b7c6748943e4c7f36f6df55f9c" +checksum = "0df4f11cf6f83ab15c579a84476fb174afc56ad2e6020c47ef96f74a64097208" dependencies = [ "annotate-snippets", - "derivative", - "hashbrown 0.13.2", + "hashbrown 0.14.5", + "hi-doc", "jrsonnet-gcmodule", "jrsonnet-interner", "jrsonnet-macros", @@ -1555,75 +1502,74 @@ dependencies = [ "pathdiff", "rustc-hash", "serde", + "stacker", "static_assertions", - "strsim 0.10.0", + "strsim", "thiserror 1.0.69", ] [[package]] name = "jrsonnet-gcmodule" -version = "0.3.9" +version = "0.3.10" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d467f7517c02fa001e474e3aa61268d059dd5a982ff81bff2f28ed3b7872ec37" +checksum = "87122f4aa9b77c38f96e43d9ba4b7717d63aa87b137090a16ec0107cf17abdac" dependencies = [ "jrsonnet-gcmodule-derive", - "parking_lot", ] [[package]] name = "jrsonnet-gcmodule-derive" -version = "0.3.9" +version = "0.3.10" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "5b3a22c4a0e37dca11bb4d0aa23695477216859505dc4e5f3f6089587a12e597" +checksum = "17eefaaba135591284e11cda15ed067247bec5fe9ece4fabc2c0df650d7b955a" dependencies = [ "proc-macro2", "quote", - "syn 2.0.101", + "syn 2.0.117", ] [[package]] name = "jrsonnet-interner" -version = "0.5.0-pre95" +version = "0.5.0-pre97" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "9d2332eb6c0bbd27e81ed8ad488a70e448437dd17b54e90cf3b8974b82c3c379" +checksum = "829e3aac0a8b54b2beec0cd8a79ff1622f3eb5679eea20ce89506c45d81bf294" dependencies = [ - "hashbrown 0.13.2", + "hashbrown 0.14.5", "jrsonnet-gcmodule", "rustc-hash", - "structdump", ] [[package]] name = "jrsonnet-macros" -version = "0.5.0-pre95" +version = "0.5.0-pre97" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e4b4d289fa4d4992f0a791de2e9fbdae7100005d28fced76fc49a2d70b5737f5" +checksum = "9a49d8f1c60974179b9ad07df5a78a12ebc14e7e6e0056d64c5b7d2d0c01005a" dependencies = [ "proc-macro2", "quote", - "syn 1.0.109", + "syn 2.0.117", + "syn-dissect-closure", ] [[package]] name = "jrsonnet-parser" -version = "0.5.0-pre95" +version = "0.5.0-pre97" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "8d403645f250bdc8f31a2a142ebd4608f9595bdad1a89db871ccdfe81c427957" +checksum = "2b2ec499e9a4774ec3764469e6c26f65fddeb170aa27299a652ec4a5252eb618" dependencies = [ "jrsonnet-gcmodule", "jrsonnet-interner", "peg", "static_assertions", - "structdump", ] [[package]] name = "jrsonnet-stdlib" -version = "0.5.0-pre95" +version = "0.5.0-pre97" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "99d7f31ed348ea5f7dfb379ddc65fe1773d82cab7698a8dbc4d2d72013795eba" +checksum = "4e3616e3d1455faebdaa62a033df7889b1dce5304bf054e4478f8285300a0f7c" dependencies = [ - "base64 0.21.7", + "base64", "jrsonnet-evaluator", "jrsonnet-gcmodule", "jrsonnet-macros", @@ -1635,14 +1581,13 @@ dependencies = [ "sha1", "sha2", "sha3", - "structdump", ] [[package]] name = "jrsonnet-types" -version = "0.5.0-pre95" +version = "0.5.0-pre97" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "68522259250172a8aa3714e2f99466641cc450b5c758fbdaa05265f86c1e0d97" +checksum = "7fb27d59a775189956a35e4d46e959ad93a3e2cf6771ad6b9bc64615af439d87" dependencies = [ "jrsonnet-gcmodule", "peg", @@ -1650,9 +1595,9 @@ dependencies = [ [[package]] name = "js-sys" -version = "0.3.77" +version = "0.3.91" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "1cfaf33c695fc6e08064efbc1f72ec937429614f25eef83af942d0e227c3a28f" +checksum = "b49715b7073f385ba4bc528e5747d02e66cb39c6146efb66b781f131f0fb399c" dependencies = [ "once_cell", "wasm-bindgen", @@ -1660,9 +1605,9 @@ dependencies = [ [[package]] name = "keccak" -version = "0.1.5" +version = "0.1.6" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ecc2af9a1119c51f12a14607e783cb977bde58bc069ff0c3da1095e635d70654" +checksum = "cb26cec98cce3a3d96cbb7bced3c4b16e3d13f27ec56dbd62cbc8f39cfb9d653" dependencies = [ "cpufeatures", ] @@ -1685,7 +1630,7 @@ dependencies = [ "convert_case", "proc-macro2", "quote", - "syn 2.0.101", + "syn 2.0.117", ] [[package]] @@ -1694,27 +1639,33 @@ version = "1.5.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "bbd2bcb4c963f2ddae06a2efc7e9f3591312473c50c6685e1f298068316e66fe" +[[package]] +name = "leb128fmt" +version = "0.1.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "09edd9e8b54e49e587e4f6295a7d29c3ea94d469cb40ab8ca70b288248a81db2" + [[package]] name = "libc" -version = "0.2.172" +version = "0.2.183" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d750af042f7ef4f724306de029d18836c26c1765a54a6a3f094cbd23a7267ffa" +checksum = "b5b646652bf6661599e1da8901b3b9522896f01e736bad5f723fe7a3a27f899d" [[package]] name = "libloading" -version = "0.8.6" +version = "0.8.9" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "fc2f4eb4bc735547cfed7c0a4922cbd04a4655978c09b54f1f7b228750664c34" +checksum = "d7c4b02199fee7c5d21a5ae7d8cfa79a6ef5bb2fc834d6e9058e89c825efdc55" dependencies = [ "cfg-if", - "windows-targets 0.52.6", + "windows-link", ] [[package]] name = "libm" -version = "0.2.13" +version = "0.2.16" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c9627da5196e5d8ed0b0495e61e518847578da83483c37288316d9b2e03a7f72" +checksum = "b6d2cec3eae94f9f509c767b45932f1ada8350c4bdb85af2fcab4a3c14807981" [[package]] name = "libsw" @@ -1733,9 +1684,9 @@ checksum = "262dad4b91186067a332cac496dd358ace6e9a4acdb050c68ca2920513e9d462" [[package]] name = "libz-ng-sys" -version = "1.1.22" +version = "1.1.25" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a7118c2c2a3c7b6edc279a8b19507672b9c4d716f95e671172dfa4e23f9fd824" +checksum = "89b6bd0c289b22f4973012fa91dfed9d5f4b633567bb26f9454fbf437817b499" dependencies = [ "cmake", "libc", @@ -1743,9 +1694,9 @@ dependencies = [ [[package]] name = "libz-sys" -version = "1.1.22" +version = "1.1.25" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "8b70e7a7df205e92a1a4cd9aaae7898dac0aa555503cc0a649494d0d60e7651d" +checksum = "d52f4c29e2a68ac30c9087e1b772dc9f44a2b66ed44edf2266cf2be9b03dafc1" dependencies = [ "cc", "libc", @@ -1761,43 +1712,36 @@ checksum = "0717cef1bc8b636c6e1c1bbdefc09e6322da8a9321966e8928ef80d20f7f770f" [[package]] name = "linux-raw-sys" -version = "0.4.15" +version = "0.12.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d26c52dbd32dccf2d10cac7725f8eae5296885fb5703b261f7d0a0739ec807ab" - -[[package]] -name = "linux-raw-sys" -version = "0.9.4" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "cd945864f07fe9f5371a27ad7b52a172b4b499999f1d97574c9fa68373937e12" +checksum = "32a66949e030da00e8c7d4434b251670a91556f4144941d37452769c25d58a53" [[package]] name = "litemap" -version = "0.7.5" +version = "0.8.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "23fb14cb19457329c82206317a5663005a4d404783dc74f4252769b0d5f42856" +checksum = "6373607a59f0be73a39b6fe456b8192fcc3585f602af20751600e974dd455e77" [[package]] name = "litrs" -version = "0.4.1" +version = "1.0.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b4ce301924b7887e9d637144fdade93f9dfff9b60981d4ac161db09720d39aa5" +checksum = "11d3d7f243d5c5a8b9bb5d6dd2b1602c0cb0b9db1621bafc7ed66e35ff9fe092" [[package]] name = "lock_api" -version = "0.4.12" +version = "0.4.14" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "07af8b9cdd281b7915f413fa73f29ebd5d55d0d3f0155584dade1ff18cea1b17" +checksum = "224399e74b87b5f3557511d98dff8b14089b3dadafcab6bb93eab67d3aace965" dependencies = [ - "autocfg", "scopeguard", ] [[package]] name = "log" -version = "0.4.27" +version = "0.4.29" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "13dc2df351e3202783a1fe0d44375f7295ffb4049267b0f3018346dc122a1d94" +checksum = "5e5032e24019045c762d3c0f28f5b6b8bbf38563a65908389bf7978758920897" [[package]] name = "lz4" @@ -1831,18 +1775,18 @@ dependencies = [ [[package]] name = "matchers" -version = "0.1.0" +version = "0.2.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "8263075bb86c5a1b1427b5ae862e8889656f126e9f77c484496e8b47cf5c5558" +checksum = "d1525a2a28c7f4fa0fc98bb91ae755d1e2d1505079e05539e35bc876b5d65ae9" dependencies = [ - "regex-automata 0.1.10", + "regex-automata", ] [[package]] name = "matrixmultiply" -version = "0.3.9" +version = "0.3.10" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "9380b911e3e96d10c1f415da0876389aaf1b56759054eeb0de7df940c456ba1a" +checksum = "a06de3016e9fae57a36fd14dba131fccf49f74b40b7fbdb472f96e361ec71a08" dependencies = [ "autocfg", "rawpointer", @@ -1856,15 +1800,15 @@ checksum = "490cc448043f947bae3cbee9c203358d62dbee0db12107a74be5c30ccfd09771" [[package]] name = "memchr" -version = "2.7.4" +version = "2.8.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "78ca9ab1a0babb1e7d5695e3530886289c18cf2f87ec19a575a0abdce112e3a3" +checksum = "f8ca58f447f06ed17d5fc4043ce1b10dd205e060fb3ce5b979b8ed8e59ff3f79" [[package]] name = "memmap2" -version = "0.9.5" +version = "0.9.10" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "fd3f7eed9d3848f8b98834af67102b720745c4ec028fcd0aa0239277e7de374f" +checksum = "714098028fe011992e1c3962653c96b2d578c4b4bce9036e15ff220319b1e0e3" dependencies = [ "libc", ] @@ -1880,22 +1824,23 @@ dependencies = [ [[package]] name = "miniz_oxide" -version = "0.8.8" +version = "0.8.9" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "3be647b768db090acb35d5ec5db2b0e1f1de11133ca123b9eacf5137868f892a" +checksum = "1fa76a2c86f704bdb222d66965fb3d63269ce38518b83cb0575fca855ebb6316" dependencies = [ "adler2", + "simd-adler32", ] [[package]] name = "mio" -version = "1.0.3" +version = "1.1.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "2886843bf800fba2e3377cff24abf6379b4c4d5c6681eaf9ea5b0d15090450bd" +checksum = "a69bcab0ad47271a0234d9422b131806bf3968021e5dc9328caf2d4cd58557fc" dependencies = [ "libc", - "wasi 0.11.0+wasi-snapshot-preview1", - "windows-sys 0.52.0", + "wasi", + "windows-sys 0.61.2", ] [[package]] @@ -1944,7 +1889,7 @@ checksum = "254a5372af8fc138e36684761d3c0cdb758a4410e938babcff1c860ce14ddbfc" dependencies = [ "proc-macro2", "quote", - "syn 2.0.101", + "syn 2.0.117", ] [[package]] @@ -1996,7 +1941,7 @@ checksum = "62d3115cc93dac9fabdfd25f7d4fda51ad4a959fb4667d39af20f70bddfb3574" dependencies = [ "cfg-if", "flate2", - "thiserror 2.0.12", + "thiserror 2.0.18", ] [[package]] @@ -2054,7 +1999,7 @@ dependencies = [ "bit-vec", "bstr", "byteorder", - "indexmap 2.9.0", + "indexmap 2.13.0", "noodles-bgzf", "noodles-core", ] @@ -2078,7 +2023,7 @@ version = "0.43.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "2d968405cf400568b24a47587b6e916d0cf118d7d38625c29472f491461f094e" dependencies = [ - "indexmap 2.9.0", + "indexmap 2.13.0", "noodles-bgzf", "noodles-core", "noodles-csi", @@ -2107,21 +2052,20 @@ dependencies = [ [[package]] name = "ntapi" -version = "0.4.1" +version = "0.4.3" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e8a3895c6391c39d7fe7ebc444a87eb2991b2a0bc718fdabd071eec617fc68e4" +checksum = "c3b335231dfd352ffb0f8017f3b6027a4917f7df785ea2143d8af2adc66980ae" dependencies = [ "winapi", ] [[package]] name = "nu-ansi-term" -version = "0.46.0" +version = "0.50.3" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "77a8165726e8236064dbb45459242600304b42a5ea24ee2948e18e023bf7ba84" +checksum = "7957b9740744892f114936ab4a57b3f487491bbeafaf8083688b16841a4240e5" dependencies = [ - "overload", - "winapi", + "windows-sys 0.61.2", ] [[package]] @@ -2159,9 +2103,9 @@ dependencies = [ [[package]] name = "num-conv" -version = "0.1.0" +version = "0.2.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "51d515d32fb182ee37cda2ccdcb92950d6a3c2893aa280e540671c2cd0f3b1d9" +checksum = "cf97ec579c3c42f953ef76dbf8d55ac91fb219dde70e49aa4a6b7d74e9919050" [[package]] name = "num-integer" @@ -2224,57 +2168,57 @@ dependencies = [ "proc-macro2", "quote", "rustc_version", - "syn 2.0.101", + "syn 2.0.117", "urlencoding", ] [[package]] name = "object" -version = "0.36.7" +version = "0.37.3" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "62948e14d923ea95ea2c7c86c71013138b66525b86bdc08d2dcc262bdb497b87" +checksum = "ff76201f031d8863c38aa7f905eca4f53abbfa15f609db4277d44cd8938f33fe" dependencies = [ "memchr", ] [[package]] name = "once_cell" -version = "1.21.3" +version = "1.21.4" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "9f7c3e4beb33f85d45ae3e3a1792185706c8e16d043238c593331cc7cd313b50" + +[[package]] +name = "once_cell_polyfill" +version = "1.70.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "42f5e15c9953c5e4ccceeb2e7382a716482c34515315f7b03532b8b4e8393d2d" +checksum = "384b8ab6d37215f3c5301a95a4accb5d64aa607f1fcb26a11b5303878451b4fe" [[package]] name = "os_pipe" -version = "1.2.1" +version = "1.2.3" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "5ffd2b0a5634335b135d5728d84c5e0fd726954b87111f7506a61c502280d982" +checksum = "7d8fae84b431384b68627d0f9b3b1245fcf9f46f6c0e3dc902e9dce64edd1967" dependencies = [ "libc", - "windows-sys 0.59.0", + "windows-sys 0.48.0", ] -[[package]] -name = "overload" -version = "0.1.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b15813163c1d831bf4a13c3610c05c0d03b39feb07f7e09fa234dac9b15aaf39" - [[package]] name = "papergrid" -version = "0.15.0" +version = "0.17.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "30268a8d20c2c0d126b2b6610ab405f16517f6ba9f244d8c59ac2c512a8a1ce7" +checksum = "6978128c8b51d8f4080631ceb2302ab51e32cc6e8615f735ee2f83fd269ae3f1" dependencies = [ - "ahash", "bytecount", - "unicode-width 0.2.0", + "fnv", + "unicode-width 0.2.2", ] [[package]] name = "parking_lot" -version = "0.12.3" +version = "0.12.5" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f1bf18183cf54e8d6059647fc3063646a1801cf30896933ec2311622cc4b9a27" +checksum = "93857453250e3077bd71ff98b6a65ea6621a19bb0f559a85248955ac12c45a1a" dependencies = [ "lock_api", "parking_lot_core", @@ -2282,24 +2226,15 @@ dependencies = [ [[package]] name = "parking_lot_core" -version = "0.9.10" +version = "0.9.12" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "1e401f977ab385c9e4e3ab30627d6f26d00e2c73eef317493c4ec6d468726cf8" +checksum = "2621685985a2ebf1c516881c026032ac7deafcda1a2c9b7850dc81e3dfcb64c1" dependencies = [ "cfg-if", "libc", "redox_syscall", "smallvec", - "windows-targets 0.52.6", -] - -[[package]] -name = "parse-zoneinfo" -version = "0.3.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "1f2a05b18d44e2957b88f96ba460715e295bc1d7510468a2f3d3b44535d26c24" -dependencies = [ - "regex", + "windows-link", ] [[package]] @@ -2349,9 +2284,9 @@ checksum = "132dca9b868d927b35b5dd728167b2dee150eb1ad686008fc71ccb298b776fca" [[package]] name = "percent-encoding" -version = "2.3.1" +version = "2.3.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e3148f5046208a5d56bcfc03053e3ca6334e51da8dfb19b6cdc8b306fae3283e" +checksum = "9b4f627cb1b25917193a259e49bdad08f671f8d9708acfd5fe0a8c1455d87220" [[package]] name = "permutation" @@ -2361,20 +2296,19 @@ checksum = "df202b0b0f5b8e389955afd5f27b007b00fb948162953f1db9c70d2c7e3157d7" [[package]] name = "pest" -version = "2.8.0" +version = "2.8.6" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "198db74531d58c70a361c42201efde7e2591e976d518caf7662a47dc5720e7b6" +checksum = "e0848c601009d37dfa3430c4666e147e49cdcf1b92ecd3e63657d8a5f19da662" dependencies = [ "memchr", - "thiserror 2.0.12", "ucd-trie", ] [[package]] name = "pest_derive" -version = "2.8.0" +version = "2.8.6" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d725d9cfd79e87dccc9341a2ef39d1b6f6353d68c4b33c177febbe1a402c97c5" +checksum = "11f486f1ea21e6c10ed15d5a7c77165d0ee443402f0780849d1768e7d9d6fe77" dependencies = [ "pest", "pest_generator", @@ -2382,85 +2316,93 @@ dependencies = [ [[package]] name = "pest_generator" -version = "2.8.0" +version = "2.8.6" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "db7d01726be8ab66ab32f9df467ae8b1148906685bbe75c82d1e65d7f5b3f841" +checksum = "8040c4647b13b210a963c1ed407c1ff4fdfa01c31d6d2a098218702e6664f94f" dependencies = [ "pest", "pest_meta", "proc-macro2", "quote", - "syn 2.0.101", + "syn 2.0.117", ] [[package]] name = "pest_meta" -version = "2.8.0" +version = "2.8.6" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "7f9f832470494906d1fca5329f8ab5791cc60beb230c74815dff541cbd2b5ca0" +checksum = "89815c69d36021a140146f26659a81d6c2afa33d216d736dd4be5381a7362220" dependencies = [ - "once_cell", "pest", "sha2", ] [[package]] name = "phf" -version = "0.11.3" +version = "0.12.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "1fd6780a80ae0c52cc120a26a1a42c1ae51b247a253e4e06113d23d2c2edd078" +checksum = "913273894cec178f401a31ec4b656318d95473527be05c0752cc41cdc32be8b7" dependencies = [ - "phf_macros", - "phf_shared", + "phf_shared 0.12.1", ] [[package]] -name = "phf_codegen" -version = "0.11.3" +name = "phf" +version = "0.13.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "aef8048c789fa5e851558d709946d6d79a8ff88c0440c587967f8e94bfb1216a" +checksum = "c1562dc717473dbaa4c1f85a36410e03c047b2e7df7f45ee938fbef64ae7fadf" dependencies = [ - "phf_generator", - "phf_shared", + "phf_macros", + "phf_shared 0.13.1", + "serde", ] [[package]] name = "phf_generator" -version = "0.11.3" +version = "0.13.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "3c80231409c20246a13fddb31776fb942c38553c51e871f8cbd687a4cfb5843d" +checksum = "135ace3a761e564ec88c03a77317a7c6b80bb7f7135ef2544dbe054243b89737" dependencies = [ - "phf_shared", - "rand", + "fastrand", + "phf_shared 0.13.1", ] [[package]] name = "phf_macros" -version = "0.11.3" +version = "0.13.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f84ac04429c13a7ff43785d75ad27569f2951ce0ffd30a3321230db2fc727216" +checksum = "812f032b54b1e759ccd5f8b6677695d5268c588701effba24601f6932f8269ef" dependencies = [ "phf_generator", - "phf_shared", + "phf_shared 0.13.1", "proc-macro2", "quote", - "syn 2.0.101", + "syn 2.0.117", ] [[package]] name = "phf_shared" -version = "0.11.3" +version = "0.12.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "67eabc2ef2a60eb7faa00097bd1ffdb5bd28e62bf39990626a582201b7a754e5" +checksum = "06005508882fb681fd97892ecff4b7fd0fee13ef1aa569f8695dae7ab9099981" +dependencies = [ + "siphasher", +] + +[[package]] +name = "phf_shared" +version = "0.13.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "e57fef6bc5981e38c2ce2d63bfa546861309f875b8a75f092d1d54ae2d64f266" dependencies = [ "siphasher", ] [[package]] name = "pin-project-lite" -version = "0.2.16" +version = "0.2.17" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "3b3cff922bd51709b605d9ead9aa71031d81447142d828eb4a6eba76fe619f9b" +checksum = "a89322df9ebe1c1578d689c92318e070967d1042b512afbe49518723f4e6d5cd" [[package]] name = "pin-utils" @@ -2489,7 +2431,7 @@ version = "0.45.1" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "0c0af18ae021b0396c42f39396146332957ebc4d4d25d931b4fe73509948f348" dependencies = [ - "getrandom 0.2.16", + "getrandom 0.2.17", "polars-arrow", "polars-core", "polars-error", @@ -2518,8 +2460,8 @@ dependencies = [ "dyn-clone", "either", "ethnum", - "getrandom 0.2.16", - "hashbrown 0.15.2", + "getrandom 0.2.17", + "hashbrown 0.15.5", "itoap", "lz4", "multiversion", @@ -2576,15 +2518,15 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "4794a9e38ef2faf7e47a6f736c7f156c6fbb66cd529f82593b2d48348e422c8d" dependencies = [ "ahash", - "bitflags 2.9.0", + "bitflags 2.11.0", "bytemuck", "chrono", "chrono-tz", "comfy-table", "either", "hashbrown 0.14.5", - "hashbrown 0.15.2", - "indexmap 2.9.0", + "hashbrown 0.15.5", + "indexmap 2.13.0", "itoa", "ndarray", "num-traits", @@ -2600,7 +2542,7 @@ dependencies = [ "rayon", "regex", "strum_macros 0.26.4", - "thiserror 2.0.12", + "thiserror 2.0.18", "version_check", "xxhash-rust", ] @@ -2614,7 +2556,7 @@ dependencies = [ "polars-arrow-format", "regex", "simdutf8", - "thiserror 2.0.12", + "thiserror 2.0.18", ] [[package]] @@ -2624,8 +2566,8 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "ad56c5ea4d6e0546fbc3fa35918a537b76587600a5118770ed331136249d50d8" dependencies = [ "ahash", - "bitflags 2.9.0", - "hashbrown 0.15.2", + "bitflags 2.11.0", + "hashbrown 0.15.5", "num-traits", "once_cell", "polars-arrow", @@ -2656,7 +2598,7 @@ dependencies = [ "flate2", "futures", "glob", - "hashbrown 0.15.2", + "hashbrown 0.15.5", "home", "itoa", "memchr", @@ -2691,8 +2633,8 @@ dependencies = [ "ahash", "chrono", "fallible-streaming-iterator", - "hashbrown 0.15.2", - "indexmap 2.9.0", + "hashbrown 0.15.5", + "indexmap 2.13.0", "itoa", "num-traits", "polars-arrow", @@ -2711,7 +2653,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "fa457bfa96f45cf14c33507eaa3ebcec6a8d52e7f7fc60cd23f338631369d417" dependencies = [ "ahash", - "bitflags 2.9.0", + "bitflags 2.11.0", "memchr", "once_cell", "polars-arrow", @@ -2756,14 +2698,14 @@ checksum = "b267480495ffe382dab63318e3c6bf4073bb82971c8b80294d079293fece458b" dependencies = [ "ahash", "argminmax", - "base64 0.22.1", + "base64", "bytemuck", "chrono", "chrono-tz", "either", - "hashbrown 0.15.2", + "hashbrown 0.15.5", "hex", - "indexmap 2.9.0", + "indexmap 2.13.0", "memchr", "num-traits", "polars-arrow", @@ -2774,7 +2716,7 @@ dependencies = [ "polars-utils", "rayon", "regex", - "regex-syntax 0.8.5", + "regex-syntax", "strum_macros 0.26.4", "unicode-reverse", "version_check", @@ -2788,11 +2730,11 @@ checksum = "20237f232b1a74b1fae6b5c9bea8c440f2e5d3b5506601b038f0a7a34b84b710" dependencies = [ "ahash", "async-stream", - "base64 0.22.1", + "base64", "bytemuck", "ethnum", "futures", - "hashbrown 0.15.2", + "hashbrown 0.15.5", "num-traits", "polars-arrow", "polars-compute", @@ -2822,7 +2764,7 @@ dependencies = [ "crossbeam-channel", "crossbeam-queue", "enum_dispatch", - "hashbrown 0.15.2", + "hashbrown 0.15.5", "num-traits", "polars-arrow", "polars-compute", @@ -2845,13 +2787,13 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "99a3832887671df1eb326df52cbfcc47789d3d58454c1084a154b48b240175e2" dependencies = [ "ahash", - "bitflags 2.9.0", + "bitflags 2.11.0", "bytemuck", "bytes", "chrono", "chrono-tz", "either", - "hashbrown 0.15.2", + "hashbrown 0.15.5", "memmap2", "num-traits", "once_cell", @@ -2876,7 +2818,7 @@ version = "0.45.1" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "8e36350fb8a90238e02c8ece0f0c4c24f3374197e9c08c1c22cc8b9c526e6c25" dependencies = [ - "bitflags 2.9.0", + "bitflags 2.11.0", "bytemuck", "polars-arrow", "polars-compute", @@ -2890,7 +2832,7 @@ version = "0.45.1" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "8c6aa4913cffc522cea3ccbc0cafb350bec18fed0a1ef8d417ac88ea320d7749" dependencies = [ - "indexmap 2.9.0", + "indexmap 2.13.0", "polars-error", "polars-utils", "version_check", @@ -2980,8 +2922,8 @@ dependencies = [ "bytemuck", "bytes", "compact_str", - "hashbrown 0.15.2", - "indexmap 2.9.0", + "hashbrown 0.15.5", + "indexmap 2.13.0", "libc", "memmap2", "num-traits", @@ -2997,19 +2939,28 @@ dependencies = [ [[package]] name = "portable-atomic" -version = "1.11.0" +version = "1.13.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "350e9b48cbc6b0e028b0473b114454c6316e57336ee184ceab6e53f72c178b3e" +checksum = "c33a9471896f1c69cecef8d20cbe2f7accd12527ce60845ff44c153bb2a21b49" [[package]] name = "portable-atomic-util" -version = "0.2.4" +version = "0.2.6" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d8a2f0d8d040d7848a709caf78912debcc3f33ee4b3cac47d73d1e1069e83507" +checksum = "091397be61a01d4be58e7841595bd4bfedb15f1cd54977d79b8271e94ed799a3" dependencies = [ "portable-atomic", ] +[[package]] +name = "potential_utf" +version = "0.1.4" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "b73949432f5e2a09657003c25bca5e19a0e9c84f8058ca374f49e0ebe605af77" +dependencies = [ + "zerovec", +] + [[package]] name = "powerfmt" version = "0.2.0" @@ -3022,14 +2973,24 @@ version = "0.2.21" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "85eae3c4ed2f50dcfe72643da4befc30deadb458a9b590d720cde2f2b1e97da9" dependencies = [ - "zerocopy 0.8.25", + "zerocopy", +] + +[[package]] +name = "prettyplease" +version = "0.2.37" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "479ca8adacdd7ce8f1fb39ce9ecccbfe93a3f1344b3d0d97f20bc0196208f62b" +dependencies = [ + "proc-macro2", + "syn 2.0.117", ] [[package]] name = "proc-macro-crate" -version = "3.3.0" +version = "3.5.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "edce586971a4dfaa28950c6f18ed55e0406c1ab88bbce2c6f6293a7aaba73d35" +checksum = "e67ba7e9b2b56446f1d419b1d807906278ffa1a658a8a5d8a39dcb1f5a78614f" dependencies = [ "toml_edit", ] @@ -3053,41 +3014,48 @@ dependencies = [ "proc-macro-error-attr2", "proc-macro2", "quote", - "syn 2.0.101", + "syn 2.0.117", ] [[package]] name = "proc-macro2" -version = "1.0.95" +version = "1.0.106" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "02b3e5e68a3a1a02aad3ec490a98007cbc13c37cbe84a3cd7b8e406d76e7f778" +checksum = "8fd00f0bb2e90d81d1044c2b32617f68fcb9fa3bb7640c23e9c748e53fb30934" dependencies = [ "unicode-ident", ] [[package]] name = "psm" -version = "0.1.26" +version = "0.1.30" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "6e944464ec8536cd1beb0bbfd96987eb5e3b72f2ecdafdc5c769a37f1fa2ae1f" +checksum = "3852766467df634d74f0b2d7819bf8dc483a0eb2e3b0f50f756f9cfe8b0d18d8" dependencies = [ + "ar_archive_writer", "cc", ] [[package]] name = "quote" -version = "1.0.40" +version = "1.0.45" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "1885c039570dc00dcb4ff087a89e185fd56bae234ddc7f056a945bf36467248d" +checksum = "41f2619966050689382d2b44f664f4bc593e129785a36d6ee376ddf37259b924" dependencies = [ "proc-macro2", ] [[package]] name = "r-efi" -version = "5.2.0" +version = "5.3.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "69cdb34c158ceb288df11e18b4bd39de994f6657d83847bdffdbd7f346754b0f" + +[[package]] +name = "r-efi" +version = "6.0.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "74765f6d916ee2faa39bc8e68e4f3ed8949b48cccdac59983d287a7cb71ce9c5" +checksum = "f8dcc9c7d52a811697d2151c701e0d08956f92b0e24136cf4cf27b57a6a0d9bf" [[package]] name = "rand" @@ -3116,7 +3084,7 @@ version = "0.6.4" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "ec0be4795e2f6a28069bec0b5ff3e2ac9bafc99e6a9a7dc3547996c5c816922c" dependencies = [ - "getrandom 0.2.16", + "getrandom 0.2.17", ] [[package]] @@ -3129,13 +3097,31 @@ dependencies = [ "rand", ] +[[package]] +name = "random_color" +version = "0.8.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "0085421bc527effa7ed6d46bac0a28734663c47abe03d80a5e78e441fad85196" +dependencies = [ + "rand", +] + +[[package]] +name = "range-map" +version = "0.2.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "12a5a2d6c7039059af621472a4389be1215a816df61aa4d531cfe85264aee95f" +dependencies = [ + "num-traits", +] + [[package]] name = "raw-cpuid" -version = "11.5.0" +version = "11.6.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c6df7ab838ed27997ba19a4664507e6f82b41fe6e20be42929332156e5e85146" +checksum = "498cd0dc59d73224351ee52a95fee0f1a617a2eae0e7d9d720cc622c73a54186" dependencies = [ - "bitflags 2.9.0", + "bitflags 2.11.0", ] [[package]] @@ -3146,9 +3132,9 @@ checksum = "60a357793950651c4ed0f3f52338f53b2f809f32d83a07f72909fa13e4c6c1e3" [[package]] name = "rayon" -version = "1.10.0" +version = "1.11.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b418a60154510ca1a002a752ca9714984e21e4241e804d32555251faf8b78ffa" +checksum = "368f01d005bf8fd9b1206fb6fa653e6c4a81ceb1466406b81792d87c5677a58f" dependencies = [ "either", "rayon-core", @@ -3156,9 +3142,9 @@ dependencies = [ [[package]] name = "rayon-core" -version = "1.12.1" +version = "1.13.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "1465873a3dfdaa8ae7cb14b4383657caab0b3e8a0aa9ae8e04b044854c8dfce2" +checksum = "22e18b0f0062d30d4230b2e85ff77fdfe4326feb054b9783a3460d8435c8ab91" dependencies = [ "crossbeam-deque", "crossbeam-utils", @@ -3181,81 +3167,66 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "76009fbe0614077fc1a2ce255e3a1881a2e3a3527097d5dc6d8212c585e7e38b" dependencies = [ "quote", - "syn 2.0.101", + "syn 2.0.117", ] [[package]] name = "redox_syscall" -version = "0.5.11" +version = "0.5.18" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d2f103c6d277498fbceb16e84d317e2a400f160f46904d5f5410848c829511a3" +checksum = "ed2bf2547551a7053d6fdfafda3f938979645c44812fbfcda098faae3f1a362d" dependencies = [ - "bitflags 2.9.0", + "bitflags 2.11.0", ] [[package]] name = "ref-cast" -version = "1.0.24" +version = "1.0.25" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "4a0ae411dbe946a674d89546582cea4ba2bb8defac896622d6496f14c23ba5cf" +checksum = "f354300ae66f76f1c85c5f84693f0ce81d747e2c3f21a45fef496d89c960bf7d" dependencies = [ "ref-cast-impl", ] [[package]] name = "ref-cast-impl" -version = "1.0.24" +version = "1.0.25" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "1165225c21bff1f3bbce98f5a1f889949bc902d3575308cc7b0de30b4f6d27c7" +checksum = "b7186006dcb21920990093f30e3dea63b7d6e977bf1256be20c3563a5db070da" dependencies = [ "proc-macro2", "quote", - "syn 2.0.101", + "syn 2.0.117", ] [[package]] name = "regex" -version = "1.11.1" +version = "1.12.3" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b544ef1b4eac5dc2db33ea63606ae9ffcfac26c1416a2806ae0bf5f56b201191" +checksum = "e10754a14b9137dd7b1e3e5b0493cc9171fdd105e0ab477f51b72e7f3ac0e276" dependencies = [ "aho-corasick", "memchr", - "regex-automata 0.4.9", - "regex-syntax 0.8.5", + "regex-automata", + "regex-syntax", ] [[package]] name = "regex-automata" -version = "0.1.10" +version = "0.4.14" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "6c230d73fb8d8c1b9c0b3135c5142a8acee3a0558fb8db5cf1cb65f8d7862132" -dependencies = [ - "regex-syntax 0.6.29", -] - -[[package]] -name = "regex-automata" -version = "0.4.9" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "809e8dc61f6de73b46c85f4c96486310fe304c434cfa43669d7b40f711150908" +checksum = "6e1dd4122fc1595e8162618945476892eefca7b88c52820e74af6262213cae8f" dependencies = [ "aho-corasick", "memchr", - "regex-syntax 0.8.5", + "regex-syntax", ] [[package]] name = "regex-syntax" -version = "0.6.29" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f162c6dd7b008981e4d40210aca20b4bd0f9b60ca9271061b07f78537722f2e1" - -[[package]] -name = "regex-syntax" -version = "0.8.5" +version = "0.8.10" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "2b15c43186be67a4fd63bee50d0303afffcef381492ebe2c5d87f324e1b8815c" +checksum = "dc897dd8d9e8bd1ed8cdad82b5966c3e0ecae09fb1907d58efaa013543185d0a" [[package]] name = "ring" @@ -3265,7 +3236,7 @@ checksum = "a4689e6c2294d81e88dc6261c768b63bc4fcdb852be6d1352498b114f61383b7" dependencies = [ "cc", "cfg-if", - "getrandom 0.2.16", + "getrandom 0.2.17", "libc", "untrusted", "windows-sys 0.52.0", @@ -3292,19 +3263,13 @@ dependencies = [ [[package]] name = "rust-lapper" -version = "1.1.0" +version = "1.2.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ee43d8e721ac803031dbab6a944b957b49a3b11eadbc099880c8aaaebf23ed27" +checksum = "2274b9cc4f205bc0945b7be3e4fc1a102b0b7119ba6482faaedb9c4f76dde5d1" dependencies = [ "num-traits", ] -[[package]] -name = "rustc-demangle" -version = "0.1.24" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "719b953e2095829ee67db738b3bfa9fa368c94900df327b3f07fe6e794d2fe1f" - [[package]] name = "rustc-hash" version = "1.1.0" @@ -3322,35 +3287,22 @@ dependencies = [ [[package]] name = "rustix" -version = "0.38.44" +version = "1.1.4" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "fdb5bc1ae2baa591800df16c9ca78619bf65c0488b41b96ccec5d11220d8c154" +checksum = "b6fe4565b9518b83ef4f91bb47ce29620ca828bd32cb7e408f0062e9930ba190" dependencies = [ - "bitflags 2.9.0", + "bitflags 2.11.0", "errno", "libc", - "linux-raw-sys 0.4.15", - "windows-sys 0.59.0", -] - -[[package]] -name = "rustix" -version = "1.0.5" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d97817398dd4bb2e6da002002db259209759911da105da92bec29ccb12cf58bf" -dependencies = [ - "bitflags 2.9.0", - "errno", - "libc", - "linux-raw-sys 0.9.4", - "windows-sys 0.59.0", + "linux-raw-sys", + "windows-sys 0.61.2", ] [[package]] name = "rustls" -version = "0.23.26" +version = "0.23.37" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "df51b5869f3a441595eac5e8ff14d486ff285f7b8c0df8770e49c3b56351f0f0" +checksum = "758025cb5fccfd3bc2fd74708fd4682be41d99e5dff73c377c0646c6012c73a4" dependencies = [ "log", "once_cell", @@ -3362,25 +3314,19 @@ dependencies = [ ] [[package]] -name = "rustls-pemfile" -version = "2.2.0" +name = "rustls-pki-types" +version = "1.14.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "dce314e5fee3f39953d46bb63bb8a46d40c2f8fb7cc5a3b6cab2bde9721d6e50" +checksum = "be040f8b0a225e40375822a563fa9524378b9d63112f53e19ffff34df5d33fdd" dependencies = [ - "rustls-pki-types", + "zeroize", ] -[[package]] -name = "rustls-pki-types" -version = "1.11.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "917ce264624a4b4db1c364dcc35bfca9ded014d0a958cd47ad3e960e988ea51c" - [[package]] name = "rustls-webpki" -version = "0.103.1" +version = "0.103.9" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "fef8b8769aaccf73098557a87cd1816b4f9c7c16811c9c77142aa695c16f2c03" +checksum = "d7df23109aa6c1567d1c575b9952556388da57401e4ace1d15f79eedad0d8f53" dependencies = [ "ring", "rustls-pki-types", @@ -3389,15 +3335,15 @@ dependencies = [ [[package]] name = "rustversion" -version = "1.0.20" +version = "1.0.22" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "eded382c5f5f786b989652c49544c4877d9f015cc22e145a5ea8ea66c2921cd2" +checksum = "b39cdef0fa800fc44525c84ccb54a029961a8215f9619753635a9c0d2538d46d" [[package]] name = "ryu" -version = "1.0.20" +version = "1.0.23" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "28d3b2b1366ec20994f1fd18c3c594f05c5dd4bc44d8bb0c1c632c8d6829481f" +checksum = "9774ba4a74de5f7b1c1451ed6cd5285a32eddb5cccb8cc655a4e50009e06477f" [[package]] name = "safe_arch" @@ -3416,9 +3362,9 @@ checksum = "94143f37725109f92c262ed2cf5e59bce7498c01bcc1502d7b9afe439a4e9f49" [[package]] name = "semver" -version = "1.0.26" +version = "1.0.27" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "56e6fa9c48d24d85fb3de5ad847117517440f6beceb7798af16b4a87d616b8d0" +checksum = "d767eb0aabc880b29956c35734170f26ed551a859dbd361d140cdbeca61ab1e2" [[package]] name = "seq_geom_parser" @@ -3449,34 +3395,45 @@ dependencies = [ [[package]] name = "serde" -version = "1.0.219" +version = "1.0.228" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "5f0e2c6ed6606019b4e29e69dbaba95b11854410e5347d525002456dbbb786b6" +checksum = "9a8e94ea7f378bd32cbbd37198a4a91436180c5bb472411e48b5ec2e2124ae9e" +dependencies = [ + "serde_core", + "serde_derive", +] + +[[package]] +name = "serde_core" +version = "1.0.228" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "41d385c7d4ca58e59fc732af25c3983b67ac852c1a25000afe1175de458b67ad" dependencies = [ "serde_derive", ] [[package]] name = "serde_derive" -version = "1.0.219" +version = "1.0.228" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "5b0276cf7f2c73365f7157c8123c21cd9a50fbbd844757af28ca1f5925fc2a00" +checksum = "d540f220d3187173da220f885ab66608367b6574e925011a9353e4badda91d79" dependencies = [ "proc-macro2", "quote", - "syn 2.0.101", + "syn 2.0.117", ] [[package]] name = "serde_json" -version = "1.0.140" +version = "1.0.149" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "20068b6e96dc6c9bd23e01df8827e6c7e1f2fddd43c21810382803c136b99373" +checksum = "83fc039473c5595ace860d8c4fafa220ff474b3fc6bfdb4293327f1a37e94d86" dependencies = [ "itoa", "memchr", - "ryu", "serde", + "serde_core", + "zmij", ] [[package]] @@ -3504,9 +3461,9 @@ dependencies = [ [[package]] name = "sha2" -version = "0.10.8" +version = "0.10.9" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "793db75ad2bcafc3ffa7c68b215fee268f537982cd901d132f89c6343f3a3dc8" +checksum = "a7507d819769d01a365ab707794a4084392c824f54a7a6a7862f8c3d0892b283" dependencies = [ "cfg-if", "cpufeatures", @@ -3540,9 +3497,9 @@ checksum = "0fda2ff0d084019ba4d7c6f371c95d8fd75ce3524c3cb8fb653a3023f6323e64" [[package]] name = "simba" -version = "0.9.0" +version = "0.9.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b3a386a501cd104797982c15ae17aafe8b9261315b5d07e3ec803f2ea26be0fa" +checksum = "c99284beb21666094ba2b75bbceda012e610f5479dfcc2d6e2426f53197ffd95" dependencies = [ "approx", "num-complex", @@ -3551,6 +3508,12 @@ dependencies = [ "wide", ] +[[package]] +name = "simd-adler32" +version = "0.3.8" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "e320a6c5ad31d271ad523dcf3ad13e2767ad8b1cb8f047f75a8aeaf8da139da2" + [[package]] name = "simd-json" version = "0.14.3" @@ -3558,7 +3521,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "aa2bcf6c6e164e81bc7a5d49fc6988b3d515d9e8c07457d7b74ffb9324b9cd40" dependencies = [ "ahash", - "getrandom 0.2.16", + "getrandom 0.2.17", "halfbrown", "once_cell", "ref-cast", @@ -3576,7 +3539,7 @@ checksum = "e3a9fe34e3e7a50316060351f37187a3f546bce95496156754b601a5fa71b76e" [[package]] name = "simpleaf" -version = "0.19.5" +version = "0.20.0" dependencies = [ "af-anndata", "anyhow", @@ -3592,7 +3555,7 @@ dependencies = [ "jrsonnet-evaluator", "jrsonnet-parser", "niffler", - "phf", + "phf 0.13.1", "regex", "roers", "semver", @@ -3601,10 +3564,10 @@ dependencies = [ "serde", "serde_json", "strum", - "strum_macros 0.27.1", + "strum_macros 0.28.0", "tabled", "tempfile", - "thiserror 2.0.12", + "thiserror 2.0.18", "time", "tracing", "tracing-subscriber", @@ -3614,42 +3577,39 @@ dependencies = [ [[package]] name = "siphasher" -version = "1.0.1" +version = "1.0.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "56199f7ddabf13fe5074ce809e7d3f42b42ae711800501b5b16ea82ad029c39d" +checksum = "b2aa850e253778c88a04c3d7323b043aeda9d3e30d5971937c1855769763678e" [[package]] name = "slab" -version = "0.4.9" +version = "0.4.12" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "8f92a496fb766b417c996b9c5e57daf2f7ad3b0bebe1ccfca4856390e3d3bb67" -dependencies = [ - "autocfg", -] +checksum = "0c790de23124f9ab44544d7ac05d60440adc586479ce501c1d6d7da3cd8c9cf5" [[package]] name = "slotmap" -version = "1.0.7" +version = "1.1.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "dbff4acf519f630b3a3ddcfaea6c06b42174d9a44bc70c620e9ed1649d58b82a" +checksum = "bdd58c3c93c3d278ca835519292445cb4b0d4dc59ccfdf7ceadaab3f8aeb4038" dependencies = [ "version_check", ] [[package]] name = "smallvec" -version = "1.15.0" +version = "1.15.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "8917285742e9f3e1683f0a9c4e6b57960b7314d0b08d30d1ecd426713ee2eee9" +checksum = "67b1b7a3b5fe4f1376887184045fcf45c69e92af734b7aaddc05fb777b6fbd03" [[package]] name = "socket2" -version = "0.5.9" +version = "0.6.3" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "4f5fd57c80058a56cf5c777ab8a126398ece8e442983605d280a44ce79d0edef" +checksum = "3a766e1110788c36f4fa1c2b71b387a7815aa65f88ce0229841826633d93723e" dependencies = [ "libc", - "windows-sys 0.52.0", + "windows-sys 0.61.2", ] [[package]] @@ -3663,15 +3623,15 @@ dependencies = [ [[package]] name = "stable_deref_trait" -version = "1.2.0" +version = "1.2.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a8f112729512f8e442d81f95a8a7ddf2b7c6b8a1a6f509a95864142b30cab2d3" +checksum = "6ce2be8dc25455e1f91df71bfa12ad37d7af1092ae736f3a6cd0e37bc7810596" [[package]] name = "stacker" -version = "0.1.21" +version = "0.1.23" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "cddb07e32ddb770749da91081d8d0ac3a16f1a569a18b20348cd371f5dead06b" +checksum = "08d74a23609d509411d10e2176dc2a4346e3b4aea2e7b1869f19fdedbc71c013" dependencies = [ "cc", "cfg-if", @@ -3707,48 +3667,20 @@ version = "0.2.4" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "fe895eb47f22e2ddd4dabc02bce419d2e643c8e3b585c78158b349195bc24d82" -[[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" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "7da8b5736845d9f2fcb837ea5d9e2628564b3b043a70948a3f0b778838c5fb4f" -[[package]] -name = "structdump" -version = "0.2.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b0570327507bf281d8a6e6b0d4c082b12cb6bcee27efce755aa5efacd44076c1" -dependencies = [ - "proc-macro2", - "quote", - "structdump-derive", -] - -[[package]] -name = "structdump-derive" -version = "0.2.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "29cc0b59cfa11f1bceda09a9a7e37e6a6c3138575fd24ade8aa9af6d09aedf28" -dependencies = [ - "proc-macro2", - "quote", - "syn 1.0.109", -] - [[package]] name = "strum" -version = "0.27.1" +version = "0.28.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f64def088c51c9510a8579e3c5d67c65349dcf755e5479ad3d010aa6454e2c32" +checksum = "9628de9b8791db39ceda2b119bbe13134770b56c138ec1d3af810d045c04f9bd" dependencies = [ - "phf", - "strum_macros 0.27.1", + "phf 0.13.1", + "strum_macros 0.28.0", ] [[package]] @@ -3761,20 +3693,19 @@ dependencies = [ "proc-macro2", "quote", "rustversion", - "syn 2.0.101", + "syn 2.0.117", ] [[package]] name = "strum_macros" -version = "0.27.1" +version = "0.28.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c77a8c5abcaf0f9ce05d62342b7d298c346515365c36b673df4ebe3ced01fde8" +checksum = "ab85eea0270ee17587ed4156089e10b9e6880ee688791d45a905f5b1ca36f664" dependencies = [ "heck", "proc-macro2", "quote", - "rustversion", - "syn 2.0.101", + "syn 2.0.117", ] [[package]] @@ -3796,24 +3727,35 @@ dependencies = [ [[package]] name = "syn" -version = "2.0.101" +version = "2.0.117" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "8ce2b7fc941b3a24138a0a7cf8e858bfc6a992e7978a068a5c760deb0ed43caf" +checksum = "e665b8803e7b1d2a727f4023456bbbbe74da67099c585258af0ad9c5013b9b99" dependencies = [ "proc-macro2", "quote", "unicode-ident", ] +[[package]] +name = "syn-dissect-closure" +version = "0.1.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "343bae741672e4b94421cbe93f9794ba9a061434272f7e3a29ff43be26be3ac9" +dependencies = [ + "proc-macro2", + "quote", + "syn 2.0.117", +] + [[package]] name = "synstructure" -version = "0.13.1" +version = "0.13.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c8af7666ab7b6390ab78131fb5b0fce11d6b7a6951602017c35fa82800708971" +checksum = "728a70f3dbaf5bab7f0c4b1ac8d7ae5ea60a4b5549c8a5914361c99147a709d2" dependencies = [ "proc-macro2", "quote", - "syn 2.0.101", + "syn 2.0.117", ] [[package]] @@ -3831,9 +3773,9 @@ dependencies = [ [[package]] name = "tabled" -version = "0.19.0" +version = "0.20.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "228d124371171cd39f0f454b58f73ddebeeef3cef3207a82ffea1c29465aea43" +checksum = "e39a2ee1fbcd360805a771e1b300f78cc88fec7b8d3e2f71cd37bbf23e725c7d" dependencies = [ "papergrid", "tabled_derive", @@ -3850,7 +3792,7 @@ dependencies = [ "proc-macro-error2", "proc-macro2", "quote", - "syn 2.0.101", + "syn 2.0.117", ] [[package]] @@ -3861,15 +3803,15 @@ checksum = "c1bbb9f3c5c463a01705937a24fdabc5047929ac764b2d5b9cf681c1f5041ed5" [[package]] name = "tempfile" -version = "3.19.1" +version = "3.27.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "7437ac7763b9b123ccf33c338a5cc1bac6f69b45a136c19bdd8a65e3916435bf" +checksum = "32497e9a4c7b38532efcdebeef879707aa9f794296a4f0244f6f69e9bc8574bd" dependencies = [ "fastrand", - "getrandom 0.3.2", + "getrandom 0.4.2", "once_cell", - "rustix 1.0.5", - "windows-sys 0.59.0", + "rustix", + "windows-sys 0.61.2", ] [[package]] @@ -3883,12 +3825,12 @@ dependencies = [ [[package]] name = "terminal_size" -version = "0.4.2" +version = "0.4.3" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "45c6481c4829e4cc63825e62c49186a34538b7b2750b73b266581ffb612fb5ed" +checksum = "60b8cb979cb11c32ce1603f8137b22262a9d131aaa5c37b5678025f22b8becd0" dependencies = [ - "rustix 1.0.5", - "windows-sys 0.59.0", + "rustix", + "windows-sys 0.60.2", ] [[package]] @@ -3897,7 +3839,7 @@ version = "0.3.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "0f8daae29995a24f65619e19d8d31dea5b389f3d853d8bf297bbf607cd0014cc" dependencies = [ - "unicode-width 0.2.0", + "unicode-width 0.2.2", ] [[package]] @@ -3911,11 +3853,11 @@ dependencies = [ [[package]] name = "thiserror" -version = "2.0.12" +version = "2.0.18" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "567b8a2dae586314f7be2a752ec7474332959c6460e02bde30d702a66d488708" +checksum = "4288b5bcbc7920c07a1149a35cf9590a2aa808e0bc1eafaade0b80947865fbc4" dependencies = [ - "thiserror-impl 2.0.12", + "thiserror-impl 2.0.18", ] [[package]] @@ -3926,18 +3868,18 @@ checksum = "4fee6c4efc90059e10f81e6d42c60a18f76588c3d74cb83a0b242a2b6c7504c1" dependencies = [ "proc-macro2", "quote", - "syn 2.0.101", + "syn 2.0.117", ] [[package]] name = "thiserror-impl" -version = "2.0.12" +version = "2.0.18" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "7f7cf42b4507d8ea322120659672cf1b9dbb93f8f2d4ecfd6e51350ff5b17a1d" +checksum = "ebc4ee7f67670e9b64d05fa4253e753e016c6c95ff35b89b7941d6b856dec1d5" dependencies = [ "proc-macro2", "quote", - "syn 2.0.101", + "syn 2.0.117", ] [[package]] @@ -3948,40 +3890,39 @@ checksum = "3bf63baf9f5039dadc247375c29eb13706706cfde997d0330d05aa63a77d8820" [[package]] name = "thread_local" -version = "1.1.8" +version = "1.1.9" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "8b9ef9bad013ada3808854ceac7b46812a6465ba368859a37e2100283d2d719c" +checksum = "f60246a4944f24f6e018aa17cdeffb7818b76356965d03b07d6a9886e8962185" dependencies = [ "cfg-if", - "once_cell", ] [[package]] name = "time" -version = "0.3.41" +version = "0.3.47" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "8a7619e19bc266e0f9c5e6686659d394bc57973859340060a69221e57dbc0c40" +checksum = "743bd48c283afc0388f9b8827b976905fb217ad9e647fae3a379a9283c4def2c" dependencies = [ "deranged", "itoa", "num-conv", "powerfmt", - "serde", + "serde_core", "time-core", "time-macros", ] [[package]] name = "time-core" -version = "0.1.4" +version = "0.1.8" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c9e9a38711f559d9e3ce1cdb06dd7c5b8ea546bc90052da6d06bb76da74bb07c" +checksum = "7694e1cfe791f8d31026952abf09c69ca6f6fa4e1a1229e18988f06a04a12dca" [[package]] name = "time-macros" -version = "0.2.22" +version = "0.2.27" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "3526739392ec93fd8b359c8e98514cb3e8e021beb4e5f597b00a0221f8ed8a49" +checksum = "2e70e4c5a0e0a8a4823ad65dfe1a6930e4f4d756dcd9dd7939022b5e8c501215" dependencies = [ "num-conv", "time-core", @@ -3989,9 +3930,9 @@ dependencies = [ [[package]] name = "tinystr" -version = "0.7.6" +version = "0.8.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "9117f5d4db391c1cf6927e7bea3db74b9a1c1add8f7eda9ffd5364f40f57b82f" +checksum = "42d3e9c45c09de15d06dd8acf5f4e0e399e85927b7f00711024eb7ae10fa4869" dependencies = [ "displaydoc", "zerovec", @@ -3999,24 +3940,23 @@ dependencies = [ [[package]] name = "tokio" -version = "1.44.2" +version = "1.50.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e6b88822cbe49de4185e3a4cbf8321dd487cf5fe0c5c65695fef6346371e9c48" +checksum = "27ad5e34374e03cfffefc301becb44e9dc3c17584f414349ebe29ed26661822d" dependencies = [ - "backtrace", "bytes", "libc", "mio", "pin-project-lite", "socket2", - "windows-sys 0.52.0", + "windows-sys 0.61.2", ] [[package]] name = "tokio-util" -version = "0.7.15" +version = "0.7.18" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "66a539a9ad6d5d281510d5bd368c973d636c02dbf8a67300bfb6b950696ad7df" +checksum = "9ae9cec805b01e8fc3fd2fe289f89149a9b66dd16786abd8b19cfa7b48cb0098" dependencies = [ "bytes", "futures-core", @@ -4027,26 +3967,39 @@ dependencies = [ [[package]] name = "toml_datetime" -version = "0.6.9" +version = "1.0.1+spec-1.1.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "3da5db5a963e24bc68be8b17b6fa82814bb22ee8660f192bb182771d498f09a3" +checksum = "9b320e741db58cac564e26c607d3cc1fdc4a88fd36c879568c07856ed83ff3e9" +dependencies = [ + "serde_core", +] [[package]] name = "toml_edit" -version = "0.22.26" +version = "0.25.5+spec-1.1.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "310068873db2c5b3e7659d2cc35d21855dbafa50d1ce336397c666e3cb08137e" +checksum = "8ca1a40644a28bce036923f6a431df0b34236949d111cc07cb6dca830c9ef2e1" dependencies = [ - "indexmap 2.9.0", + "indexmap 2.13.0", "toml_datetime", + "toml_parser", + "winnow", +] + +[[package]] +name = "toml_parser" +version = "1.0.10+spec-1.1.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "7df25b4befd31c4816df190124375d5a20c6b6921e2cad937316de3fccd63420" +dependencies = [ "winnow", ] [[package]] name = "tracing" -version = "0.1.41" +version = "0.1.44" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "784e0ac535deb450455cbfa28a6f0df145ea1bb7ae51b821cf5e7927fdcfbdd0" +checksum = "63e71662fa4b2a2c3a26f570f037eb95bb1f85397f3cd8076caed2f026a6d100" dependencies = [ "pin-project-lite", "tracing-attributes", @@ -4055,20 +4008,20 @@ dependencies = [ [[package]] name = "tracing-attributes" -version = "0.1.28" +version = "0.1.31" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "395ae124c09f9e6918a2310af6038fba074bcf474ac352496d5910dd59a2226d" +checksum = "7490cfa5ec963746568740651ac6781f701c9c5ea257c58e057f3ba8cf69e8da" dependencies = [ "proc-macro2", "quote", - "syn 2.0.101", + "syn 2.0.117", ] [[package]] name = "tracing-core" -version = "0.1.33" +version = "0.1.36" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e672c95779cf947c5311f83787af4fa8fffd12fb27e4993211a84bdfd9610f9c" +checksum = "db97caf9d906fbde555dd62fa95ddba9eecfd14cb388e4f491a66d74cd5fb79a" dependencies = [ "once_cell", "valuable", @@ -4087,14 +4040,14 @@ dependencies = [ [[package]] name = "tracing-subscriber" -version = "0.3.19" +version = "0.3.23" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e8189decb5ac0fa7bc8b96b7cb9b2701d60d48805aca84a238004d665fcc4008" +checksum = "cb7f578e5945fb242538965c2d0b04418d38ec25c79d160cd279bf0731c8d319" dependencies = [ "matchers", "nu-ansi-term", "once_cell", - "regex", + "regex-automata", "sharded-slab", "smallvec", "thread_local", @@ -4105,9 +4058,9 @@ dependencies = [ [[package]] name = "typenum" -version = "1.18.0" +version = "1.19.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "1dccffe3ce07af9386bfd29e80c0ab1a8205a2fc34e4bcd40364df902cfa8f3f" +checksum = "562d481066bde0658276a35467c4af00bdc6ee726305698a55b86e61d7ad82bb" [[package]] name = "ucd-trie" @@ -4117,9 +4070,9 @@ checksum = "2896d95c02a80c6d6a5d6e953d479f5ddf2dfdb6a244441010e373ac0fb88971" [[package]] name = "unicode-ident" -version = "1.0.18" +version = "1.0.24" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "5a5f39404a5da50712a4c1eecf25e90dd62b613502b7e925fd4e4d19b5c96512" +checksum = "e6e4313cd5fcd3dad5cafa179702e2b244f760991f45397d14d4ebf38247da75" [[package]] name = "unicode-reverse" @@ -4144,9 +4097,15 @@ checksum = "7dd6e30e90baa6f72411720665d41d89b9a3d039dc45b8faea1ddd07f617f6af" [[package]] name = "unicode-width" -version = "0.2.0" +version = "0.2.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "b4ac048d71ede7ee76d585517add45da530660ef4390e49b098733c6e897f254" + +[[package]] +name = "unicode-xid" +version = "0.2.6" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "1fc81956842c57dac11422a97c3b8195a1ff727f06e85c84ed2e8aa277c9a0fd" +checksum = "ebc1c04c71510c7f702b52b7c350734c9ff1295c464a03335b00bb84fc54f853" [[package]] name = "untrusted" @@ -4156,17 +4115,16 @@ checksum = "8ecb6da28b8a351d773b68d5825ac39017e680750f980f3a1a85cd8dd28a47c1" [[package]] name = "ureq" -version = "3.0.11" +version = "3.2.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b7a3e9af6113ecd57b8c63d3cd76a385b2e3881365f1f489e54f49801d0c83ea" +checksum = "fdc97a28575b85cfedf2a7e7d3cc64b3e11bd8ac766666318003abbacc7a21fc" dependencies = [ - "base64 0.22.1", + "base64", "cookie_store", "flate2", "log", "percent-encoding", "rustls", - "rustls-pemfile", "rustls-pki-types", "serde", "serde_json", @@ -4177,11 +4135,11 @@ dependencies = [ [[package]] name = "ureq-proto" -version = "0.4.1" +version = "0.5.3" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "fadf18427d33828c311234884b7ba2afb57143e6e7e69fda7ee883b624661e36" +checksum = "d81f9efa9df032be5934a46a068815a10a042b494b6a58cb0a1a97bb5467ed6f" dependencies = [ - "base64 0.22.1", + "base64", "http", "httparse", "log", @@ -4189,13 +4147,14 @@ dependencies = [ [[package]] name = "url" -version = "2.5.4" +version = "2.5.8" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "32f8b686cadd1473f4bd0117a5d28d36b1ade384ea9b5069a1c40aefed7fda60" +checksum = "ff67a8a4397373c3ef660812acab3268222035010ab8680ec4215f38ba3d0eed" dependencies = [ "form_urlencoded", "idna", "percent-encoding", + "serde", ] [[package]] @@ -4210,12 +4169,6 @@ version = "0.7.6" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "09cc8ee72d2a9becf2f2febe0205bbed8fc6615b7cb429ad062dc7b7ddd036a9" -[[package]] -name = "utf16_iter" -version = "1.0.5" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c8232dd3cdaed5356e0f716d285e4b40b932ac434100fe9b7e0e8e935b9e6246" - [[package]] name = "utf8_iter" version = "1.0.4" @@ -4230,11 +4183,13 @@ checksum = "06abde3611657adf66d383f00b093d7faecc7fa57071cce2578660c9f1010821" [[package]] name = "uuid" -version = "1.16.0" +version = "1.22.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "458f7a779bf54acc9f347480ac654f68407d3aab21269a6e3c9f922acd9e2da9" +checksum = "a68d3c8f01c0cfa54a75291d83601161799e4a89a39e0929f4b0354d88757a37" dependencies = [ - "getrandom 0.3.2", + "getrandom 0.4.2", + "js-sys", + "wasm-bindgen", ] [[package]] @@ -4269,50 +4224,46 @@ checksum = "0b928f33d975fc6ad9f86c8f283853ad26bdd5b10b7f1542aa2fa15e2289105a" [[package]] name = "wasi" -version = "0.11.0+wasi-snapshot-preview1" +version = "0.11.1+wasi-snapshot-preview1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "9c8d87e72b64a3b4db28d11ce29237c246188f4f51057d65a7eab63b7987e423" +checksum = "ccf3ec651a847eb01de73ccad15eb7d99f80485de043efb2f370cd654f4ea44b" [[package]] -name = "wasi" -version = "0.14.2+wasi-0.2.4" +name = "wasip2" +version = "1.0.2+wasi-0.2.9" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "9683f9a5a998d873c0d21fcbe3c083009670149a8fab228644b8bd36b2c48cb3" +checksum = "9517f9239f02c069db75e65f174b3da828fe5f5b945c4dd26bd25d89c03ebcf5" dependencies = [ - "wit-bindgen-rt", + "wit-bindgen", ] [[package]] -name = "wasm-bindgen" -version = "0.2.100" +name = "wasip3" +version = "0.4.0+wasi-0.3.0-rc-2026-01-06" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "1edc8929d7499fc4e8f0be2262a241556cfc54a0bea223790e71446f2aab1ef5" +checksum = "5428f8bf88ea5ddc08faddef2ac4a67e390b88186c703ce6dbd955e1c145aca5" dependencies = [ - "cfg-if", - "once_cell", - "rustversion", - "wasm-bindgen-macro", + "wit-bindgen", ] [[package]] -name = "wasm-bindgen-backend" -version = "0.2.100" +name = "wasm-bindgen" +version = "0.2.114" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "2f0a0651a5c2bc21487bde11ee802ccaf4c51935d0d3d42a6101f98161700bc6" +checksum = "6532f9a5c1ece3798cb1c2cfdba640b9b3ba884f5db45973a6f442510a87d38e" dependencies = [ - "bumpalo", - "log", - "proc-macro2", - "quote", - "syn 2.0.101", + "cfg-if", + "once_cell", + "rustversion", + "wasm-bindgen-macro", "wasm-bindgen-shared", ] [[package]] name = "wasm-bindgen-macro" -version = "0.2.100" +version = "0.2.114" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "7fe63fc6d09ed3792bd0897b314f53de8e16568c2b3f7982f468c0bf9bd0b407" +checksum = "18a2d50fcf105fb33bb15f00e7a77b772945a2ee45dcf454961fd843e74c18e6" dependencies = [ "quote", "wasm-bindgen-macro-support", @@ -4320,52 +4271,83 @@ dependencies = [ [[package]] name = "wasm-bindgen-macro-support" -version = "0.2.100" +version = "0.2.114" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "8ae87ea40c9f689fc23f209965b6fb8a99ad69aeeb0231408be24920604395de" +checksum = "03ce4caeaac547cdf713d280eda22a730824dd11e6b8c3ca9e42247b25c631e3" dependencies = [ + "bumpalo", "proc-macro2", "quote", - "syn 2.0.101", - "wasm-bindgen-backend", + "syn 2.0.117", "wasm-bindgen-shared", ] [[package]] name = "wasm-bindgen-shared" -version = "0.2.100" +version = "0.2.114" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "1a05d73b933a847d6cccdda8f838a22ff101ad9bf93e33684f39c1f5f0eece3d" +checksum = "75a326b8c223ee17883a4251907455a2431acc2791c98c26279376490c378c16" dependencies = [ "unicode-ident", ] +[[package]] +name = "wasm-encoder" +version = "0.244.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "990065f2fe63003fe337b932cfb5e3b80e0b4d0f5ff650e6985b1048f62c8319" +dependencies = [ + "leb128fmt", + "wasmparser", +] + +[[package]] +name = "wasm-metadata" +version = "0.244.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "bb0e353e6a2fbdc176932bbaab493762eb1255a7900fe0fea1a2f96c296cc909" +dependencies = [ + "anyhow", + "indexmap 2.13.0", + "wasm-encoder", + "wasmparser", +] + +[[package]] +name = "wasmparser" +version = "0.244.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "47b807c72e1bac69382b3a6fb3dbe8ea4c0ed87ff5629b8685ae6b9a611028fe" +dependencies = [ + "bitflags 2.11.0", + "hashbrown 0.15.5", + "indexmap 2.13.0", + "semver", +] + [[package]] name = "webpki-roots" -version = "0.26.9" +version = "1.0.6" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "29aad86cec885cafd03e8305fd727c418e970a521322c91688414d5b8efba16b" +checksum = "22cfaf3c063993ff62e73cb4311efde4db1efb31ab78a3e5c457939ad5cc0bed" dependencies = [ "rustls-pki-types", ] [[package]] name = "which" -version = "7.0.3" +version = "8.0.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "24d643ce3fd3e5b54854602a080f34fb10ab75e0b813ee32d00ca2b44fa74762" +checksum = "81995fafaaaf6ae47a7d0cc83c67caf92aeb7e5331650ae6ff856f7c0c60c459" dependencies = [ - "either", - "env_home", - "rustix 1.0.5", - "winsafe", + "libc", ] [[package]] name = "wide" -version = "0.7.32" +version = "0.7.33" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "41b5576b9a81633f3e8df296ce0063042a73507636cbe956c61133dd7034ab22" +checksum = "0ce5da8ecb62bcd8ec8b7ea19f69a51275e91299be594ea5cc6ef7819e16cd03" dependencies = [ "bytemuck", "safe_arch", @@ -4389,11 +4371,11 @@ checksum = "ac3b87c63620426dd9b991e5ce0329eff545bccbbb34f3be09ff6fb6ab51b7b6" [[package]] name = "winapi-util" -version = "0.1.9" +version = "0.1.11" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "cf221c93e13a30d793f7645a0e7762c55d169dbb0a49671918a2319d289b10bb" +checksum = "c2a7b1c03c876122aa43f3020e6c3c3ee5c05081c9a00739faf7503aeba10d22" dependencies = [ - "windows-sys 0.59.0", + "windows-sys 0.48.0", ] [[package]] @@ -4408,7 +4390,7 @@ version = "0.57.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "12342cb4d8e3b046f3d80effd474a7a02447231330ef77d71daa6fbc40681143" dependencies = [ - "windows-core 0.57.0", + "windows-core", "windows-targets 0.52.6", ] @@ -4418,25 +4400,12 @@ version = "0.57.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "d2ed2439a290666cd67ecce2b0ffaad89c2a56b976b736e6ece670297897832d" dependencies = [ - "windows-implement 0.57.0", - "windows-interface 0.57.0", - "windows-result 0.1.2", + "windows-implement", + "windows-interface", + "windows-result", "windows-targets 0.52.6", ] -[[package]] -name = "windows-core" -version = "0.61.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "4763c1de310c86d75a878046489e2e5ba02c649d185f21c67d4cf8a56d098980" -dependencies = [ - "windows-implement 0.60.0", - "windows-interface 0.59.1", - "windows-link", - "windows-result 0.3.2", - "windows-strings", -] - [[package]] name = "windows-implement" version = "0.57.0" @@ -4445,18 +4414,7 @@ checksum = "9107ddc059d5b6fbfbffdfa7a7fe3e22a226def0b2608f72e9d552763d3e1ad7" dependencies = [ "proc-macro2", "quote", - "syn 2.0.101", -] - -[[package]] -name = "windows-implement" -version = "0.60.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a47fddd13af08290e67f4acabf4b459f647552718f683a7b415d290ac744a836" -dependencies = [ - "proc-macro2", - "quote", - "syn 2.0.101", + "syn 2.0.117", ] [[package]] @@ -4467,25 +4425,14 @@ checksum = "29bee4b38ea3cde66011baa44dba677c432a78593e202392d1e9070cf2a7fca7" dependencies = [ "proc-macro2", "quote", - "syn 2.0.101", -] - -[[package]] -name = "windows-interface" -version = "0.59.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "bd9211b69f8dcdfa817bfd14bf1c97c9188afa36f4750130fcdf3f400eca9fa8" -dependencies = [ - "proc-macro2", - "quote", - "syn 2.0.101", + "syn 2.0.117", ] [[package]] name = "windows-link" -version = "0.1.1" +version = "0.2.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "76840935b766e1b0a05c0066835fb9ec80071d4c09a16f6bd5f7e655e3c14c38" +checksum = "f0805222e57f7521d6a62e36fa9163bc891acd422f971defe97d64e70d0a4fe5" [[package]] name = "windows-result" @@ -4497,48 +4444,48 @@ dependencies = [ ] [[package]] -name = "windows-result" -version = "0.3.2" +name = "windows-sys" +version = "0.48.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c64fd11a4fd95df68efcfee5f44a294fe71b8bc6a91993e2791938abcc712252" +checksum = "677d2418bec65e3338edb076e806bc1ec15693c5d0104683f2efe857f61056a9" dependencies = [ - "windows-link", + "windows-targets 0.48.5", ] [[package]] -name = "windows-strings" -version = "0.4.0" +name = "windows-sys" +version = "0.52.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "7a2ba9642430ee452d5a7aa78d72907ebe8cfda358e8cb7918a2050581322f97" +checksum = "282be5f36a8ce781fad8c8ae18fa3f9beff57ec1b52cb3de0789201425d9a33d" dependencies = [ - "windows-link", + "windows-targets 0.52.6", ] [[package]] name = "windows-sys" -version = "0.48.0" +version = "0.59.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "677d2418bec65e3338edb076e806bc1ec15693c5d0104683f2efe857f61056a9" +checksum = "1e38bc4d79ed67fd075bcc251a1c39b32a1776bbe92e5bef1f0bf1f8c531853b" dependencies = [ - "windows-targets 0.48.5", + "windows-targets 0.52.6", ] [[package]] name = "windows-sys" -version = "0.52.0" +version = "0.60.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "282be5f36a8ce781fad8c8ae18fa3f9beff57ec1b52cb3de0789201425d9a33d" +checksum = "f2f500e4d28234f72040990ec9d39e3a6b950f9f22d3dba18416c35882612bcb" dependencies = [ - "windows-targets 0.52.6", + "windows-targets 0.53.5", ] [[package]] name = "windows-sys" -version = "0.59.0" +version = "0.61.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "1e38bc4d79ed67fd075bcc251a1c39b32a1776bbe92e5bef1f0bf1f8c531853b" +checksum = "ae137229bcbd6cdf0f7b80a31df61766145077ddf49416a728b02cb3921ff3fc" dependencies = [ - "windows-targets 0.52.6", + "windows-link", ] [[package]] @@ -4565,13 +4512,30 @@ dependencies = [ "windows_aarch64_gnullvm 0.52.6", "windows_aarch64_msvc 0.52.6", "windows_i686_gnu 0.52.6", - "windows_i686_gnullvm", + "windows_i686_gnullvm 0.52.6", "windows_i686_msvc 0.52.6", "windows_x86_64_gnu 0.52.6", "windows_x86_64_gnullvm 0.52.6", "windows_x86_64_msvc 0.52.6", ] +[[package]] +name = "windows-targets" +version = "0.53.5" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "4945f9f551b88e0d65f3db0bc25c33b8acea4d9e41163edf90dcd0b19f9069f3" +dependencies = [ + "windows-link", + "windows_aarch64_gnullvm 0.53.1", + "windows_aarch64_msvc 0.53.1", + "windows_i686_gnu 0.53.1", + "windows_i686_gnullvm 0.53.1", + "windows_i686_msvc 0.53.1", + "windows_x86_64_gnu 0.53.1", + "windows_x86_64_gnullvm 0.53.1", + "windows_x86_64_msvc 0.53.1", +] + [[package]] name = "windows_aarch64_gnullvm" version = "0.48.5" @@ -4584,6 +4548,12 @@ version = "0.52.6" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "32a4622180e7a0ec044bb555404c800bc9fd9ec262ec147edd5989ccd0c02cd3" +[[package]] +name = "windows_aarch64_gnullvm" +version = "0.53.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "a9d8416fa8b42f5c947f8482c43e7d89e73a173cead56d044f6a56104a6d1b53" + [[package]] name = "windows_aarch64_msvc" version = "0.48.5" @@ -4596,6 +4566,12 @@ version = "0.52.6" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "09ec2a7bb152e2252b53fa7803150007879548bc709c039df7627cabbd05d469" +[[package]] +name = "windows_aarch64_msvc" +version = "0.53.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "b9d782e804c2f632e395708e99a94275910eb9100b2114651e04744e9b125006" + [[package]] name = "windows_i686_gnu" version = "0.48.5" @@ -4608,12 +4584,24 @@ version = "0.52.6" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "8e9b5ad5ab802e97eb8e295ac6720e509ee4c243f69d781394014ebfe8bbfa0b" +[[package]] +name = "windows_i686_gnu" +version = "0.53.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "960e6da069d81e09becb0ca57a65220ddff016ff2d6af6a223cf372a506593a3" + [[package]] name = "windows_i686_gnullvm" version = "0.52.6" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "0eee52d38c090b3caa76c563b86c3a4bd71ef1a819287c19d586d7334ae8ed66" +[[package]] +name = "windows_i686_gnullvm" +version = "0.53.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "fa7359d10048f68ab8b09fa71c3daccfb0e9b559aed648a8f95469c27057180c" + [[package]] name = "windows_i686_msvc" version = "0.48.5" @@ -4626,6 +4614,12 @@ version = "0.52.6" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "240948bc05c5e7c6dabba28bf89d89ffce3e303022809e73deaefe4f6ec56c66" +[[package]] +name = "windows_i686_msvc" +version = "0.53.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "1e7ac75179f18232fe9c285163565a57ef8d3c89254a30685b57d83a38d326c2" + [[package]] name = "windows_x86_64_gnu" version = "0.48.5" @@ -4638,6 +4632,12 @@ version = "0.52.6" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "147a5c80aabfbf0c7d901cb5895d1de30ef2907eb21fbbab29ca94c5b08b1a78" +[[package]] +name = "windows_x86_64_gnu" +version = "0.53.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "9c3842cdd74a865a8066ab39c8a7a473c0778a3f29370b5fd6b4b9aa7df4a499" + [[package]] name = "windows_x86_64_gnullvm" version = "0.48.5" @@ -4650,6 +4650,12 @@ version = "0.52.6" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "24d5b23dc417412679681396f2b49f3de8c1473deb516bd34410872eff51ed0d" +[[package]] +name = "windows_x86_64_gnullvm" +version = "0.53.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "0ffa179e2d07eee8ad8f57493436566c7cc30ac536a3379fdf008f47f6bb7ae1" + [[package]] name = "windows_x86_64_msvc" version = "0.48.5" @@ -4662,11 +4668,17 @@ version = "0.52.6" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "589f6da84c646204747d1270a2a5661ea66ed1cced2631d546fdfb155959f9ec" +[[package]] +name = "windows_x86_64_msvc" +version = "0.53.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "d6bbff5f0aada427a1e5a6da5f1f98158182f26556f345ac9e04d36d0ebed650" + [[package]] name = "winnow" -version = "0.7.7" +version = "1.0.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "6cb8234a863ea0e8cd7284fcdd4f145233eb00fee02bbdd9861aec44e6477bc5" +checksum = "a90e88e4667264a994d34e6d1ab2d26d398dcdca8b7f52bec8668957517fc7d8" dependencies = [ "memchr", ] @@ -4683,31 +4695,98 @@ dependencies = [ ] [[package]] -name = "winsafe" -version = "0.0.19" +name = "wit-bindgen" +version = "0.51.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "d7249219f66ced02969388cf2bb044a09756a083d0fab1e566056b04d9fbcaa5" +dependencies = [ + "wit-bindgen-rust-macro", +] + +[[package]] +name = "wit-bindgen-core" +version = "0.51.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d135d17ab770252ad95e9a872d365cf3090e3be864a34ab46f48555993efc904" +checksum = "ea61de684c3ea68cb082b7a88508a8b27fcc8b797d738bfc99a82facf1d752dc" +dependencies = [ + "anyhow", + "heck", + "wit-parser", +] [[package]] -name = "wit-bindgen-rt" -version = "0.39.0" +name = "wit-bindgen-rust" +version = "0.51.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "6f42320e61fe2cfd34354ecb597f86f413484a798ba44a8ca1165c58d42da6c1" +checksum = "b7c566e0f4b284dd6561c786d9cb0142da491f46a9fbed79ea69cdad5db17f21" dependencies = [ - "bitflags 2.9.0", + "anyhow", + "heck", + "indexmap 2.13.0", + "prettyplease", + "syn 2.0.117", + "wasm-metadata", + "wit-bindgen-core", + "wit-component", ] [[package]] -name = "write16" -version = "1.0.0" +name = "wit-bindgen-rust-macro" +version = "0.51.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d1890f4022759daae28ed4fe62859b1236caebfc61ede2f63ed4e695f3f6d936" +checksum = "0c0f9bfd77e6a48eccf51359e3ae77140a7f50b1e2ebfe62422d8afdaffab17a" +dependencies = [ + "anyhow", + "prettyplease", + "proc-macro2", + "quote", + "syn 2.0.117", + "wit-bindgen-core", + "wit-bindgen-rust", +] + +[[package]] +name = "wit-component" +version = "0.244.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "9d66ea20e9553b30172b5e831994e35fbde2d165325bec84fc43dbf6f4eb9cb2" +dependencies = [ + "anyhow", + "bitflags 2.11.0", + "indexmap 2.13.0", + "log", + "serde", + "serde_derive", + "serde_json", + "wasm-encoder", + "wasm-metadata", + "wasmparser", + "wit-parser", +] + +[[package]] +name = "wit-parser" +version = "0.244.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "ecc8ac4bc1dc3381b7f59c34f00b67e18f910c2c0f50015669dde7def656a736" +dependencies = [ + "anyhow", + "id-arena", + "indexmap 2.13.0", + "log", + "semver", + "serde", + "serde_derive", + "serde_json", + "unicode-xid", + "wasmparser", +] [[package]] name = "writeable" -version = "0.5.5" +version = "0.6.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "1e9df38ee2d2c3c5948ea468a8406ff0db0b29ae1ffde1bcf20ef305bcc95c51" +checksum = "9edde0db4769d2dc68579893f2306b26c6ecfbe0ef499b013d731b7b9247e0b9" [[package]] name = "xxhash-rust" @@ -4733,22 +4812,12 @@ dependencies = [ "linked-hash-map", ] -[[package]] -name = "yansi-term" -version = "0.1.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "fe5c30ade05e61656247b2e334a031dfd0cc466fadef865bdcdea8d537951bf1" -dependencies = [ - "winapi", -] - [[package]] name = "yoke" -version = "0.7.5" +version = "0.8.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "120e6aef9aa629e3d4f52dc8cc43a015c7724194c97dfaf45180d2daf2b77f40" +checksum = "72d6e5c6afb84d73944e5cedb052c4680d5657337201555f9f2a16b7406d4954" dependencies = [ - "serde", "stable_deref_trait", "yoke-derive", "zerofrom", @@ -4756,54 +4825,34 @@ dependencies = [ [[package]] name = "yoke-derive" -version = "0.7.5" +version = "0.8.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "2380878cad4ac9aac1e2435f3eb4020e8374b5f13c296cb75b4620ff8e229154" +checksum = "b659052874eb698efe5b9e8cf382204678a0086ebf46982b79d6ca3182927e5d" dependencies = [ "proc-macro2", "quote", - "syn 2.0.101", + "syn 2.0.117", "synstructure", ] [[package]] name = "zerocopy" -version = "0.7.35" +version = "0.8.42" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "1b9b4fd18abc82b8136838da5d50bae7bdea537c574d8dc1a34ed098d6c166f0" +checksum = "f2578b716f8a7a858b7f02d5bd870c14bf4ddbbcf3a4c05414ba6503640505e3" dependencies = [ - "zerocopy-derive 0.7.35", -] - -[[package]] -name = "zerocopy" -version = "0.8.25" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a1702d9583232ddb9174e01bb7c15a2ab8fb1bc6f227aa1233858c351a3ba0cb" -dependencies = [ - "zerocopy-derive 0.8.25", -] - -[[package]] -name = "zerocopy-derive" -version = "0.7.35" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "fa4f8080344d4671fb4e831a13ad1e68092748387dfc4f55e356242fae12ce3e" -dependencies = [ - "proc-macro2", - "quote", - "syn 2.0.101", + "zerocopy-derive", ] [[package]] name = "zerocopy-derive" -version = "0.8.25" +version = "0.8.42" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "28a6e20d751156648aa063f3800b706ee209a32c0b4d9f24be3d980b01be55ef" +checksum = "7e6cc098ea4d3bd6246687de65af3f920c430e236bee1e3bf2e441463f08a02f" dependencies = [ "proc-macro2", "quote", - "syn 2.0.101", + "syn 2.0.117", ] [[package]] @@ -4823,21 +4872,32 @@ checksum = "d71e5d6e06ab090c67b5e44993ec16b72dcbaabc526db883a360057678b48502" dependencies = [ "proc-macro2", "quote", - "syn 2.0.101", + "syn 2.0.117", "synstructure", ] [[package]] name = "zeroize" -version = "1.8.1" +version = "1.8.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "b97154e67e32c85465826e8bcc1c59429aaaf107c1e4a9e53c8d8ccd5eff88d0" + +[[package]] +name = "zerotrie" +version = "0.2.3" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ced3678a2879b30306d323f4542626697a464a97c0a07c9aebf7ebca65cd4dde" +checksum = "2a59c17a5562d507e4b54960e8569ebee33bee890c70aa3fe7b97e85a9fd7851" +dependencies = [ + "displaydoc", + "yoke", + "zerofrom", +] [[package]] name = "zerovec" -version = "0.10.4" +version = "0.11.5" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "aa2b893d79df23bfb12d5461018d408ea19dfafe76c2c7ef6d4eba614f8ff079" +checksum = "6c28719294829477f525be0186d13efa9a3c602f7ec202ca9e353d310fb9a002" dependencies = [ "yoke", "zerofrom", @@ -4846,15 +4906,21 @@ dependencies = [ [[package]] name = "zerovec-derive" -version = "0.10.3" +version = "0.11.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "6eafa6dfb17584ea3e2bd6e76e0cc15ad7af12b09abdd1ca55961bed9b1063c6" +checksum = "eadce39539ca5cb3985590102671f2567e659fca9666581ad3411d59207951f3" dependencies = [ "proc-macro2", "quote", - "syn 2.0.101", + "syn 2.0.117", ] +[[package]] +name = "zmij" +version = "1.0.21" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "b8848ee67ecc8aedbaf3e4122217aff892639231befc6a1b58d29fff4c2cabaa" + [[package]] name = "zstd" version = "0.13.3" @@ -4875,9 +4941,9 @@ dependencies = [ [[package]] name = "zstd-sys" -version = "2.0.15+zstd.1.5.7" +version = "2.0.16+zstd.1.5.7" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "eb81183ddd97d0c74cedf1d50d85c8d08c1b8b68ee863bdee9e706eedba1a237" +checksum = "91e19ebc2adc8f83e43039e79776e3fda8ca919132d68a1fed6a5faca2683748" dependencies = [ "cc", "pkg-config", diff --git a/Cargo.toml b/Cargo.toml index c266871..ce8082f 100644 --- a/Cargo.toml +++ b/Cargo.toml @@ -50,7 +50,7 @@ clap = { version = "4.5.37", features = [ "usage", "error-context", ] } -cmd_lib = "^1.9.5" +cmd_lib = "^1.9.6" tracing = "0.1.41" tracing-subscriber = { version = "0.3.19", default-features = true, features = [ "env-filter", @@ -65,17 +65,17 @@ time = { version = "^0.3.41", features = [ "serde", "serde-human-readable", ] } -which = "7.0.3" -jrsonnet-evaluator = "0.5.0-pre95" -jrsonnet-cli = "0.5.0-pre95" -jrsonnet-parser = "0.5.0-pre95" +which = "8.0.2" +jrsonnet-evaluator = "=0.5.0-pre97" +jrsonnet-cli = "=0.5.0-pre97" +jrsonnet-parser = "=0.5.0-pre97" thiserror = "2.0.12" -phf = { version = "0.11.3", features = ["macros"] } +phf = { version = "0.13.1", features = ["macros"] } chrono = "0.4.40" -tabled = "0.19.0" +tabled = "0.20.0" csv = "1.3.1" -strum = { version = "0.27.1", features = ["derive", "phf"] } -strum_macros = "0.27.1" +strum = { version = "0.28.0", features = ["derive", "phf"] } +strum_macros = "0.28.0" niffler = { version = "3.0.0", default-features = false, features = ["gz"] } flate2 = { version = "1.1.1", default-features = false, features = ["zlib-ng"] } blake3 = { version = "1.8.2", features = ["mmap", "serde"] } diff --git a/bump_and_publish.sh b/bump_and_publish.sh new file mode 100755 index 0000000..f752f0b --- /dev/null +++ b/bump_and_publish.sh @@ -0,0 +1,392 @@ +#!/usr/bin/env bash +set -euo pipefail + +die() { + echo "error: $*" >&2 + exit 1 +} + +usage() { + cat <<'EOF' +Usage: + ./bump_and_publish.sh [--publish] [--dry-run] + ./bump_and_publish.sh [--publish] [--dry-run] + +Options: + --publish Publish to crates.io after bumping, committing, tagging, and pushing + --dry-run Show what would be done without modifying tracked files, creating commits or tags, pushing, or publishing + -h, --help Show this help message +EOF +} + +print_cmd() { + printf '+' + printf ' %q' "$@" + printf '\n' +} + +run() { + print_cmd "$@" + if [[ "$DRY_RUN" == true ]]; then + return 0 + fi + "$@" +} + +is_valid_semver() { + local version="$1" + local semver_regex='^(0|[1-9][0-9]*)\.(0|[1-9][0-9]*)\.(0|[1-9][0-9]*)(-((0|[1-9][0-9]*|[0-9A-Za-z-]*[A-Za-z-][0-9A-Za-z-]*)(\.(0|[1-9][0-9]*|[0-9A-Za-z-]*[A-Za-z-][0-9A-Za-z-]*))*))?(\+([0-9A-Za-z-]+(\.[0-9A-Za-z-]+)*))?$' + printf '%s\n' "$version" | grep -Eq "$semver_regex" +} + +split_semver() { + local version="$1" + local core="$version" + local pre="" + local major minor patch + + if [[ "$core" == *+* ]]; then + core="${core%%+*}" + fi + + if [[ "$core" == *-* ]]; then + pre="${core#*-}" + core="${core%%-*}" + fi + + IFS='.' read -r major minor patch <<<"$core" + printf '%s\t%s\t%s\t%s\n' "$major" "$minor" "$patch" "$pre" +} + +compare_prerelease() { + local left="$1" + local right="$2" + + if [[ -z "$left" && -z "$right" ]]; then + echo 0 + return + fi + if [[ -z "$left" ]]; then + echo 1 + return + fi + if [[ -z "$right" ]]; then + echo -1 + return + fi + + local -a lparts=() + local -a rparts=() + IFS='.' read -r -a lparts <<<"$left" + IFS='.' read -r -a rparts <<<"$right" + + local i + local lnum rnum + for ((i = 0; i < ${#lparts[@]} || i < ${#rparts[@]}; i++)); do + if ((i >= ${#lparts[@]})); then + echo -1 + return + fi + if ((i >= ${#rparts[@]})); then + echo 1 + return + fi + + if [[ "${lparts[$i]}" == "${rparts[$i]}" ]]; then + continue + fi + + if [[ "${lparts[$i]}" =~ ^(0|[1-9][0-9]*)$ ]]; then + lnum=1 + else + lnum=0 + fi + if [[ "${rparts[$i]}" =~ ^(0|[1-9][0-9]*)$ ]]; then + rnum=1 + else + rnum=0 + fi + + if ((lnum == 1 && rnum == 1)); then + if ((10#${lparts[$i]} > 10#${rparts[$i]})); then + echo 1 + else + echo -1 + fi + return + fi + if ((lnum == 1 && rnum == 0)); then + echo -1 + return + fi + if ((lnum == 0 && rnum == 1)); then + echo 1 + return + fi + + if [[ "${lparts[$i]}" > "${rparts[$i]}" ]]; then + echo 1 + else + echo -1 + fi + return + done + + echo 0 +} + +compare_semver() { + local left="$1" + local right="$2" + + local lmaj lmin lpat lpre + local rmaj rmin rpat rpre + IFS=$'\t' read -r lmaj lmin lpat lpre <<<"$(split_semver "$left")" + IFS=$'\t' read -r rmaj rmin rpat rpre <<<"$(split_semver "$right")" + + if ((10#$lmaj > 10#$rmaj)); then + echo 1 + return + fi + if ((10#$lmaj < 10#$rmaj)); then + echo -1 + return + fi + + if ((10#$lmin > 10#$rmin)); then + echo 1 + return + fi + if ((10#$lmin < 10#$rmin)); then + echo -1 + return + fi + + if ((10#$lpat > 10#$rpat)); then + echo 1 + return + fi + if ((10#$lpat < 10#$rpat)); then + echo -1 + return + fi + + compare_prerelease "$lpre" "$rpre" +} + +VERSION="" +PUBLISH=false +DRY_RUN=false + +while [[ $# -gt 0 ]]; do + case "$1" in + --publish) + PUBLISH=true + ;; + --dry-run) + DRY_RUN=true + ;; + -h|--help) + usage + exit 0 + ;; + -*) + die "unknown option: $1" + ;; + *) + if [[ -n "$VERSION" ]]; then + die "version specified more than once" + fi + VERSION="$1" + ;; + esac + shift +done + +[[ -n "$VERSION" ]] || { + usage + exit 1 +} + +SCRIPT_DIR="$(cd "$(dirname "${BASH_SOURCE[0]}")" && pwd)" +cd "$SCRIPT_DIR" + +ROOT_CARGO="Cargo.toml" +LOCKFILE="Cargo.lock" +CRATE_NAME="simpleaf" +TAG="v${VERSION}" +TMP_TARGET_DIR="" +MANIFEST_BACKUP="" +LOCKFILE_BACKUP="" +MANIFEST_UPDATED=false +COMMIT_CREATED=false + +cleanup() { + local status=$? + + if [[ -n "$TMP_TARGET_DIR" && -d "$TMP_TARGET_DIR" ]]; then + rm -rf "$TMP_TARGET_DIR" + fi + + if [[ "$status" -ne 0 && "$DRY_RUN" == false && "$MANIFEST_UPDATED" == true && "$COMMIT_CREATED" == false ]]; then + if [[ -n "$MANIFEST_BACKUP" && -f "$MANIFEST_BACKUP" ]]; then + cp "$MANIFEST_BACKUP" "$ROOT_CARGO" + fi + if [[ -n "$LOCKFILE_BACKUP" && -f "$LOCKFILE_BACKUP" ]]; then + cp "$LOCKFILE_BACKUP" "$LOCKFILE" + fi + echo "restored $ROOT_CARGO and $LOCKFILE after failure" >&2 + fi + + if [[ -n "$MANIFEST_BACKUP" && -f "$MANIFEST_BACKUP" ]]; then + rm -f "$MANIFEST_BACKUP" + fi + if [[ -n "$LOCKFILE_BACKUP" && -f "$LOCKFILE_BACKUP" ]]; then + rm -f "$LOCKFILE_BACKUP" + fi + + return "$status" +} + +trap cleanup EXIT + +[[ -f "$ROOT_CARGO" ]] || die "not found: $ROOT_CARGO" +[[ -f "$LOCKFILE" ]] || die "not found: $LOCKFILE" +git rev-parse --is-inside-work-tree >/dev/null 2>&1 || die "current directory is not a git repository" + +is_valid_semver "$VERSION" || die "version '$VERSION' is not valid SemVer 2.0.0" + +CURRENT_VERSION="$( + awk ' + /^\[package\]/ { in_package=1; next } + in_package && /^\[/ { in_package=0 } + in_package && /^[[:space:]]*version[[:space:]]*=/ { + match($0, /"[^"]+"/) + if (RSTART > 0) { + print substr($0, RSTART + 1, RLENGTH - 2) + exit + } + } + ' "$ROOT_CARGO" +)" +[[ -n "$CURRENT_VERSION" ]] || die "could not determine current crate version from $ROOT_CARGO" +is_valid_semver "$CURRENT_VERSION" || die "current crate version '$CURRENT_VERSION' is not valid SemVer" + +CMP="$(compare_semver "$VERSION" "$CURRENT_VERSION")" +if [[ "$CMP" -le 0 ]]; then + die "new version '$VERSION' must be greater than current version '$CURRENT_VERSION'" +fi + +if git rev-parse "$TAG" >/dev/null 2>&1; then + die "tag $TAG already exists" +fi + +if [[ -n "$(git status --porcelain)" ]]; then + die "working tree is not clean; commit or stash existing changes first" +fi + +if ! git remote get-url origin >/dev/null 2>&1; then + die "git remote 'origin' is not configured" +fi + +echo "Current crate version : $CURRENT_VERSION" +echo "New crate version : $VERSION" +echo "Tag : $TAG" +if [[ "$PUBLISH" == true ]]; then + echo "Publish : yes" +else + echo "Publish : no" +fi +if [[ "$DRY_RUN" == true ]]; then + echo "Dry-run : yes" +else + echo "Dry-run : no" +fi +echo + +echo "Preflight checks before changing version" +cargo check -q +TMP_TARGET_DIR="$(mktemp -d "${TMPDIR:-/tmp}/simpleaf-release-check.XXXXXX")" +CARGO_TARGET_DIR="$TMP_TARGET_DIR" cargo package --offline --allow-dirty --no-verify >/dev/null +rm -rf "$TMP_TARGET_DIR" +TMP_TARGET_DIR="" + +echo "Updating $ROOT_CARGO" +echo " version: $CURRENT_VERSION -> $VERSION" +echo "Updating $LOCKFILE" +echo " package entry version: $CURRENT_VERSION -> $VERSION" + +if [[ "$DRY_RUN" == false ]]; then + MANIFEST_BACKUP="$(mktemp "${TMPDIR:-/tmp}/simpleaf-Cargo.toml.XXXXXX")" + LOCKFILE_BACKUP="$(mktemp "${TMPDIR:-/tmp}/simpleaf-Cargo.lock.XXXXXX")" + cp "$ROOT_CARGO" "$MANIFEST_BACKUP" + cp "$LOCKFILE" "$LOCKFILE_BACKUP" + + sed -i.bak "1,/^version = /s/^version = \".*\"/version = \"${VERSION}\"/" "$ROOT_CARGO" + rm -f "${ROOT_CARGO}.bak" + + sed -i.bak "/^name = \"${CRATE_NAME}\"$/,/^dependencies = \\[$/s/^version = \".*\"/version = \"${VERSION}\"/" "$LOCKFILE" + rm -f "${LOCKFILE}.bak" + + MANIFEST_UPDATED=true +else + echo "Dry-run: would rewrite $ROOT_CARGO and $LOCKFILE" +fi + +UPDATED_VERSION="$CURRENT_VERSION" +UPDATED_LOCK_VERSION="$CURRENT_VERSION" +if [[ "$DRY_RUN" == false ]]; then + UPDATED_VERSION="$( + awk ' + /^\[package\]/ { in_package=1; next } + in_package && /^\[/ { in_package=0 } + in_package && /^[[:space:]]*version[[:space:]]*=/ { + match($0, /"[^"]+"/) + if (RSTART > 0) { + print substr($0, RSTART + 1, RLENGTH - 2) + exit + } + } + ' "$ROOT_CARGO" + )" + UPDATED_LOCK_VERSION="$(sed -n "/^name = \"${CRATE_NAME}\"$/,/^dependencies = \\[$/s/^version = \"\(.*\)\"/\1/p" "$LOCKFILE" | head -1)" + + [[ "$UPDATED_VERSION" == "$VERSION" ]] || die "crate version update failed" + [[ "$UPDATED_LOCK_VERSION" == "$VERSION" ]] || die "lockfile version update failed" +fi + +echo +echo "Post-bump validation" +if [[ "$DRY_RUN" == true ]]; then + echo "Dry-run: would run cargo check and cargo package against the bumped version" +else + cargo check -q + TMP_TARGET_DIR="$(mktemp -d "${TMPDIR:-/tmp}/simpleaf-release-check.XXXXXX")" + CARGO_TARGET_DIR="$TMP_TARGET_DIR" cargo package --offline --allow-dirty --no-verify >/dev/null + rm -rf "$TMP_TARGET_DIR" + TMP_TARGET_DIR="" +fi + +run git add "$ROOT_CARGO" "$LOCKFILE" +run git commit -m "chore(release): bump ${CRATE_NAME} to v${VERSION}" + +if [[ "$DRY_RUN" == false ]]; then + COMMIT_CREATED=true +fi + +run git tag -a "$TAG" -m "Release ${VERSION}" +run git push origin HEAD +run git push origin "$TAG" + +if [[ "$PUBLISH" == true ]]; then + run cargo publish +else + echo "Skipping crates.io publish; re-run with --publish to publish ${CRATE_NAME} v${VERSION}" +fi + +echo +if [[ "$DRY_RUN" == true ]]; then + echo "Dry-run complete" +else + echo "Release bump and publish complete for v${VERSION}" +fi diff --git a/docs/requirements.txt b/docs/requirements.txt index d7d5e5d..1f06e3e 100644 --- a/docs/requirements.txt +++ b/docs/requirements.txt @@ -1,4 +1,5 @@ ####### # ###### Custom themes (no version specifiers) ###### -furo \ No newline at end of file +sphinx +furo diff --git a/docs/source/chemistry-command.rst b/docs/source/chemistry-command.rst index 0049a45..d2ba7ef 100644 --- a/docs/source/chemistry-command.rst +++ b/docs/source/chemistry-command.rst @@ -32,7 +32,7 @@ The ``chemistry`` command provides functionality to manage and inspect custom ch These sub-commands are described below. ``simpleaf chemistry refresh`` ------------------------ +------------------------------- The ``refresh`` sub-command takes no *required* arguments; it's usage is shown below: @@ -81,8 +81,10 @@ Every chemistry added to the registry has three mandatory properties: ``name``, - ``name``: A unique name (within the existing registry) of the chemistry. It must be a valid UTF-8 identifier. If the name is already registered, the existing definition will be updated if a higher ``--version`` is provided (see below for details). Otherwise, simpleaf will complain and fail. - ``geometry``: The geometry specification must be provided as a quoted string, and must follow the `Sequence Fragment Geometry Description Language `_ as used in the `quant command `_. - ``expected-ori``: The expected orientation of the chemistry. It must be one of the following: fw (forward), rc (reverse complement), or both (both orientations). It describes the expected orientation relative to the first (most upstream) mappable biological sequence. -Imagine we have reads from 10x Chromium 5' protocols with read1s and read2s both of 150 base pairs. With this specification, a read1, which is in the forward orientation, contains, from 5' to 3', a cell barcode, a UMI, a fixed fragment, and a fragment representing the 5' end of the cDNA. A read2, which is in the reverse complementary orientation, contains the second (downstream) cDNA fragment relative to its read1. You can find a detailed explanation of the 10x Chromium 5' protocol from `Single Cell Genomics Library Structure `_. -If we map the biological sequence in read1s and read2s as paired-end reads (currently only supported when using the default mapper -- piscem), as biological read1s are the first mappable sequences, the expected orientation for this chemistry should be ``fw``, the orientation of read1s. However, if we only map read2s, the expected orientation should be ``rc``, because read2s are the first mappable sequences and are in the reverse complementary orientation. + + Imagine we have reads from 10x Chromium 5' protocols with read1s and read2s both of 150 base pairs. With this specification, a read1, which is in the forward orientation, contains, from 5' to 3', a cell barcode, a UMI, a fixed fragment, and a fragment representing the 5' end of the cDNA. A read2, which is in the reverse complementary orientation, contains the second (downstream) cDNA fragment relative to its read1. You can find a detailed explanation of the 10x Chromium 5' protocol from `Single Cell Genomics Library Structure `_. + + If we map the biological sequence in read1s and read2s as paired-end reads (currently only supported when using the default mapper -- piscem), as biological read1s are the first mappable sequences, the expected orientation for this chemistry should be ``fw``, the orientation of read1s. However, if we only map read2s, the expected orientation should be ``rc``, because read2s are the first mappable sequences and are in the reverse complementary orientation. In addition to the required fields, there are 3 optional fields, as described below. A permit list file must be a TSV file without a header, and the first column must contain the sequence of permitted cell barcodes, i.e., the whitelist of cell barcodes. diff --git a/docs/source/flex-quant-command.rst b/docs/source/flex-quant-command.rst new file mode 100644 index 0000000..853583a --- /dev/null +++ b/docs/source/flex-quant-command.rst @@ -0,0 +1,135 @@ +``flex-quant`` command +====================== + +The ``flex-quant`` command runs the end-to-end ``simpleaf`` pipeline for 10x Flex Gene Expression data. Unlike :doc:`/quant-command`, which is designed around standard single-cell RNA-seq chemistries and a single cell-barcode whitelist, ``flex-quant`` handles the extra resources and steps required for Flex assays: + +- Flex chemistry lookup from the chemistry registry +- probe set selection by organism +- probe-set CSV to FASTA conversion and ``probe_t2g.tsv`` generation +- probe index construction with ``piscem build`` when needed +- cell barcode whitelist resolution +- sample barcode list resolution +- ``piscem map-scrna`` +- multi-barcode permit-list generation with ``alevin-fry generate-permit-list`` +- ``alevin-fry collate`` and ``alevin-fry quant`` + +At present, ``flex-quant`` expects a registered Flex chemistry such as ``10x-flexv1-gex-3p`` or ``10x-flexv2-gex-3p`` and requires ``piscem`` plus ``alevin-fry`` to be configured with :doc:`/set-paths`. + +Overview +-------- + +The command needs: + +1. a Flex chemistry name via ``--chemistry`` +2. an organism via ``--organism`` for automatic probe-set selection +3. paired-end reads via ``--reads1`` and ``--reads2`` +4. an output directory via ``--output`` + +If the chemistry registry contains the needed metadata, ``simpleaf`` can automatically download and cache the probe set, the cell barcode whitelist, and the sample barcode list. If you already have local resources, you can override these defaults with ``--index``, ``--probe-set``, or ``--sample-bc-list``. + +The relevant options (which you can obtain by running ``simpleaf flex-quant -h``) are below: + +.. code-block:: console + + quantify a 10x Flex GEX sample (probe-based, multiplexed) + + Usage: simpleaf flex-quant [OPTIONS] --chemistry --organism --output --reads1 --reads2 + + Options: + -c, --chemistry Chemistry name: 10x-flexv1-gex-3p or 10x-flexv2-gex-3p + --organism Target organism for automatic probe set selection [possible values: human, mouse] + -o, --output Path to output directory + -t, --threads Number of threads to use [default: 16] + -r, --resolution UMI resolution mode [default: cr-like] [possible values: cr-like, cr-like-em, parsimony, parsimony-em, parsimony-gene, parsimony-gene-em] + -h, --help Print help + -V, --version Print version + + Mapping Options: + -i, --index Path to pre-built probe index (overrides auto-build) + -1, --reads1 Comma-separated list of R1 FASTQ files + -2, --reads2 Comma-separated list of R2 FASTQ files + + Probe Set Options: + --probe-set Path to probe set CSV or FASTA (overrides auto-download) + --sample-bc-list Path to sample/probe barcode file with rotation mapping + --kmer-length k-mer length for probe index building [default: 23] + + Piscem Mapping Options: + --skipping-strategy The skipping strategy to use for k-mer collection [default: permissive] [possible values: permissive, strict] + --struct-constraints If piscem >= 0.7.0, enable structural constraints + --max-ec-card Maximum cardinality equivalence class to examine [default: 4096] + + Permit List Options: + --min-reads Minimum read count threshold for unfiltered permit list [default: 10] + +Resource resolution +------------------- + +``flex-quant`` resolves resources in the following order: + +- Probe index: + If ``--index`` is provided, ``simpleaf`` uses that index directly. The command expects a corresponding ``probe_t2g.tsv`` next to the index, unless you also provide ``--probe-set`` so it can generate the t2g mapping. +- Probe set: + If ``--probe-set`` is provided, it overrides the registry entry. A CSV probe set is converted into a FASTA plus ``probe_t2g.tsv`` automatically. A FASTA input is accepted as-is, and ``simpleaf`` generates an identity-style t2g mapping from the FASTA headers. +- Automatic probe-set selection: + If neither ``--index`` nor ``--probe-set`` is provided, ``simpleaf`` looks up the requested ``--organism`` in the selected chemistry's registered probe sets, downloads the matching probe CSV if needed, and builds a cached probe index. +- Cell barcode whitelist: + This is resolved from the selected chemistry's permit-list metadata in the registry. +- Sample barcode list: + This is resolved from ``--sample-bc-list`` if provided, otherwise from the selected chemistry's registry metadata. + +Examples +-------- + +Use a registry-backed Flex chemistry with automatic resource resolution: + +.. code-block:: console + + $ export ALEVIN_FRY_HOME=/path/to/af_home + $ simpleaf flex-quant \ + --chemistry 10x-flexv2-gex-3p \ + --organism human \ + --reads1 sample_R1.fastq.gz \ + --reads2 sample_R2.fastq.gz \ + --output flex_out + +Use local probe-set and sample-barcode files instead of downloading them: + +.. code-block:: console + + $ simpleaf flex-quant \ + --chemistry 10x-flexv1-gex-3p \ + --organism mouse \ + --probe-set /path/to/probe_set.csv \ + --sample-bc-list /path/to/sample_bc.tsv \ + --reads1 lane1_R1.fastq.gz,lane2_R1.fastq.gz \ + --reads2 lane1_R2.fastq.gz,lane2_R2.fastq.gz \ + --output flex_out + +Use a pre-built probe index: + +.. code-block:: console + + $ simpleaf flex-quant \ + --chemistry 10x-flexv2-gex-3p \ + --organism human \ + --index /path/to/probe_index \ + --reads1 sample_R1.fastq.gz \ + --reads2 sample_R2.fastq.gz \ + --output flex_out + +Output +------ + +The command creates the requested output directory and writes: + +- ``af_map/``: the ``piscem`` mapping output +- ``af_quant/``: the ``alevin-fry`` permit-list, collate, and quantification output +- ``simpleaf_flex_quant_info.json``: a metadata record describing the resolved inputs, executed commands, and step timings + +Notes +----- + +- ``flex-quant`` is specific to registered Flex GEX chemistries. For standard scRNA-seq chemistries and general custom geometries, use :doc:`/quant-command`. +- The Flex pipeline currently uses ``piscem`` for mapping. +- When a probe CSV is converted, all probes are kept in the generated FASTA and t2g mapping so that downstream quantification has a complete reference-to-gene map. diff --git a/docs/source/index.rst b/docs/source/index.rst index 4f7533c..2984af1 100644 --- a/docs/source/index.rst +++ b/docs/source/index.rst @@ -45,6 +45,7 @@ That's it for initial notes. Use the menu below to learn more about the `simple inspect-command.rst index-command.rst quant-command.rst + flex-quant-command.rst refresh-prog-info.rst workflow.rst LICENSE.rst diff --git a/docs/source/quant-command.rst b/docs/source/quant-command.rst index a8f42ac..f9bc56c 100644 --- a/docs/source/quant-command.rst +++ b/docs/source/quant-command.rst @@ -1,6 +1,8 @@ ``quant`` command ================= +For 10x Flex Gene Expression data, use :doc:`/flex-quant-command` instead. The ``quant`` command documented here covers the standard ``simpleaf`` quantification workflow for non-Flex chemistries. + The ``quant`` command takes as input **either**: 1) the index, reads, and relevant information about the experiment (e.g. the chemistry) OR @@ -95,4 +97,3 @@ The relevant options (which you can obtain by running ``simpleaf quant -h``) are Output Options: --anndata-out Generate an anndata (h5ad format) count matrix from the standard (matrix-market format) output - diff --git a/docs/source/workflow-get.rst b/docs/source/workflow-get.rst index d7d61af..69618b7 100644 --- a/docs/source/workflow-get.rst +++ b/docs/source/workflow-get.rst @@ -30,8 +30,8 @@ Usually, a published workflow contains four sections: For most users, the ``fast_config`` is the only section needed to instantiate the template. To fill the missing information, one just needs to replace the ``null`` with a meaningful value. For more details, please check out dedicated tutorial on `running workflows from an published template `_. -Full Usage -^^^^^^^^^^ +Get Usage +^^^^^^^^^ The relevant options (which you can obtain by running ``simpleaf workflow get -h``) are: @@ -48,4 +48,3 @@ The relevant options (which you can obtain by running ``simpleaf workflow get -h -V, --version Print version - diff --git a/docs/source/workflow-list.rst b/docs/source/workflow-list.rst index 70c7fcc..b31ab89 100644 --- a/docs/source/workflow-list.rst +++ b/docs/source/workflow-list.rst @@ -3,7 +3,7 @@ simpleaf workflow list ``simpleaf workflow list`` lists all workflows in the registry. If one would like to refresh the registry to keep all workflows up to date, please run the :ref:`simpleaf workflow refresh` command. -Full Usage +List Usage ^^^^^^^^^^ The relevant options (which you can obtain by running ``simpleaf workflow list -h``) are: @@ -17,4 +17,3 @@ The relevant options (which you can obtain by running ``simpleaf workflow list - Options: -h, --help Print help -V, --version Print version - diff --git a/docs/source/workflow-refresh.rst b/docs/source/workflow-refresh.rst index 9dca7f1..1edc9c7 100644 --- a/docs/source/workflow-refresh.rst +++ b/docs/source/workflow-refresh.rst @@ -3,8 +3,8 @@ simpleaf workflow refresh ``simpleaf workflow refresh`` pulls the latest protocol estuary library from `its GitHub repository `_. We recommend updating the registry everytime before fetching a workflow. -Full Usage -^^^^^^^^^^ +Refresh Usage +^^^^^^^^^^^^^ The relevant options (which you can obtain by running ``simpleaf workflow refresh -h``) are: @@ -17,4 +17,3 @@ The relevant options (which you can obtain by running ``simpleaf workflow refres Options: -h, --help Print help -V, --version Print version - diff --git a/resources/chemistries.json b/resources/chemistries.json index 29b1208..3cb735e 100644 --- a/resources/chemistries.json +++ b/resources/chemistries.json @@ -139,7 +139,61 @@ "version": "0.1.0", "meta": { "cr_filename": "737K-arc-v1.txt", - "barcode_ori": "forward" + "barcode_ori": "forward" + } + }, + "10x-flexv1-gex-3p": { + "geometry": "1{b[16]u[12]x:}2{r[50]x[18]s[8]x:}", + "expected_ori": "both", + "version": "0.1.0", + "plist_name": "9fe0cbace5ad3cf83679a7b082b99df879d3d4c069d68da313b6650dd18fc803", + "remote_url": "https://umd.box.com/shared/static/ocr4rah6xdzan10rfrrggqyat06zea5m", + "meta": { + "cr_filename": "737K-fixed-rna-profiling.txt", + "protocol_type": "flex_gex" + }, + "sample_bc_list": { + "plist_name": "5dc9d109e541b02974bbae15682e7198ebc72d3da4f4a219d73620e2852c89e0", + "remote_url": "https://umd.box.com/shared/static/o1db4o6021a4nblpci8aume0z0lz5hfd" + }, + "probe_sets": { + "human": { + "name": "Chromium_Human_Transcriptome_Probe_Set_v1.1.0_GRCh38-2024-A", + "plist_name": "9ccbd08d70bcab619be45bd9a1b9c76efdd91030517564e5819e5f74b1d36d93", + "remote_url": "https://umd.box.com/shared/static/iygrl8vn798j4dgto9bqop9914wg1n51" + }, + "mouse": { + "name": "Chromium_Mouse_Transcriptome_Probe_Set_v1.1.1_GRCm39-2024-A", + "plist_name": "b4b811412ef75c33e09b5ec1a8f4028a08f3d0fe470ddf524380526f3cbc2e12", + "remote_url": "https://umd.box.com/shared/static/oz6kubjc3rmjeb0e9fi417iui5x9h72b" + } + } + }, + "10x-flexv2-gex-3p": { + "geometry": "1{b[16]u[12]x[10]s[10]}2{r:}", + "expected_ori": "both", + "version": "0.1.0", + "plist_name": "dcb018db2e9d7023ac077eb2477b877163fa5dcef7b8e39e0826bc2560c29cf9", + "remote_url": "https://umd.box.com/shared/static/fei8u0tcve2wu73q4qxrskwl3gs7svj1", + "meta": { + "cr_filename": "737K-flex-v2.txt", + "protocol_type": "flex_gex" + }, + "sample_bc_list": { + "plist_name": "5e7ef950ad43c35525e8d923423a7bb1abdce78ca2a8fe4ef9a2d69c5f22830b", + "remote_url": "https://umd.box.com/shared/static/4ogdlgooo1onjkrny9pfbyz4gdt5vktl" + }, + "probe_sets": { + "human": { + "name": "Chromium_Human_Transcriptome_Probe_Set_v2.0.0_GRCh38-2024-A", + "plist_name": "bfa53e2acde140d6bd90c3b21d65c48c5b04e3064adee7402d3016116db04958", + "remote_url": "https://umd.box.com/shared/static/2fd0tda0638wy0fclgh3ywdgul1g53pi" + }, + "mouse": { + "name": "Chromium_Mouse_Transcriptome_Probe_Set_v2.0.0_GRCm39-2024-A", + "plist_name": "8e0ea460bc5a93df85cf5c4f321c62a3e50ad01b5589a8c0c9559bf554f6f276", + "remote_url": "https://umd.box.com/shared/static/z21ofrtnj3t33fb0mti66dc319cgvnuq" + } } } } diff --git a/scripts/test_simpleaf.sh b/scripts/test_simpleaf.sh index 083d073..74e4328 100755 --- a/scripts/test_simpleaf.sh +++ b/scripts/test_simpleaf.sh @@ -29,7 +29,7 @@ function cleanup { # implementation of script starts here echo " - Downloading the toy read-reference set" -wget https://umd.box.com/shared/static/lx2xownlrhz3us8496tyu9c4dgade814.gz -O ${WORK_DIR}/toy_read_ref_set.tar.gz -q +wget https://umd.box.com/shared/static/z8d0v1xqi1jznlx1o8u1o2hxs1n4z1fl -O ${WORK_DIR}/toy_read_ref_set.tar.gz -q tar -xf ${WORK_DIR}/toy_read_ref_set.tar.gz -C ${WORK_DIR} echo " - Testing simpleaf set-paths" @@ -53,7 +53,7 @@ else fi echo " - Testing simpleaf index" -REF_DIR="${WORK_DIR}/toy_ref_read/toy_human_ref" +REF_DIR="${WORK_DIR}/toy_read_ref_set/toy_human_ref" index_cmd="ALEVIN_FRY_HOME=$ALEVIN_FRY_HOME \ ${SIMPLEAF} index --ref-type spliced+intronic -f ${REF_DIR}/fasta/genome.fa \ -g ${REF_DIR}/genes/genes.gtf \ @@ -69,7 +69,7 @@ else fi echo " - Testing simpleaf quant" -FASTQ_DIR="${WORK_DIR}/toy_ref_read/toy_read_fastq" +FASTQ_DIR="${WORK_DIR}/toy_read_ref_set/toy_read_fastq" quant_cmd="ALEVIN_FRY_HOME=$ALEVIN_FRY_HOME \ ${SIMPLEAF} quant \ -1 ${FASTQ_DIR}/selected_R1_reads.fastq \ diff --git a/simpleaf_conda_env.yml b/simpleaf_conda_env.yml index eaed75b..bbb84c1 100644 --- a/simpleaf_conda_env.yml +++ b/simpleaf_conda_env.yml @@ -6,7 +6,5 @@ channels: - bioconda dependencies: - - libboost>=1.85.0 - - salmon>=1.10.3 - - alevin-fry>=0.10.0 - - piscem>=0.10.0 + - alevin-fry>=0.12.0 + - piscem>=0.17.1 diff --git a/src/main.rs b/src/main.rs index e5bcbc8..911e11a 100644 --- a/src/main.rs +++ b/src/main.rs @@ -101,6 +101,11 @@ fn main() -> anyhow::Result<()> { // if we are running mapping and quantification Commands::Quant(map_quant_opts) => map_and_quant(af_home_path.as_path(), map_quant_opts), + // if we are running Flex GEX quantification + Commands::FlexQuant(flex_opts) => { + flex_quant::flex_map_and_quant(af_home_path.as_path(), flex_opts) + } + // indexing for ATAC-seq data Commands::Atac(AtacCommand::Index(index_opts)) => { atac::index::piscem_index(af_home_path.as_path(), &index_opts) diff --git a/src/simpleaf_commands.rs b/src/simpleaf_commands.rs index b226f6d..8c43187 100644 --- a/src/simpleaf_commands.rs +++ b/src/simpleaf_commands.rs @@ -15,6 +15,8 @@ pub use self::indexing::build_ref_and_index; pub mod quant; pub use self::quant::map_and_quant; +pub mod flex_quant; + pub mod workflow; pub use self::workflow::{ get_workflow, list_workflows, patch_manifest_or_template, refresh_protocol_estuary, @@ -578,6 +580,85 @@ pub struct SetPathOpts { macs: Option, } +/// Options for the `flex-quant` subcommand — 10x Flex GEX quantification. +/// +/// This command handles the complete Flex pipeline: probe index building, +/// mapping, barcode correction (cell + sample), collation, and quantification. +#[derive(Args, Clone, Debug)] +#[command(arg_required_else_help = true)] +pub struct FlexQuantOpts { + /// Chemistry name: 10x-flexv1-gex-3p or 10x-flexv2-gex-3p + #[arg(short, long)] + pub chemistry: String, + + /// Target organism for automatic probe set selection + #[arg(long, value_enum)] + pub organism: crate::utils::chem_utils::Organism, + + /// Path to output directory + #[arg(short, long)] + pub output: PathBuf, + + /// Number of threads to use + #[arg(short, long, default_value_t = 16)] + pub threads: u32, + + /// Path to pre-built probe index (overrides auto-build) + #[arg(short = 'i', long, help_heading = "Mapping Options")] + pub index: Option, + + /// Path to probe set CSV or FASTA (overrides auto-download). + /// If a CSV is provided, it is converted to FASTA and a t2g map + /// is generated automatically. + #[arg(long, help_heading = "Probe Set Options")] + pub probe_set: Option, + + /// Path to sample/probe barcode file with rotation mapping + /// (overrides auto-download). 3-column TSV: observed, canonical, sample_name. + #[arg(long, help_heading = "Probe Set Options")] + pub sample_bc_list: Option, + + /// Comma-separated list of R1 FASTQ files + #[arg(short = '1', long, value_delimiter = ',', help_heading = "Mapping Options")] + pub reads1: Vec, + + /// Comma-separated list of R2 FASTQ files + #[arg(short = '2', long, value_delimiter = ',', help_heading = "Mapping Options")] + pub reads2: Vec, + + /// UMI resolution mode + #[arg(short, long, default_value = "cr-like", + help_heading = "Quantification Options", + value_parser = clap::builder::PossibleValuesParser::new([ + "cr-like", "cr-like-em", "parsimony", "parsimony-em", + "parsimony-gene", "parsimony-gene-em" + ]))] + pub resolution: String, + + /// k-mer length for probe index building + #[arg(long, default_value_t = 23, help_heading = "Probe Set Options")] + pub kmer_length: usize, + + /// The skipping strategy to use for k-mer collection + #[arg(long, + default_value = "permissive", + value_parser = clap::builder::PossibleValuesParser::new(["permissive", "strict"]), + help_heading = "Piscem Mapping Options")] + pub skipping_strategy: String, + + /// If piscem >= 0.7.0, enable structural constraints + #[arg(long, help_heading = "Piscem Mapping Options")] + pub struct_constraints: bool, + + /// Maximum cardinality equivalence class to examine + #[arg(long, default_value_t = DefaultParams::MAX_EC_CARD, help_heading = "Piscem Mapping Options")] + pub max_ec_card: u32, + + /// Minimum read count threshold for unfiltered permit list + #[arg(long, default_value_t = 10, help_heading = "Permit List Options")] + pub min_reads: usize, +} + #[derive(Debug, Subcommand)] pub enum Commands { /// build the (expanded) reference index @@ -589,6 +670,8 @@ pub enum Commands { Inspect {}, /// quantify a sample Quant(MapQuantOpts), + /// quantify a 10x Flex GEX sample (probe-based, multiplexed) + FlexQuant(FlexQuantOpts), /// set paths to the programs that simpleaf will use SetPaths(SetPathOpts), /// refreshes version information associated with programs used by simpleaf diff --git a/src/simpleaf_commands/chemistry.rs b/src/simpleaf_commands/chemistry.rs index 91b7924..7fd4027 100644 --- a/src/simpleaf_commands/chemistry.rs +++ b/src/simpleaf_commands/chemistry.rs @@ -406,6 +406,8 @@ pub fn add_chemistry( remote_pl_url: add_opts.remote_url, version, meta, + sample_bc_list: None, + probe_sets: None, }; let mut chem_hm = get_custom_chem_hm(&chem_p)?; diff --git a/src/simpleaf_commands/flex_quant.rs b/src/simpleaf_commands/flex_quant.rs new file mode 100644 index 0000000..ea39299 --- /dev/null +++ b/src/simpleaf_commands/flex_quant.rs @@ -0,0 +1,530 @@ +//! Pipeline orchestration for 10x Flex GEX quantification. +//! +//! Handles the complete Flex pipeline: +//! 1. Resource resolution (probe index, cell BC whitelist, probe barcode file) +//! 2. Mapping with piscem +//! 3. Generate-permit-list (multi-barcode aware) +//! 4. Collate (hierarchical, multi-barcode) +//! 5. Quant + +use crate::core::{context, exec}; +use crate::simpleaf_commands::FlexQuantOpts; +use crate::utils::chem_utils::{CustomChemistry, CustomChemistryMap}; +use crate::utils::constants::CHEMISTRIES_PATH; +use crate::utils::prog_utils; + +use anyhow::{Context, bail}; +use serde_json::json; +use std::io::{BufRead, BufReader, Write}; +use std::path::{Path, PathBuf}; +use std::time::Instant; +use tracing::{info, warn}; + +/// Convert a 10x probe set CSV file to a FASTA file suitable for indexing. +/// +/// Also generates a transcript-to-gene (t2g) map and extracts probe set metadata. +/// Returns (fasta_path, t2g_path, metadata_json). +pub fn convert_probe_csv_to_fasta( + csv_path: &Path, + output_dir: &Path, +) -> anyhow::Result<(PathBuf, PathBuf, serde_json::Value)> { + std::fs::create_dir_all(output_dir)?; + + let file = std::fs::File::open(csv_path) + .with_context(|| format!("couldn't open probe CSV: {}", csv_path.display()))?; + let reader = BufReader::new(file); + + let fasta_path = output_dir.join("probes.fa"); + let t2g_path = output_dir.join("probe_t2g.tsv"); + let meta_path = output_dir.join("probe_set_info.json"); + + let mut fasta_writer = std::io::BufWriter::new(std::fs::File::create(&fasta_path)?); + let mut t2g_writer = std::io::BufWriter::new(std::fs::File::create(&t2g_path)?); + + let mut metadata = serde_json::Map::new(); + let mut num_probes = 0u64; + let mut num_included = 0u64; + let mut num_excluded = 0u64; + let mut genes = std::collections::HashSet::new(); + let mut header_parsed = false; + + for line in reader.lines() { + let line = line?; + let trimmed = line.trim(); + + if let Some(stripped) = trimmed.strip_prefix('#') { + if let Some((key, val)) = stripped.split_once('=') { + metadata.insert(key.to_string(), serde_json::Value::String(val.to_string())); + } + continue; + } + + if !header_parsed { + header_parsed = true; + continue; + } + + let cols: Vec<&str> = trimmed.split(',').collect(); + if cols.len() < 4 { + continue; + } + let gene_id = cols[0]; + let probe_seq = cols[1]; + let probe_id = cols[2]; + let included = cols[3].eq_ignore_ascii_case("true"); + + num_probes += 1; + if included { + num_included += 1; + } else { + num_excluded += 1; + } + // All probes (included and excluded) go into the FASTA and t2g map. + // The index contains all probes, so quant needs a t2g entry for every + // reference. Excluded probes still map to their gene — they simply + // won't contribute meaningful counts in practice. + writeln!(fasta_writer, ">{}", probe_id)?; + writeln!(fasta_writer, "{}", probe_seq)?; + writeln!(t2g_writer, "{}\t{}", probe_id, gene_id)?; + genes.insert(gene_id.to_string()); + } + + fasta_writer.flush()?; + t2g_writer.flush()?; + + metadata.insert("num_probes".to_string(), json!(num_probes)); + metadata.insert("num_included".to_string(), json!(num_included)); + metadata.insert("num_excluded".to_string(), json!(num_excluded)); + metadata.insert("num_genes".to_string(), json!(genes.len())); + metadata.insert( + "source_file".to_string(), + json!(csv_path.file_name().unwrap_or_default().to_string_lossy()), + ); + + let meta_value = serde_json::Value::Object(metadata); + let meta_file = std::fs::File::create(&meta_path)?; + serde_json::to_writer_pretty(meta_file, &meta_value)?; + + info!( + "Converted probe CSV: {} included probes, {} genes, {} excluded", + num_included, + genes.len(), + num_excluded, + ); + + Ok((fasta_path, t2g_path, meta_value)) +} + +/// Main entry point for the flex-quant pipeline. +pub fn flex_map_and_quant(af_home: &Path, opts: FlexQuantOpts) -> anyhow::Result<()> { + let start = Instant::now(); + info!("Starting Flex GEX pipeline"); + + // Load runtime context (program paths) + let rt = context::load_runtime_context(af_home)?; + let piscem_info = rt + .progs + .piscem + .as_ref() + .context("piscem is required for Flex mapping; please run `simpleaf set-paths`")?; + let alevin_fry_info = rt + .progs + .alevin_fry + .as_ref() + .context("alevin-fry is required; please run `simpleaf set-paths`")?; + + // Load chemistry from registry + let chem_path = af_home.join(CHEMISTRIES_PATH); + if !chem_path.exists() { + bail!( + "Chemistry registry not found at {}. Run `simpleaf chemistry refresh` first.", + chem_path.display(), + ); + } + let chem_file = std::fs::File::open(&chem_path)?; + let chem_map: CustomChemistryMap = serde_json::from_reader(chem_file) + .with_context(|| format!("couldn't parse {}", chem_path.display()))?; + + let chem = chem_map + .get(&opts.chemistry) + .ok_or_else(|| { + anyhow::anyhow!( + "Chemistry '{}' not found in registry. Run `simpleaf chemistry refresh`.", + opts.chemistry, + ) + })?; + + if !chem.is_flex_gex() { + bail!( + "Chemistry '{}' is not a Flex GEX protocol. Use `simpleaf quant` for standard chemistries.", + opts.chemistry, + ); + } + + info!( + "Chemistry: {} (geometry: {}, organism: {})", + opts.chemistry, + chem.geometry(), + opts.organism, + ); + + // Create output directory structure + let output_dir = &opts.output; + std::fs::create_dir_all(output_dir)?; + let map_output = output_dir.join("af_map"); + let quant_output = output_dir.join("af_quant"); + std::fs::create_dir_all(&map_output)?; + std::fs::create_dir_all(&quant_output)?; + + // === Step 1: Resolve probe index === + let (index_path, t2g_path) = resolve_probe_index( + af_home, chem, &opts, &piscem_info.exe_path, + )?; + + // === Step 2: Resolve cell barcode whitelist === + // For Flex, the cell BC whitelist is fetched the same way as standard chemistries. + let cell_bc_path = resolve_cell_bc_whitelist(af_home, chem)?; + + // === Step 3: Resolve probe barcode (sample BC) file === + let sample_bc_path = resolve_sample_bc_list(af_home, chem, &opts)?; + + // === Step 4: Map reads with piscem === + info!("Mapping reads with piscem..."); + let mut piscem_cmd = std::process::Command::new(&piscem_info.exe_path); + piscem_cmd + .arg("map-scrna") + .arg("-i").arg(&index_path) + .arg("-g").arg(chem.geometry()) + .arg("-o").arg(&map_output) + .arg("-t").arg(format!("{}", opts.threads)); + + if opts.struct_constraints { + piscem_cmd.arg("--struct-constraints"); + } + piscem_cmd + .arg("--skipping-strategy").arg(&opts.skipping_strategy) + .arg("--max-ec-card").arg(format!("{}", opts.max_ec_card)); + + let r1_str: Vec = opts.reads1.iter().map(|p| p.display().to_string()).collect(); + let r2_str: Vec = opts.reads2.iter().map(|p| p.display().to_string()).collect(); + piscem_cmd.arg("-1").arg(r1_str.join(",")); + piscem_cmd.arg("-2").arg(r2_str.join(",")); + + let map_cmd_str = prog_utils::get_cmd_line_string(&piscem_cmd); + info!("piscem map-scrna cmd: {}", map_cmd_str); + let map_start = Instant::now(); + exec::run_checked(&mut piscem_cmd, "[piscem map-sc]")?; + let map_duration = map_start.elapsed(); + info!("Mapping complete in {:.1}s", map_duration.as_secs_f64()); + + // === Step 5: Generate permit list (multi-barcode) === + info!("Generating permit list..."); + let mut gpl_cmd = std::process::Command::new(&alevin_fry_info.exe_path); + gpl_cmd + .arg("generate-permit-list") + .arg("-i").arg(&map_output) + .arg("-d").arg(chem.expected_ori().as_str()) + .arg("-o").arg(&quant_output) + .arg("-t").arg(format!("{}", opts.threads.min(8))) + .arg("--unfiltered-pl").arg(&cell_bc_path) + .arg("--sample-bc-list").arg(&sample_bc_path) + .arg("--sample-correction-mode").arg("exact") + .arg("--min-reads").arg(format!("{}", opts.min_reads)); + + let gpl_cmd_str = prog_utils::get_cmd_line_string(&gpl_cmd); + info!("generate-permit-list cmd: {}", gpl_cmd_str); + let gpl_start = Instant::now(); + exec::run_checked(&mut gpl_cmd, "[generate permit list]")?; + let gpl_duration = gpl_start.elapsed(); + + // === Step 6: Collate === + info!("Collating..."); + let mut collate_cmd = std::process::Command::new(&alevin_fry_info.exe_path); + collate_cmd + .arg("collate") + .arg("-i").arg(&quant_output) + .arg("-r").arg(&map_output) + .arg("-t").arg(format!("{}", opts.threads)); + + let collate_cmd_str = prog_utils::get_cmd_line_string(&collate_cmd); + info!("collate cmd: {}", collate_cmd_str); + let collate_start = Instant::now(); + exec::run_checked(&mut collate_cmd, "[collate]")?; + let collate_duration = collate_start.elapsed(); + + // === Step 7: Quantify === + info!("Quantifying..."); + let mut quant_cmd = std::process::Command::new(&alevin_fry_info.exe_path); + quant_cmd + .arg("quant") + .arg("-i").arg(&quant_output) + .arg("-o").arg(&quant_output) + .arg("-m").arg(&t2g_path) + .arg("-t").arg(format!("{}", opts.threads)) + .arg("-r").arg(&opts.resolution) + .arg("--use-mtx"); + + let quant_cmd_str = prog_utils::get_cmd_line_string(&quant_cmd); + info!("quant cmd: {}", quant_cmd_str); + let quant_start = Instant::now(); + exec::run_checked(&mut quant_cmd, "[quant]")?; + let quant_duration = quant_start.elapsed(); + + // === Write pipeline metadata === + let meta = json!({ + "chemistry": opts.chemistry, + "organism": opts.organism.to_string(), + "geometry": chem.geometry(), + "resolution": opts.resolution, + "threads": opts.threads, + "kmer_length": opts.kmer_length, + "index_path": index_path.display().to_string(), + "cell_bc_path": cell_bc_path.display().to_string(), + "sample_bc_path": sample_bc_path.display().to_string(), + "t2g_path": t2g_path.display().to_string(), + "map_cmd": map_cmd_str, + "gpl_cmd": gpl_cmd_str, + "collate_cmd": collate_cmd_str, + "quant_cmd": quant_cmd_str, + "map_duration_secs": map_duration.as_secs_f64(), + "gpl_duration_secs": gpl_duration.as_secs_f64(), + "collate_duration_secs": collate_duration.as_secs_f64(), + "quant_duration_secs": quant_duration.as_secs_f64(), + "total_duration_secs": start.elapsed().as_secs_f64(), + "simpleaf_version": env!("CARGO_PKG_VERSION"), + }); + let meta_path = output_dir.join("simpleaf_flex_quant_info.json"); + let meta_file = std::fs::File::create(&meta_path)?; + serde_json::to_writer_pretty(meta_file, &meta)?; + + info!( + "Flex GEX pipeline complete in {:.1}s. Output: {}", + start.elapsed().as_secs_f64(), + output_dir.display(), + ); + + Ok(()) +} + +/// Resolve the probe index: use provided, build from probe set, or auto-download. +fn resolve_probe_index( + af_home: &Path, + chem: &CustomChemistry, + opts: &FlexQuantOpts, + piscem_path: &Path, +) -> anyhow::Result<(PathBuf, PathBuf)> { + // If user provided a pre-built index, use it directly. + if let Some(ref index) = opts.index { + info!("Using user-provided probe index: {}", index.display()); + let t2g_candidate = index.join("probe_t2g.tsv"); + let t2g = if t2g_candidate.exists() { + t2g_candidate + } else if let Some(ref ps) = opts.probe_set { + let conv_dir = opts.output.join("probe_conversion"); + let (_, t2g, _) = convert_probe_csv_to_fasta(ps, &conv_dir)?; + t2g + } else { + bail!( + "When providing --index, a t2g map is also needed. \ + Place probe_t2g.tsv in the index directory, or provide --probe-set." + ); + }; + return Ok((index.clone(), t2g)); + } + + // If user provided a probe set file, build index from it. + if let Some(ref probe_set) = opts.probe_set { + warn!( + "Using user-provided probe set: {}. This overrides the default for '{}'.", + probe_set.display(), + opts.chemistry, + ); + return build_index_from_probe_set(probe_set, opts, piscem_path); + } + + // Auto mode: look up probe set in chemistry registry + let organism_key = opts.organism.to_string(); + let probe_sets = chem.probe_sets.as_ref().ok_or_else(|| { + anyhow::anyhow!( + "Chemistry '{}' has no registered probe sets. Provide --probe-set.", + opts.chemistry, + ) + })?; + let probe_info = probe_sets.get(&organism_key).ok_or_else(|| { + anyhow::anyhow!( + "No probe set for organism '{}' in chemistry '{}'. Provide --probe-set.", + organism_key, + opts.chemistry, + ) + })?; + + // Check cache + let cache_dir = af_home.join("probe_indices"); + std::fs::create_dir_all(&cache_dir)?; + let cache_key = probe_info.plist_name.as_deref().unwrap_or("unknown"); + let cached_index = cache_dir.join(format!("{}_{}", cache_key, opts.kmer_length)); + + if cached_index.join("index.ssi").exists() { + let t2g = cached_index.join("probe_t2g.tsv"); + if t2g.exists() { + info!("Using cached probe index: {}", cached_index.display()); + return Ok((cached_index.join("index"), t2g)); + } + } + + // Download and build + if let Some(ref url) = probe_info.remote_url { + info!("Downloading probe set '{}'...", probe_info.name); + let download_dir = cache_dir.join("downloads"); + std::fs::create_dir_all(&download_dir)?; + let csv_path = download_dir.join(format!("{}.csv", probe_info.name)); + if !csv_path.exists() { + prog_utils::download_to_file(url, &csv_path)?; + info!("Downloaded probe set to {}", csv_path.display()); + } + + // Build index in the cache directory + let mut build_opts = opts.clone(); + build_opts.output = cached_index.clone(); + let result = build_index_from_probe_set(&csv_path, &build_opts, piscem_path)?; + Ok((result.0, result.1)) + } else { + bail!( + "No remote URL for probe set '{}'. Provide --probe-set.", + probe_info.name, + ); + } +} + +/// Build a probe index from a CSV or FASTA file. +fn build_index_from_probe_set( + probe_set: &Path, + opts: &FlexQuantOpts, + piscem_path: &Path, +) -> anyhow::Result<(PathBuf, PathBuf)> { + let index_dir = opts.output.join("probe_index"); + std::fs::create_dir_all(&index_dir)?; + + let ext = probe_set + .extension() + .and_then(|e| e.to_str()) + .unwrap_or(""); + + let (fasta_path, t2g_path) = if ext.eq_ignore_ascii_case("csv") { + info!("Converting probe CSV to FASTA: {}", probe_set.display()); + let (fa, t2g, _meta) = convert_probe_csv_to_fasta(probe_set, &index_dir)?; + (fa, t2g) + } else { + // Assume FASTA — generate identity t2g + let t2g = index_dir.join("probe_t2g.tsv"); + if !t2g.exists() { + let fa_file = std::fs::File::open(probe_set)?; + let reader = BufReader::new(fa_file); + let mut t2g_writer = std::io::BufWriter::new(std::fs::File::create(&t2g)?); + for line in reader.lines() { + let line = line?; + if let Some(name) = line.strip_prefix('>') { + let name = name.split_whitespace().next().unwrap_or(name); + let gene = name.split('|').next().unwrap_or(name); + writeln!(t2g_writer, "{}\t{}", name, gene)?; + } + } + } + (probe_set.to_path_buf(), t2g) + }; + + // Build piscem index + info!("Building probe index with k={}...", opts.kmer_length); + let index_prefix = index_dir.join("index"); + let mut build_cmd = std::process::Command::new(piscem_path); + build_cmd + .arg("build") + .arg("-s").arg(&fasta_path) + .arg("-o").arg(&index_prefix) + .arg("-k").arg(format!("{}", opts.kmer_length)) + .arg("-t").arg(format!("{}", opts.threads)) + .arg("--overwrite"); + + info!("piscem build cmd: {}", prog_utils::get_cmd_line_string(&build_cmd)); + exec::run_checked(&mut build_cmd, "[piscem build]")?; + + // Copy t2g alongside index + let t2g_dest = index_dir.join("probe_t2g.tsv"); + if t2g_path != t2g_dest && t2g_path.exists() { + std::fs::copy(&t2g_path, &t2g_dest)?; + } + + Ok((index_prefix, t2g_dest)) +} + +/// Resolve cell barcode whitelist from the chemistry's plist_name/remote_url. +fn resolve_cell_bc_whitelist(af_home: &Path, chem: &CustomChemistry) -> anyhow::Result { + let plist_dir = af_home.join("plist"); + std::fs::create_dir_all(&plist_dir)?; + + if let Some(ref hash) = chem.plist_name { + let cached = plist_dir.join(hash); + if cached.exists() { + info!("Cell barcode whitelist cached: {}", cached.display()); + return Ok(cached); + } + } + + if let Some(ref url) = chem.remote_pl_url { + let dest = if let Some(ref hash) = chem.plist_name { + plist_dir.join(hash) + } else { + plist_dir.join("cell_bc_whitelist.txt") + }; + info!("Downloading cell barcode whitelist..."); + prog_utils::download_to_file(url, &dest)?; + info!("Downloaded to {}", dest.display()); + Ok(dest) + } else { + bail!("Chemistry '{}' has no cell barcode whitelist URL.", chem.name()); + } +} + +/// Resolve probe barcode (sample BC) file: use provided or auto-fetch. +fn resolve_sample_bc_list( + af_home: &Path, + chem: &CustomChemistry, + opts: &FlexQuantOpts, +) -> anyhow::Result { + if let Some(ref path) = opts.sample_bc_list { + info!("Using user-provided sample barcode list: {}", path.display()); + return Ok(path.clone()); + } + + let sbc_info = chem.sample_bc_list.as_ref().ok_or_else(|| { + anyhow::anyhow!( + "Chemistry '{}' has no sample barcode list. Provide --sample-bc-list.", + opts.chemistry, + ) + })?; + + let plist_dir = af_home.join("plist"); + std::fs::create_dir_all(&plist_dir)?; + + if let Some(ref hash) = sbc_info.plist_name { + let cached = plist_dir.join(hash); + if cached.exists() { + info!("Sample barcode list cached: {}", cached.display()); + return Ok(cached); + } + } + + if let Some(ref url) = sbc_info.remote_url { + let dest = if let Some(ref hash) = sbc_info.plist_name { + plist_dir.join(hash) + } else { + plist_dir.join("sample_bc_list.txt") + }; + info!("Downloading sample barcode list..."); + prog_utils::download_to_file(url, &dest)?; + info!("Downloaded to {}", dest.display()); + Ok(dest) + } else { + bail!("Chemistry '{}' has no sample barcode list URL. Provide --sample-bc-list.", opts.chemistry); + } +} diff --git a/src/utils/af_utils.rs b/src/utils/af_utils.rs index e4fae0a..33826a1 100644 --- a/src/utils/af_utils.rs +++ b/src/utils/af_utils.rs @@ -183,7 +183,7 @@ impl CellFilterMethod { pub enum Chemistry { Rna(RnaChemistry), Atac(AtacChemistry), - Custom(CustomChemistry), + Custom(Box), } impl QueryInRegistry for Chemistry { @@ -312,7 +312,7 @@ impl Chemistry { s, chem.geometry() ); - Chemistry::Custom(chem) + Chemistry::Custom(Box::new(chem)) } else { // we want to bail with an error if the chemistry is *known* but // not supported using this mapper (i.e. if it is a piscem-specific chem @@ -325,12 +325,14 @@ impl Chemistry { index_type.counterpart().as_str() ); } - Chemistry::Custom(CustomChemistry::simple_custom(s).with_context(|| { - format!( - "Could not parse the provided chemistry {}. Please ensure it is a valid chemistry string wrapped by quotes or that it is defined in the custom_chemistries.json file.", - s - ) - })?) + Chemistry::Custom(Box::new( + CustomChemistry::simple_custom(s).with_context(|| { + format!( + "Could not parse the provided chemistry {}. Please ensure it is a valid chemistry string wrapped by quotes or that it is defined in the custom_chemistries.json file.", + s + ) + })?, + )) } } }; @@ -417,6 +419,27 @@ fn is_builtin(s: &str) -> Option<&str> { } } +/// Returns true if the geometry string contains piscem-extended tags +/// that seq_geom_parser doesn't understand: `s[N]` (sample barcode) +/// or numbered barcodes like `b0[N]`, `b1[N]`. +fn has_piscem_extended_tags(geo: &str) -> bool { + // Match s[] — sample barcode tag + // Match b[] — numbered barcode tag (b0[16], b1[8], etc.) + let bytes = geo.as_bytes(); + for i in 0..bytes.len() { + if bytes[i] == b's' && bytes.get(i + 1) == Some(&b'[') { + return true; + } + if bytes[i] == b'b' + && bytes.get(i + 1).is_some_and(|c| c.is_ascii_digit()) + && bytes.get(i + 2) == Some(&b'[') + { + return true; + } + } + false +} + /// determines if a given geometry string is valid; if so /// it returns `Ok(())`, otherwise it returns an `anyhow::Error` describing /// why parsing failed. @@ -429,6 +452,15 @@ pub fn validate_geometry(geo: &str) -> Result<()> { builtin_kwd ); Ok(()) //bail!("The provided geometry is a builtin keyword [{}] (preceeded by \"__\") and so no attempt was made to parse it", builtin_kwd); + } else if has_piscem_extended_tags(geo) { + // Geometries with piscem-only extensions (e.g. s[N] for sample + // barcodes, bN[L] for numbered barcodes) cannot be parsed by + // seq_geom_parser. These are validated by piscem at mapping time. + debug!( + "geometry string contains piscem-extended tags (s[]/b[]), skipping seq_geom_parser validation: {}", + geo + ); + Ok(()) } else { let fg = FragmentGeomDesc::try_from(geo); match fg { diff --git a/src/utils/chem_utils.rs b/src/utils/chem_utils.rs index ef6790b..82c1505 100644 --- a/src/utils/chem_utils.rs +++ b/src/utils/chem_utils.rs @@ -75,6 +75,86 @@ impl ExpectedOri { } } +/// Target organism for probe set selection in Flex protocols. +#[derive(Serialize, Deserialize, Debug, Clone, PartialEq, Eq)] +pub enum Organism { + #[serde(rename = "human")] + Human, + #[serde(rename = "mouse")] + Mouse, + #[serde(untagged)] + Other(String), +} + +impl std::str::FromStr for Organism { + type Err = std::convert::Infallible; + fn from_str(s: &str) -> Result { + Ok(match s.to_lowercase().as_str() { + "human" => Organism::Human, + "mouse" => Organism::Mouse, + other => Organism::Other(other.to_string()), + }) + } +} + +impl fmt::Display for Organism { + fn fmt(&self, f: &mut fmt::Formatter) -> fmt::Result { + match self { + Organism::Human => write!(f, "human"), + Organism::Mouse => write!(f, "mouse"), + Organism::Other(s) => write!(f, "{}", s), + } + } +} + +impl clap::ValueEnum for Organism { + fn value_variants<'a>() -> &'a [Self] { + &[Organism::Human, Organism::Mouse] + } + + fn to_possible_value(&self) -> Option { + match self { + Organism::Human => Some(clap::builder::PossibleValue::new("human")), + Organism::Mouse => Some(clap::builder::PossibleValue::new("mouse")), + Organism::Other(_) => None, + } + } +} + +/// Protocol type — distinguishes standard scRNA from Flex, ATAC, etc. +#[derive(Serialize, Deserialize, Debug, Clone, PartialEq, Eq, Default)] +pub enum ProtocolType { + /// Standard single-cell RNA-seq (10x Chromium, etc.) + #[serde(rename = "standard_rna")] + #[default] + StandardRna, + /// 10x Flex gene expression (probe-based, multi-barcode) + #[serde(rename = "flex_gex")] + FlexGex, + /// scATAC-seq + #[serde(rename = "atac")] + Atac, +} + +/// Info for fetching the probe/sample barcode list (for Flex protocols). +#[derive(Serialize, Deserialize, Debug, Clone, PartialEq)] +pub struct SampleBcListInfo { + #[serde(skip_serializing_if = "Option::is_none")] + pub plist_name: Option, + #[serde(skip_serializing_if = "Option::is_none")] + pub remote_url: Option, +} + +/// Info for a specific probe set (organism-specific, for Flex protocols). +#[derive(Serialize, Deserialize, Debug, Clone, PartialEq)] +pub struct ProbeSetInfo { + pub name: String, + #[serde(skip_serializing_if = "Option::is_none")] + pub plist_name: Option, + #[serde(skip_serializing_if = "Option::is_none")] + pub remote_url: Option, +} + /// A CustomChemistry is a description of a chemistry that is not /// covered under the different built-in chemistries. It defines the /// relevant information about how a chemistry should be defined including @@ -90,10 +170,16 @@ pub struct CustomChemistry { pub version: String, #[serde(skip_serializing_if = "Option::is_none")] pub plist_name: Option, - #[serde(skip_serializing_if = "Option::is_none")] + #[serde(skip_serializing_if = "Option::is_none", rename = "remote_url")] pub remote_pl_url: Option, #[serde(skip_serializing_if = "Option::is_none")] pub meta: Option, + /// Probe/sample barcode list info (for Flex protocols) + #[serde(skip_serializing_if = "Option::is_none")] + pub sample_bc_list: Option, + /// Probe sets keyed by organism (for Flex protocols) + #[serde(skip_serializing_if = "Option::is_none")] + pub probe_sets: Option>, } /// The key to use to query a custom chemistry @@ -115,6 +201,8 @@ impl CustomChemistry { plist_name: None, remote_pl_url: None, meta: None, + sample_bc_list: None, + probe_sets: None, }) } pub fn geometry(&self) -> &str { @@ -148,6 +236,20 @@ impl CustomChemistry { pub fn meta(&self) -> &Option { &self.meta } + + /// Get the protocol type from meta.protocol_type, defaulting to StandardRna. + pub fn protocol_type(&self) -> ProtocolType { + self.meta + .as_ref() + .and_then(|m| m.get("protocol_type")) + .and_then(|v| serde_json::from_value::(v.clone()).ok()) + .unwrap_or_default() + } + + /// Whether this chemistry is a Flex GEX protocol. + pub fn is_flex_gex(&self) -> bool { + self.protocol_type() == ProtocolType::FlexGex + } } impl fmt::Display for CustomChemistry { diff --git a/src/utils/jrsonnet_main.rs b/src/utils/jrsonnet_main.rs index 81d70e3..ea44746 100644 --- a/src/utils/jrsonnet_main.rs +++ b/src/utils/jrsonnet_main.rs @@ -192,9 +192,8 @@ impl From for Error { } fn main_catch(opts: Opts) -> anyhow::Result { - let s = State::default(); let trace = opts.trace.trace_format(); - let eval_result = main_real(&s, opts); + let eval_result = main_real(opts); match eval_result { Ok(js) => Ok(js), Err(e) => { @@ -211,18 +210,20 @@ fn main_catch(opts: Opts) -> anyhow::Result { } } -fn main_real(s: &State, opts: Opts) -> Result { +fn main_real(opts: Opts) -> Result { let _gc_leak_guard = opts.gc.leak_on_exit(); let _gc_print_stats = opts.gc.stats_printer(); let _stack_depth_override = opts.misc.stack_size_override(); let import_resolver = opts.misc.import_resolver(); - s.set_import_resolver(import_resolver); + let mut state_builder = State::builder(); + state_builder.import_resolver(import_resolver); - let std = opts.std.context_initializer(s)?; + let std = opts.std.context_initializer()?; if let Some(std) = std { - s.set_context_initializer(std); + state_builder.context_initializer(std); } + let s = state_builder.build(); let input = opts.input.input.ok_or(Error::MissingInputArgument)?; let val = s.import(input)?; diff --git a/tests/snapshots/cli-help/simpleaf___help.txt b/tests/snapshots/cli-help/simpleaf___help.txt index d722166..dd32aa8 100644 --- a/tests/snapshots/cli-help/simpleaf___help.txt +++ b/tests/snapshots/cli-help/simpleaf___help.txt @@ -7,6 +7,7 @@ Commands: chemistry operate on or inspect the chemistry registry inspect inspect the current configuration quant quantify a sample + flex-quant quantify a 10x Flex GEX sample (probe-based, multiplexed) set-paths set paths to the programs that simpleaf will use refresh-prog-info refreshes version information associated with programs used by simpleaf atac run a sub-command dealing with atac-seq data