From 2521c2bace37f2e0c05839e911d3045c2d2d0010 Mon Sep 17 00:00:00 2001 From: Amit Upadhyay Date: Fri, 10 Jan 2025 15:11:08 +0530 Subject: [PATCH] rust 1.84.0 && cargo update --- Cargo.lock | 312 +++++++----------- Cargo.toml | 6 +- .../src/library2022/processor/document.rs | 4 +- .../src/library2022/processor/user_group.rs | 4 +- ftd-ast/src/component.rs | 2 +- ftd-ast/src/or_type.rs | 2 +- ftd-ast/src/record.rs | 2 +- ftd-ast/src/web_component.rs | 2 +- ftd/src/ftd2021/di/record.rs | 2 +- rust-toolchain.toml | 2 +- v0.5/Cargo.lock | 140 ++++---- v0.5/fastn-section/src/parser/kind.rs | 5 +- v0.5/fastn-unresolved/src/parser/import.rs | 5 +- v0.5/fastn-unresolved/src/resolver/symbol.rs | 42 +-- v0.5/fastn/src/commands/render.rs | 4 +- 15 files changed, 224 insertions(+), 310 deletions(-) diff --git a/Cargo.lock b/Cargo.lock index f067918470..2d994ee6d4 100644 --- a/Cargo.lock +++ b/Cargo.lock @@ -20,7 +20,7 @@ version = "0.5.2" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "5f7b0a21988c1bf877cf4759ef5ddaac04c1c9fe808c9142ecb78ba97d97a28a" dependencies = [ - "bitflags 2.6.0", + "bitflags 2.7.0", "bytes", "futures-core", "futures-sink", @@ -43,7 +43,7 @@ dependencies = [ "actix-utils", "ahash", "base64 0.22.1", - "bitflags 2.6.0", + "bitflags 2.7.0", "brotli", "bytes", "bytestring", @@ -77,7 +77,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "e01ed3140b2f8d422c68afa1ed2e85d996ea619c988ac834d255db32138655cb" dependencies = [ "quote", - "syn 2.0.94", + "syn 2.0.96", ] [[package]] @@ -194,7 +194,7 @@ dependencies = [ "actix-router", "proc-macro2", "quote", - "syn 2.0.94", + "syn 2.0.96", ] [[package]] @@ -385,18 +385,18 @@ checksum = "3b43422f69d8ff38f95f1b2bb76517c91589a924d1559a0e935d7c8ce0274c11" dependencies = [ "proc-macro2", "quote", - "syn 2.0.94", + "syn 2.0.96", ] [[package]] name = "async-trait" -version = "0.1.84" +version = "0.1.85" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "1b1244b10dcd56c92219da4e14caa97e312079e185f04ba3eea25061561dc0a0" +checksum = "3f934833b4b7233644e5848f235df3f57ed8c80f1528a26c3dfa13d2147fa056" dependencies = [ "proc-macro2", "quote", - "syn 2.0.94", + "syn 2.0.96", ] [[package]] @@ -464,9 +464,9 @@ checksum = "bef38d45163c2f1dde094a7dfd33ccf595c92905c8f8f4fdc18d06fb1037718a" [[package]] name = "bitflags" -version = "2.6.0" +version = "2.7.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b048fb63fd8b5923fc5aa7b340d8e156aec7ec02f0c78fa8a6ddc2613f6f71de" +checksum = "1be3f42a67d6d345ecd59f675f3f012d6974981560836e938c22b424b85ce1be" [[package]] name = "block-buffer" @@ -486,31 +486,6 @@ dependencies = [ "generic-array", ] -[[package]] -name = "bon" -version = "3.3.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "fe7acc34ff59877422326db7d6f2d845a582b16396b6b08194942bf34c6528ab" -dependencies = [ - "bon-macros", - "rustversion", -] - -[[package]] -name = "bon-macros" -version = "3.3.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "4159dd617a7fbc9be6a692fe69dc2954f8e6bb6bb5e4d7578467441390d77fd0" -dependencies = [ - "darling", - "ident_case", - "prettyplease", - "proc-macro2", - "quote", - "rustversion", - "syn 2.0.94", -] - [[package]] name = "brotli" version = "6.0.0" @@ -667,18 +642,18 @@ dependencies = [ [[package]] name = "clap" -version = "4.5.23" +version = "4.5.26" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "3135e7ec2ef7b10c6ed8950f0f792ed96ee093fa088608f1c76e569722700c84" +checksum = "a8eb5e908ef3a6efbe1ed62520fb7287959888c88485abe072543190ecc66783" dependencies = [ "clap_builder", ] [[package]] name = "clap_builder" -version = "4.5.23" +version = "4.5.26" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "30582fc632330df2bd26877bde0c1f4470d57c582bbc070376afcd04d8cb4838" +checksum = "96b01801b5fc6a0a232407abc821660c9c6d25a1cafc0d4f85f29fb8d9afc121" dependencies = [ "anstream", "anstyle", @@ -702,7 +677,7 @@ dependencies = [ "serde", "serde_json", "sha2", - "thiserror 2.0.9", + "thiserror 2.0.10", "tokio", ] @@ -720,26 +695,22 @@ checksum = "5b63caa9aa9397e2d9480a9b13673856c78d8ac123288526c37d7839f2a86990" [[package]] name = "colored" -version = "2.2.0" +version = "3.0.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "117725a109d387c937a1533ce01b450cbde6b88abceea8473c4d7a85853cda3c" +checksum = "fde0e0ec90c9dfb3b4b1a0891a7dcd0e2bffde2f7efed5fe7c9bb00e5bfb915e" dependencies = [ - "lazy_static 1.5.0", "windows-sys 0.59.0", ] [[package]] name = "comrak" -version = "0.32.0" +version = "0.33.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "48ae8f3e7e3f3d424cbb33354fc36943d507327d210aa5794b0192f4be726c6d" +checksum = "39bff2cbb80102771ca62bd2375bc6f6611dc1493373440b23aa08a155538708" dependencies = [ - "bon", "caseless", "entities", "memchr", - "once_cell", - "regex", "slug", "typed-arena", "unicode_categories", @@ -1016,41 +987,6 @@ dependencies = [ "lazy_static 0.1.16", ] -[[package]] -name = "darling" -version = "0.20.10" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "6f63b86c8a8826a49b8c21f08a2d07338eec8d900540f8630dc76284be802989" -dependencies = [ - "darling_core", - "darling_macro", -] - -[[package]] -name = "darling_core" -version = "0.20.10" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "95133861a8032aaea082871032f5815eb9e98cef03fa916ab4500513994df9e5" -dependencies = [ - "fnv", - "ident_case", - "proc-macro2", - "quote", - "strsim", - "syn 2.0.94", -] - -[[package]] -name = "darling_macro" -version = "0.20.10" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d336a2a514f6ccccaa3e09b02d41d35330c07ddf03a62165fcec10bb561c7806" -dependencies = [ - "darling_core", - "quote", - "syn 2.0.94", -] - [[package]] name = "deadpool" version = "0.10.0" @@ -1122,7 +1058,7 @@ checksum = "30542c1ad912e0e3d22a1935c290e12e8a29d704a420177a31faad4a601a0800" dependencies = [ "proc-macro2", "quote", - "syn 2.0.94", + "syn 2.0.96", ] [[package]] @@ -1135,7 +1071,7 @@ dependencies = [ "proc-macro2", "quote", "rustc_version", - "syn 2.0.94", + "syn 2.0.96", ] [[package]] @@ -1229,7 +1165,7 @@ checksum = "97369cbbc041bc366949bc74d34658d6cda5621039731c6310521892a3a20ae0" dependencies = [ "proc-macro2", "quote", - "syn 2.0.94", + "syn 2.0.96", ] [[package]] @@ -1338,9 +1274,9 @@ dependencies = [ [[package]] name = "event-listener" -version = "5.3.1" +version = "5.4.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "6032be9bd27023a771701cc49f9f053c751055f71efb2e0ae5c15809093675ba" +checksum = "3492acde4c3fc54c845eaab3eed8bd00c7a7d881f78bfc801e43a93dec1331ae" dependencies = [ "concurrent-queue", "parking", @@ -1403,7 +1339,7 @@ dependencies = [ "reqwest", "scc", "serde", - "thiserror 2.0.9", + "thiserror 2.0.10", "tokio", ] @@ -1413,7 +1349,7 @@ version = "0.1.0" dependencies = [ "fastn-resolved", "indexmap", - "itertools 0.13.0", + "itertools 0.14.0", "regex", ] @@ -1455,7 +1391,7 @@ dependencies = [ "http 1.2.0", "ignore", "indoc", - "itertools 0.13.0", + "itertools 0.14.0", "mime_guess", "once_cell", "pretty_assertions", @@ -1466,7 +1402,7 @@ dependencies = [ "serde", "serde_json", "sha2", - "thiserror 2.0.9", + "thiserror 2.0.10", "tokio", "tokio-postgres", "tracing", @@ -1494,7 +1430,7 @@ dependencies = [ "rusqlite", "scc", "serde_json", - "thiserror 2.0.9", + "thiserror 2.0.10", "tokio", "tracing", "url", @@ -1505,7 +1441,7 @@ dependencies = [ name = "fastn-expr" version = "0.1.0" dependencies = [ - "thiserror 2.0.9", + "thiserror 2.0.10", ] [[package]] @@ -1513,7 +1449,7 @@ name = "fastn-issues" version = "0.1.0" dependencies = [ "ftd", - "thiserror 2.0.9", + "thiserror 2.0.10", ] [[package]] @@ -1522,12 +1458,12 @@ version = "0.1.0" dependencies = [ "fastn-resolved", "indoc", - "itertools 0.13.0", + "itertools 0.14.0", "prettify-js", "pretty", "quick-js", "rquickjs", - "thiserror 2.0.9", + "thiserror 2.0.10", ] [[package]] @@ -1538,7 +1474,7 @@ dependencies = [ "enum-iterator", "enum-iterator-derive", "serde", - "thiserror 2.0.9", + "thiserror 2.0.10", ] [[package]] @@ -1579,7 +1515,7 @@ dependencies = [ "fastn-resolved", "indexmap", "indoc", - "itertools 0.13.0", + "itertools 0.14.0", "once_cell", "serde", "sha2", @@ -1597,7 +1533,7 @@ dependencies = [ "serde_json", "sha2", "snafu", - "thiserror 2.0.9", + "thiserror 2.0.10", "tracing", "zip", ] @@ -1608,7 +1544,7 @@ version = "0.1.0" dependencies = [ "rusqlite", "serde_json", - "thiserror 2.0.9", + "thiserror 2.0.10", ] [[package]] @@ -1632,7 +1568,7 @@ dependencies = [ "scc", "serde", "serde_json", - "thiserror 2.0.9", + "thiserror 2.0.10", "tokio-postgres", "tracing", "wasmtime", @@ -1728,7 +1664,7 @@ dependencies = [ "include_dir", "indexmap", "indoc", - "itertools 0.13.0", + "itertools 0.14.0", "once_cell", "pretty_assertions", "regex", @@ -1736,7 +1672,7 @@ dependencies = [ "serde_json", "slug", "syntect", - "thiserror 2.0.9", + "thiserror 2.0.10", "tracing", ] @@ -1746,11 +1682,11 @@ version = "0.1.0" dependencies = [ "colored", "ftd-p1", - "itertools 0.13.0", + "itertools 0.14.0", "pretty_assertions", "serde", "serde_json", - "thiserror 2.0.9", + "thiserror 2.0.10", ] [[package]] @@ -1759,11 +1695,11 @@ version = "0.1.0" dependencies = [ "diffy", "indoc", - "itertools 0.13.0", + "itertools 0.14.0", "pretty_assertions", "serde", "serde_json", - "thiserror 2.0.9", + "thiserror 2.0.10", ] [[package]] @@ -1822,7 +1758,7 @@ checksum = "162ee34ebcb7c64a8abebc059ce0fee27c2262618d7b60ed8faf72fef13c3650" dependencies = [ "proc-macro2", "quote", - "syn 2.0.94", + "syn 2.0.96", ] [[package]] @@ -1870,7 +1806,7 @@ version = "0.6.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "27d12c0aed7f1e24276a241aadc4cb8ea9f83000f34bc062b7cc2d51e3b0fabd" dependencies = [ - "bitflags 2.6.0", + "bitflags 2.7.0", "debugid", "fxhash", "serde", @@ -2249,7 +2185,7 @@ checksum = "1ec89e9337638ecdc08744df490b221a7399bf8d164eb52a665454e60e075ad6" dependencies = [ "proc-macro2", "quote", - "syn 2.0.94", + "syn 2.0.96", ] [[package]] @@ -2389,9 +2325,9 @@ dependencies = [ [[package]] name = "itertools" -version = "0.13.0" +version = "0.14.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "413ee7dfc52ee1a4949ceeb7dbc8a33f2d6c088194d9f922fb8318faf1f01186" +checksum = "2b192c782037fadd9cfa75548310488aabdbf3d2da73885b31bd0abd03351285" dependencies = [ "either", ] @@ -2493,7 +2429,7 @@ version = "0.1.3" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "c0ff37bd590ca25063e35af745c343cb7a0271906fb7b37e4813e8f79f00268d" dependencies = [ - "bitflags 2.6.0", + "bitflags 2.7.0", "libc", ] @@ -2516,9 +2452,9 @@ checksum = "0717cef1bc8b636c6e1c1bbdefc09e6322da8a9321966e8928ef80d20f7f770f" [[package]] name = "linux-raw-sys" -version = "0.4.14" +version = "0.4.15" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "78b3ae25bc7c8c38cec158d1f2757ee79e9b3740fbc7ccf0e59e4b08d793fa89" +checksum = "d26c52dbd32dccf2d10cac7725f8eae5296885fb5703b261f7d0a0739ec807ab" [[package]] name = "litemap" @@ -2795,27 +2731,27 @@ checksum = "e3148f5046208a5d56bcfc03053e3ca6334e51da8dfb19b6cdc8b306fae3283e" [[package]] name = "phf" -version = "0.11.2" +version = "0.11.3" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ade2d8b8f33c7333b51bcf0428d37e217e9f32192ae4772156f65063b8ce03dc" +checksum = "1fd6780a80ae0c52cc120a26a1a42c1ae51b247a253e4e06113d23d2c2edd078" dependencies = [ "phf_shared", ] [[package]] name = "phf_shared" -version = "0.11.2" +version = "0.11.3" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "90fcb95eef784c2ac79119d1dd819e162b5da872ce6f3c3abe1e8ca1c082f72b" +checksum = "67eabc2ef2a60eb7faa00097bd1ffdb5bd28e62bf39990626a582201b7a754e5" dependencies = [ "siphasher", ] [[package]] name = "pin-project-lite" -version = "0.2.15" +version = "0.2.16" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "915a1e146535de9163f3987b8944ed8cf49a18bb0056bcebcdcece385cece4ff" +checksum = "3b3cff922bd51709b605d9ead9aa71031d81447142d828eb4a6eba76fe619f9b" [[package]] name = "pin-utils" @@ -2940,16 +2876,6 @@ dependencies = [ "yansi", ] -[[package]] -name = "prettyplease" -version = "0.2.25" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "64d1ec885c64d0457d564db4ec299b2dae3f9c02808b8ad9c3a089c591b18033" -dependencies = [ - "proc-macro2", - "syn 2.0.94", -] - [[package]] name = "proc-macro-crate" version = "1.3.1" @@ -3045,7 +2971,7 @@ dependencies = [ "rustc-hash", "rustls", "socket2", - "thiserror 2.0.9", + "thiserror 2.0.10", "tokio", "tracing", ] @@ -3064,7 +2990,7 @@ dependencies = [ "rustls", "rustls-pki-types", "slab", - "thiserror 2.0.9", + "thiserror 2.0.10", "tinyvec", "tracing", "web-time", @@ -3162,7 +3088,7 @@ version = "0.5.8" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "03a862b389f93e68874fbf580b9de08dd02facb9a788ebadaf4a3fd33cf58834" dependencies = [ - "bitflags 2.6.0", + "bitflags 2.7.0", ] [[package]] @@ -3334,7 +3260,7 @@ dependencies = [ "proc-macro2", "quote", "rquickjs-core", - "syn 2.0.94", + "syn 2.0.96", ] [[package]] @@ -3352,7 +3278,7 @@ version = "0.31.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "b838eba278d213a8beaf485bd313fd580ca4505a00d5871caeb1457c55322cae" dependencies = [ - "bitflags 2.6.0", + "bitflags 2.7.0", "fallible-iterator 0.3.0", "fallible-streaming-iterator", "hashlink", @@ -3383,11 +3309,11 @@ dependencies = [ [[package]] name = "rustix" -version = "0.38.42" +version = "0.38.43" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f93dc38ecbab2eb790ff964bb77fa94faf256fd3e73285fd7ba0903b76bedb85" +checksum = "a78891ee6bf2340288408954ac787aa063d8e8817e9f53abb37c695c6d834ef6" dependencies = [ - "bitflags 2.6.0", + "bitflags 2.7.0", "errno", "libc", "linux-raw-sys", @@ -3437,12 +3363,6 @@ dependencies = [ "untrusted", ] -[[package]] -name = "rustversion" -version = "1.0.19" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f7c45b9784283f1b2e7fb61b42047c2fd678ef0960d4f6f1eba131594cc369d4" - [[package]] name = "ryu" version = "1.0.18" @@ -3505,14 +3425,14 @@ checksum = "5a9bf7cf98d04a2b28aead066b7496853d4779c9cc183c440dbac457641e19a0" dependencies = [ "proc-macro2", "quote", - "syn 2.0.94", + "syn 2.0.96", ] [[package]] name = "serde_json" -version = "1.0.134" +version = "1.0.135" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d00f4175c42ee48b15416f6193a959ba3a0d67fc699a0db9ad12df9f83991c7d" +checksum = "2b0d7ba2887406110130a978386c4e1befb98c674b4fba677954e4db976630d9" dependencies = [ "itoa", "memchr", @@ -3595,9 +3515,9 @@ checksum = "d66dc143e6b11c1eddc06d5c423cfc97062865baf299914ab64caa38182078fe" [[package]] name = "siphasher" -version = "0.3.11" +version = "1.0.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "38b58827f4464d87d377d175e90bf58eb00fd8716ff0a62f80356b5e61555d0d" +checksum = "56199f7ddabf13fe5074ce809e7d3f42b42ae711800501b5b16ea82ad029c39d" [[package]] name = "slab" @@ -3645,7 +3565,7 @@ dependencies = [ "heck", "proc-macro2", "quote", - "syn 2.0.94", + "syn 2.0.96", ] [[package]] @@ -3712,9 +3632,9 @@ dependencies = [ [[package]] name = "syn" -version = "2.0.94" +version = "2.0.96" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "987bc0be1cdea8b10216bd06e2ca407d40b9543468fafd3ddfb02f36e77f71f3" +checksum = "d5d0adab1ae378d7f53bdebc67a39f1f151407ef230f0ce2883572f5d8985c80" dependencies = [ "proc-macro2", "quote", @@ -3738,7 +3658,7 @@ checksum = "c8af7666ab7b6390ab78131fb5b0fce11d6b7a6951602017c35fa82800708971" dependencies = [ "proc-macro2", "quote", - "syn 2.0.94", + "syn 2.0.96", ] [[package]] @@ -3789,11 +3709,11 @@ dependencies = [ [[package]] name = "thiserror" -version = "2.0.9" +version = "2.0.10" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f072643fd0190df67a8bab670c20ef5d8737177d6ac6b2e9a236cb096206b2cc" +checksum = "a3ac7f54ca534db81081ef1c1e7f6ea8a3ef428d2fc069097c079443d24124d3" dependencies = [ - "thiserror-impl 2.0.9", + "thiserror-impl 2.0.10", ] [[package]] @@ -3804,18 +3724,18 @@ checksum = "4fee6c4efc90059e10f81e6d42c60a18f76588c3d74cb83a0b242a2b6c7504c1" dependencies = [ "proc-macro2", "quote", - "syn 2.0.94", + "syn 2.0.96", ] [[package]] name = "thiserror-impl" -version = "2.0.9" +version = "2.0.10" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "7b50fa271071aae2e6ee85f842e2e28ba8cd2c5fb67f11fcb1fd70b276f9e7d4" +checksum = "9e9465d30713b56a37ede7185763c3492a91be2f5fa68d958c44e41ab9248beb" dependencies = [ "proc-macro2", "quote", - "syn 2.0.94", + "syn 2.0.96", ] [[package]] @@ -3895,9 +3815,9 @@ checksum = "1f3ccbac311fea05f86f61904b462b55fb3df8837a366dfc601a0161d0532f20" [[package]] name = "tokio" -version = "1.42.0" +version = "1.43.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "5cec9b21b0450273377fc97bd4c33a8acffc8c996c987a7c5b319a0083707551" +checksum = "3d61fa4ffa3de412bfea335c6ecff681de2b609ba3c77ef3e00e521813a9ed9e" dependencies = [ "backtrace", "bytes", @@ -3913,13 +3833,13 @@ dependencies = [ [[package]] name = "tokio-macros" -version = "2.4.0" +version = "2.5.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "693d596312e88961bc67d7f1f97af8a70227d9f90c31bba5806eec004978d752" +checksum = "6e06d43f1345a3bcd39f6a56dbb7dcab2ba47e68e8ac134855e7e2bdbaf8cab8" dependencies = [ "proc-macro2", "quote", - "syn 2.0.94", + "syn 2.0.96", ] [[package]] @@ -4013,7 +3933,7 @@ dependencies = [ "serde", "serde_spanned", "toml_datetime", - "winnow 0.6.21", + "winnow 0.6.22", ] [[package]] @@ -4063,7 +3983,7 @@ checksum = "395ae124c09f9e6918a2310af6038fba074bcf474ac352496d5910dd59a2226d" dependencies = [ "proc-macro2", "quote", - "syn 2.0.94", + "syn 2.0.96", ] [[package]] @@ -4219,9 +4139,9 @@ checksum = "06abde3611657adf66d383f00b093d7faecc7fa57071cce2578660c9f1010821" [[package]] name = "uuid" -version = "1.11.0" +version = "1.11.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f8c5f0a0af699448548ad1a2fbf920fb4bee257eae39953ba95cb84891a0446a" +checksum = "b913a3b5fe84142e269d63cc62b64319ccaf89b748fc31fe025177f767a756c4" [[package]] name = "valuable" @@ -4293,7 +4213,7 @@ dependencies = [ "log", "proc-macro2", "quote", - "syn 2.0.94", + "syn 2.0.96", "wasm-bindgen-shared", ] @@ -4328,7 +4248,7 @@ checksum = "30d7a95b763d3c45903ed6c81f156801839e5ee968bb07e534c44df0fcd330c2" dependencies = [ "proc-macro2", "quote", - "syn 2.0.94", + "syn 2.0.96", "wasm-bindgen-backend", "wasm-bindgen-shared", ] @@ -4351,12 +4271,12 @@ dependencies = [ [[package]] name = "wasm-encoder" -version = "0.222.0" +version = "0.223.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "3432682105d7e994565ef928ccf5856cf6af4ba3dddebedb737f61caed70f956" +checksum = "7e636076193fa68103e937ac951b5f2f587624097017d764b8984d9c0f149464" dependencies = [ "leb128", - "wasmparser 0.222.0", + "wasmparser 0.223.0", ] [[package]] @@ -4365,7 +4285,7 @@ version = "0.221.2" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "9845c470a2e10b61dd42c385839cdd6496363ed63b5c9e420b5488b77bd22083" dependencies = [ - "bitflags 2.6.0", + "bitflags 2.7.0", "hashbrown 0.15.2", "indexmap", "semver", @@ -4374,11 +4294,11 @@ dependencies = [ [[package]] name = "wasmparser" -version = "0.222.0" +version = "0.223.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "4adf50fde1b1a49c1add6a80d47aea500c88db70551805853aa8b88f3ea27ab5" +checksum = "d5a99faceb1a5a84dd6084ec4bfa4b2ab153b5793b43fd8f58b89232634afc35" dependencies = [ - "bitflags 2.6.0", + "bitflags 2.7.0", "indexmap", "semver", ] @@ -4403,7 +4323,7 @@ dependencies = [ "addr2line", "anyhow", "async-trait", - "bitflags 2.6.0", + "bitflags 2.7.0", "bumpalo", "cc", "cfg-if", @@ -4489,7 +4409,7 @@ dependencies = [ "anyhow", "proc-macro2", "quote", - "syn 2.0.94", + "syn 2.0.96", "wasmtime-component-util", "wasmtime-wit-bindgen", "wit-parser", @@ -4605,7 +4525,7 @@ checksum = "d7de0a56fb0a69b185968f2d7a9ba54750920a806470dff7ad8de91ac06d277e" dependencies = [ "proc-macro2", "quote", - "syn 2.0.94", + "syn 2.0.96", ] [[package]] @@ -4639,22 +4559,22 @@ dependencies = [ [[package]] name = "wast" -version = "222.0.0" +version = "223.0.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "5ce7191f4b7da0dd300cc32476abae6457154e4625d9b1bc26890828a9a26f6e" +checksum = "d59b2ba8a2ff9f06194b7be9524f92e45e70149f4dacc0d0c7ad92b59ac875e4" dependencies = [ "bumpalo", "leb128", "memchr", "unicode-width 0.2.0", - "wasm-encoder 0.222.0", + "wasm-encoder 0.223.0", ] [[package]] name = "wat" -version = "1.222.0" +version = "1.223.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "8fde61b4b52f9a84ae31b5e8902a2cd3162ea45d8bf564c729c3288fe52f4334" +checksum = "662786915c427e4918ff01eabb3c4756d4d947cd8f635761526b4cc9da2eaaad" dependencies = [ "wast", ] @@ -4945,9 +4865,9 @@ dependencies = [ [[package]] name = "winnow" -version = "0.6.21" +version = "0.6.22" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e6f5bb5257f2407a5425c6e749bfd9692192a73e70a6060516ac04f889087d68" +checksum = "39281189af81c07ec09db316b302a3e67bf9bd7cbf6c820b50e35fee9c2fa980" dependencies = [ "memchr", ] @@ -5017,7 +4937,7 @@ checksum = "2380878cad4ac9aac1e2435f3eb4020e8374b5f13c296cb75b4620ff8e229154" dependencies = [ "proc-macro2", "quote", - "syn 2.0.94", + "syn 2.0.96", "synstructure", ] @@ -5039,7 +4959,7 @@ checksum = "fa4f8080344d4671fb4e831a13ad1e68092748387dfc4f55e356242fae12ce3e" dependencies = [ "proc-macro2", "quote", - "syn 2.0.94", + "syn 2.0.96", ] [[package]] @@ -5059,7 +4979,7 @@ checksum = "595eed982f7d355beb85837f651fa22e90b3c044842dc7f2c2842c086f295808" dependencies = [ "proc-macro2", "quote", - "syn 2.0.94", + "syn 2.0.96", "synstructure", ] @@ -5080,7 +5000,7 @@ checksum = "ce36e65b0d2999d2aafac989fb249189a141aee1f53c612c1f37d72631959f69" dependencies = [ "proc-macro2", "quote", - "syn 2.0.94", + "syn 2.0.96", ] [[package]] @@ -5102,7 +5022,7 @@ checksum = "6eafa6dfb17584ea3e2bd6e76e0cc15ad7af12b09abdd1ca55961bed9b1063c6" dependencies = [ "proc-macro2", "quote", - "syn 2.0.94", + "syn 2.0.96", ] [[package]] @@ -5127,7 +5047,7 @@ dependencies = [ "pbkdf2", "rand", "sha1", - "thiserror 2.0.9", + "thiserror 2.0.10", "time", "zeroize", "zopfli", diff --git a/Cargo.toml b/Cargo.toml index 7094507fab..5deb910996 100644 --- a/Cargo.toml +++ b/Cargo.toml @@ -75,7 +75,7 @@ async-recursion = "1" async-trait = "0.1" camino = "1" clap = "4" -colored = "2" +colored = "3" css-color-parser = "0.1" diffy = "0.4" dotenvy = "0.15" @@ -106,7 +106,7 @@ futures-core = "0.3" ignore = "0.4" include_dir = "0.7" indoc = "2" -itertools = "0.13" +itertools = "0.14" http = "1" bytes = "1" mime_guess = "2" @@ -183,7 +183,7 @@ features = [ [workspace.dependencies.comrak] # We use comrak for markup processing. -version = "0.32" +version = "0.33" # By default, comrak ships with support for syntax highlighting using syntext for "fenced # code blocks". We have disabled that by not using default features. We did that because # we already have a way to show code in ftd, ftd.code. Further, comark requires syntect 4.6, diff --git a/fastn-core/src/library2022/processor/document.rs b/fastn-core/src/library2022/processor/document.rs index 61ce3447dd..365645b482 100644 --- a/fastn-core/src/library2022/processor/document.rs +++ b/fastn-core/src/library2022/processor/document.rs @@ -101,10 +101,10 @@ pub fn document_suffix( }) } -pub async fn document_name<'a>( +pub async fn document_name( value: ftd_ast::VariableValue, _kind: fastn_resolved::Kind, - doc: &ftd::interpreter::TDoc<'a>, + doc: &ftd::interpreter::TDoc<'_>, req_config: &fastn_core::RequestConfig, preview_session_id: &Option, ) -> ftd::interpreter::Result { diff --git a/fastn-core/src/library2022/processor/user_group.rs b/fastn-core/src/library2022/processor/user_group.rs index ff45b15967..f0b1b2e796 100644 --- a/fastn-core/src/library2022/processor/user_group.rs +++ b/fastn-core/src/library2022/processor/user_group.rs @@ -41,10 +41,10 @@ pub async fn get_identities( } // is user can_read the document or not based on defined readers in sitemap -pub async fn is_reader<'a>( +pub async fn is_reader( _value: ftd_ast::VariableValue, _kind: fastn_resolved::Kind, - _doc: &ftd::interpreter::TDoc<'a>, + _doc: &ftd::interpreter::TDoc<'_>, _req_config: &fastn_core::RequestConfig, ) -> ftd::interpreter::Result { Err(ftd::interpreter::Error::OtherError( diff --git a/ftd-ast/src/component.rs b/ftd-ast/src/component.rs index f9fc5e9add..d540852638 100644 --- a/ftd-ast/src/component.rs +++ b/ftd-ast/src/component.rs @@ -29,7 +29,7 @@ impl ComponentDefinition { } pub fn is_component_definition(section: &ftd_p1::Section) -> bool { - section.kind.as_ref().map_or(false, |s| s.eq(COMPONENT)) + section.kind.as_ref().is_some_and(|s| s.eq(COMPONENT)) } pub fn from_p1( diff --git a/ftd-ast/src/or_type.rs b/ftd-ast/src/or_type.rs index 00ff8e8303..66f2e1980c 100644 --- a/ftd-ast/src/or_type.rs +++ b/ftd-ast/src/or_type.rs @@ -17,7 +17,7 @@ impl OrType { } pub(crate) fn is_or_type(section: &ftd_p1::Section) -> bool { - section.kind.as_ref().map_or(false, |s| s.eq(ORTYPE)) + section.kind.as_ref().is_some_and(|s| s.eq(ORTYPE)) } pub(crate) fn from_p1(section: &ftd_p1::Section, doc_id: &str) -> ftd_ast::Result { diff --git a/ftd-ast/src/record.rs b/ftd-ast/src/record.rs index 1f07a1717e..1dd274256a 100644 --- a/ftd-ast/src/record.rs +++ b/ftd-ast/src/record.rs @@ -18,7 +18,7 @@ impl Record { section .kind .as_ref() - .map_or(false, |s| s.eq(ftd_ast::constants::RECORD)) + .is_some_and(|s| s.eq(ftd_ast::constants::RECORD)) } pub(crate) fn from_p1(section: &ftd_p1::Section, doc_id: &str) -> ftd_ast::Result { diff --git a/ftd-ast/src/web_component.rs b/ftd-ast/src/web_component.rs index 1a585ffb0e..9ada0d15e9 100644 --- a/ftd-ast/src/web_component.rs +++ b/ftd-ast/src/web_component.rs @@ -24,7 +24,7 @@ impl WebComponentDefinition { } pub fn is_web_component_definition(section: &ftd_p1::Section) -> bool { - section.kind.as_ref().map_or(false, |s| s.eq(WEB_COMPONENT)) + section.kind.as_ref().is_some_and(|s| s.eq(WEB_COMPONENT)) } pub fn from_p1( diff --git a/ftd/src/ftd2021/di/record.rs b/ftd/src/ftd2021/di/record.rs index 2ef45aa35d..6ff7a97305 100644 --- a/ftd/src/ftd2021/di/record.rs +++ b/ftd/src/ftd2021/di/record.rs @@ -8,7 +8,7 @@ pub const RECORD: &str = "record"; impl Record { pub(crate) fn is_record(section: &ftd_p1::Section) -> bool { - section.kind.as_ref().map_or(false, |s| s.eq(RECORD)) + section.kind.as_ref().is_some_and(|s| s.eq(RECORD)) } pub(crate) fn from_p1( diff --git a/rust-toolchain.toml b/rust-toolchain.toml index 3d15864b46..830f9581c8 100644 --- a/rust-toolchain.toml +++ b/rust-toolchain.toml @@ -1,3 +1,3 @@ [toolchain] -channel = "1.83.0" +channel = "1.84.0" diff --git a/v0.5/Cargo.lock b/v0.5/Cargo.lock index ca7083af48..e3dbb1d93f 100644 --- a/v0.5/Cargo.lock +++ b/v0.5/Cargo.lock @@ -116,13 +116,13 @@ dependencies = [ [[package]] name = "async-trait" -version = "0.1.84" +version = "0.1.85" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "1b1244b10dcd56c92219da4e14caa97e312079e185f04ba3eea25061561dc0a0" +checksum = "3f934833b4b7233644e5848f235df3f57ed8c80f1528a26c3dfa13d2147fa056" dependencies = [ "proc-macro2", "quote", - "syn 2.0.94", + "syn 2.0.96", ] [[package]] @@ -160,9 +160,9 @@ checksum = "72b3254f16251a8381aa12e40e3c4d2f0199f8c6508fbecb9d91f575e0fbb8c6" [[package]] name = "bitflags" -version = "2.6.0" +version = "2.7.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b048fb63fd8b5923fc5aa7b340d8e156aec7ec02f0c78fa8a6ddc2613f6f71de" +checksum = "1be3f42a67d6d345ecd59f675f3f012d6974981560836e938c22b424b85ce1be" [[package]] name = "block-buffer" @@ -584,7 +584,7 @@ checksum = "97369cbbc041bc366949bc74d34658d6cda5621039731c6310521892a3a20ae0" dependencies = [ "proc-macro2", "quote", - "syn 2.0.94", + "syn 2.0.96", ] [[package]] @@ -632,9 +632,9 @@ dependencies = [ [[package]] name = "event-listener" -version = "5.3.1" +version = "5.4.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "6032be9bd27023a771701cc49f9f053c751055f71efb2e0ae5c15809093675ba" +checksum = "3492acde4c3fc54c845eaab3eed8bd00c7a7d881f78bfc801e43a93dec1331ae" dependencies = [ "concurrent-queue", "parking", @@ -736,7 +736,7 @@ dependencies = [ "pretty", "quick-js", "rquickjs", - "thiserror 2.0.9", + "thiserror 2.0.10", ] [[package]] @@ -838,7 +838,7 @@ dependencies = [ "arcstr", "fastn-continuation", "fastn-section", - "thiserror 2.0.9", + "thiserror 2.0.10", ] [[package]] @@ -862,7 +862,7 @@ dependencies = [ "scc", "serde", "serde_json", - "thiserror 2.0.9", + "thiserror 2.0.10", "tokio-postgres", "tracing", "wasmtime", @@ -927,7 +927,7 @@ checksum = "162ee34ebcb7c64a8abebc059ce0fee27c2262618d7b60ed8faf72fef13c3650" dependencies = [ "proc-macro2", "quote", - "syn 2.0.94", + "syn 2.0.96", ] [[package]] @@ -1316,7 +1316,7 @@ checksum = "1ec89e9337638ecdc08744df490b221a7399bf8d164eb52a665454e60e075ad6" dependencies = [ "proc-macro2", "quote", - "syn 2.0.94", + "syn 2.0.96", ] [[package]] @@ -1521,9 +1521,9 @@ dependencies = [ [[package]] name = "linux-raw-sys" -version = "0.4.14" +version = "0.4.15" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "78b3ae25bc7c8c38cec158d1f2757ee79e9b3740fbc7ccf0e59e4b08d793fa89" +checksum = "d26c52dbd32dccf2d10cac7725f8eae5296885fb5703b261f7d0a0739ec807ab" [[package]] name = "litemap" @@ -1719,27 +1719,27 @@ checksum = "e3148f5046208a5d56bcfc03053e3ca6334e51da8dfb19b6cdc8b306fae3283e" [[package]] name = "phf" -version = "0.11.2" +version = "0.11.3" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ade2d8b8f33c7333b51bcf0428d37e217e9f32192ae4772156f65063b8ce03dc" +checksum = "1fd6780a80ae0c52cc120a26a1a42c1ae51b247a253e4e06113d23d2c2edd078" dependencies = [ "phf_shared", ] [[package]] name = "phf_shared" -version = "0.11.2" +version = "0.11.3" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "90fcb95eef784c2ac79119d1dd819e162b5da872ce6f3c3abe1e8ca1c082f72b" +checksum = "67eabc2ef2a60eb7faa00097bd1ffdb5bd28e62bf39990626a582201b7a754e5" dependencies = [ "siphasher", ] [[package]] name = "pin-project-lite" -version = "0.2.15" +version = "0.2.16" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "915a1e146535de9163f3987b8944ed8cf49a18bb0056bcebcdcece385cece4ff" +checksum = "3b3cff922bd51709b605d9ead9aa71031d81447142d828eb4a6eba76fe619f9b" [[package]] name = "pin-utils" @@ -1915,7 +1915,7 @@ dependencies = [ "rustc-hash", "rustls", "socket2", - "thiserror 2.0.9", + "thiserror 2.0.10", "tokio", "tracing", ] @@ -1934,7 +1934,7 @@ dependencies = [ "rustls", "rustls-pki-types", "slab", - "thiserror 2.0.9", + "thiserror 2.0.10", "tinyvec", "tracing", "web-time", @@ -2185,7 +2185,7 @@ dependencies = [ "proc-macro2", "quote", "rquickjs-core", - "syn 2.0.94", + "syn 2.0.96", ] [[package]] @@ -2225,9 +2225,9 @@ checksum = "c7fb8039b3032c191086b10f11f319a6e99e1e82889c5cc6046f515c9db1d497" [[package]] name = "rustix" -version = "0.38.42" +version = "0.38.43" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f93dc38ecbab2eb790ff964bb77fa94faf256fd3e73285fd7ba0903b76bedb85" +checksum = "a78891ee6bf2340288408954ac787aa063d8e8817e9f53abb37c695c6d834ef6" dependencies = [ "bitflags", "errno", @@ -2341,14 +2341,14 @@ checksum = "5a9bf7cf98d04a2b28aead066b7496853d4779c9cc183c440dbac457641e19a0" dependencies = [ "proc-macro2", "quote", - "syn 2.0.94", + "syn 2.0.96", ] [[package]] name = "serde_json" -version = "1.0.134" +version = "1.0.135" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d00f4175c42ee48b15416f6193a959ba3a0d67fc699a0db9ad12df9f83991c7d" +checksum = "2b0d7ba2887406110130a978386c4e1befb98c674b4fba677954e4db976630d9" dependencies = [ "itoa", "memchr", @@ -2414,9 +2414,9 @@ dependencies = [ [[package]] name = "siphasher" -version = "0.3.11" +version = "1.0.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "38b58827f4464d87d377d175e90bf58eb00fd8716ff0a62f80356b5e61555d0d" +checksum = "56199f7ddabf13fe5074ce809e7d3f42b42ae711800501b5b16ea82ad029c39d" [[package]] name = "slab" @@ -2503,9 +2503,9 @@ dependencies = [ [[package]] name = "syn" -version = "2.0.94" +version = "2.0.96" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "987bc0be1cdea8b10216bd06e2ca407d40b9543468fafd3ddfb02f36e77f71f3" +checksum = "d5d0adab1ae378d7f53bdebc67a39f1f151407ef230f0ce2883572f5d8985c80" dependencies = [ "proc-macro2", "quote", @@ -2529,7 +2529,7 @@ checksum = "c8af7666ab7b6390ab78131fb5b0fce11d6b7a6951602017c35fa82800708971" dependencies = [ "proc-macro2", "quote", - "syn 2.0.94", + "syn 2.0.96", ] [[package]] @@ -2558,11 +2558,11 @@ dependencies = [ [[package]] name = "thiserror" -version = "2.0.9" +version = "2.0.10" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f072643fd0190df67a8bab670c20ef5d8737177d6ac6b2e9a236cb096206b2cc" +checksum = "a3ac7f54ca534db81081ef1c1e7f6ea8a3ef428d2fc069097c079443d24124d3" dependencies = [ - "thiserror-impl 2.0.9", + "thiserror-impl 2.0.10", ] [[package]] @@ -2573,18 +2573,18 @@ checksum = "4fee6c4efc90059e10f81e6d42c60a18f76588c3d74cb83a0b242a2b6c7504c1" dependencies = [ "proc-macro2", "quote", - "syn 2.0.94", + "syn 2.0.96", ] [[package]] name = "thiserror-impl" -version = "2.0.9" +version = "2.0.10" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "7b50fa271071aae2e6ee85f842e2e28ba8cd2c5fb67f11fcb1fd70b276f9e7d4" +checksum = "9e9465d30713b56a37ede7185763c3492a91be2f5fa68d958c44e41ab9248beb" dependencies = [ "proc-macro2", "quote", - "syn 2.0.94", + "syn 2.0.96", ] [[package]] @@ -2633,9 +2633,9 @@ checksum = "1f3ccbac311fea05f86f61904b462b55fb3df8837a366dfc601a0161d0532f20" [[package]] name = "tokio" -version = "1.42.0" +version = "1.43.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "5cec9b21b0450273377fc97bd4c33a8acffc8c996c987a7c5b319a0083707551" +checksum = "3d61fa4ffa3de412bfea335c6ecff681de2b609ba3c77ef3e00e521813a9ed9e" dependencies = [ "backtrace", "bytes", @@ -2651,13 +2651,13 @@ dependencies = [ [[package]] name = "tokio-macros" -version = "2.4.0" +version = "2.5.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "693d596312e88961bc67d7f1f97af8a70227d9f90c31bba5806eec004978d752" +checksum = "6e06d43f1345a3bcd39f6a56dbb7dcab2ba47e68e8ac134855e7e2bdbaf8cab8" dependencies = [ "proc-macro2", "quote", - "syn 2.0.94", + "syn 2.0.96", ] [[package]] @@ -2751,7 +2751,7 @@ dependencies = [ "serde", "serde_spanned", "toml_datetime", - "winnow 0.6.21", + "winnow 0.6.22", ] [[package]] @@ -2800,7 +2800,7 @@ checksum = "395ae124c09f9e6918a2310af6038fba074bcf474ac352496d5910dd59a2226d" dependencies = [ "proc-macro2", "quote", - "syn 2.0.94", + "syn 2.0.96", ] [[package]] @@ -2938,9 +2938,9 @@ checksum = "b6c140620e7ffbb22c2dee59cafe6084a59b5ffc27a8859a5f0d494b5d52b6be" [[package]] name = "uuid" -version = "1.11.0" +version = "1.11.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f8c5f0a0af699448548ad1a2fbf920fb4bee257eae39953ba95cb84891a0446a" +checksum = "b913a3b5fe84142e269d63cc62b64319ccaf89b748fc31fe025177f767a756c4" [[package]] name = "valuable" @@ -3012,7 +3012,7 @@ dependencies = [ "log", "proc-macro2", "quote", - "syn 2.0.94", + "syn 2.0.96", "wasm-bindgen-shared", ] @@ -3047,7 +3047,7 @@ checksum = "30d7a95b763d3c45903ed6c81f156801839e5ee968bb07e534c44df0fcd330c2" dependencies = [ "proc-macro2", "quote", - "syn 2.0.94", + "syn 2.0.96", "wasm-bindgen-backend", "wasm-bindgen-shared", ] @@ -3070,12 +3070,12 @@ dependencies = [ [[package]] name = "wasm-encoder" -version = "0.222.0" +version = "0.223.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "3432682105d7e994565ef928ccf5856cf6af4ba3dddebedb737f61caed70f956" +checksum = "7e636076193fa68103e937ac951b5f2f587624097017d764b8984d9c0f149464" dependencies = [ "leb128", - "wasmparser 0.222.0", + "wasmparser 0.223.0", ] [[package]] @@ -3093,9 +3093,9 @@ dependencies = [ [[package]] name = "wasmparser" -version = "0.222.0" +version = "0.223.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "4adf50fde1b1a49c1add6a80d47aea500c88db70551805853aa8b88f3ea27ab5" +checksum = "d5a99faceb1a5a84dd6084ec4bfa4b2ab153b5793b43fd8f58b89232634afc35" dependencies = [ "bitflags", "indexmap", @@ -3208,7 +3208,7 @@ dependencies = [ "anyhow", "proc-macro2", "quote", - "syn 2.0.94", + "syn 2.0.96", "wasmtime-component-util", "wasmtime-wit-bindgen", "wit-parser", @@ -3324,7 +3324,7 @@ checksum = "d7de0a56fb0a69b185968f2d7a9ba54750920a806470dff7ad8de91ac06d277e" dependencies = [ "proc-macro2", "quote", - "syn 2.0.94", + "syn 2.0.96", ] [[package]] @@ -3358,22 +3358,22 @@ dependencies = [ [[package]] name = "wast" -version = "222.0.0" +version = "223.0.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "5ce7191f4b7da0dd300cc32476abae6457154e4625d9b1bc26890828a9a26f6e" +checksum = "d59b2ba8a2ff9f06194b7be9524f92e45e70149f4dacc0d0c7ad92b59ac875e4" dependencies = [ "bumpalo", "leb128", "memchr", "unicode-width 0.2.0", - "wasm-encoder 0.222.0", + "wasm-encoder 0.223.0", ] [[package]] name = "wat" -version = "1.222.0" +version = "1.223.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "8fde61b4b52f9a84ae31b5e8902a2cd3162ea45d8bf564c729c3288fe52f4334" +checksum = "662786915c427e4918ff01eabb3c4756d4d947cd8f635761526b4cc9da2eaaad" dependencies = [ "wast", ] @@ -3598,9 +3598,9 @@ dependencies = [ [[package]] name = "winnow" -version = "0.6.21" +version = "0.6.22" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e6f5bb5257f2407a5425c6e749bfd9692192a73e70a6060516ac04f889087d68" +checksum = "39281189af81c07ec09db316b302a3e67bf9bd7cbf6c820b50e35fee9c2fa980" dependencies = [ "memchr", ] @@ -3655,7 +3655,7 @@ checksum = "2380878cad4ac9aac1e2435f3eb4020e8374b5f13c296cb75b4620ff8e229154" dependencies = [ "proc-macro2", "quote", - "syn 2.0.94", + "syn 2.0.96", "synstructure", ] @@ -3677,7 +3677,7 @@ checksum = "fa4f8080344d4671fb4e831a13ad1e68092748387dfc4f55e356242fae12ce3e" dependencies = [ "proc-macro2", "quote", - "syn 2.0.94", + "syn 2.0.96", ] [[package]] @@ -3697,7 +3697,7 @@ checksum = "595eed982f7d355beb85837f651fa22e90b3c044842dc7f2c2842c086f295808" dependencies = [ "proc-macro2", "quote", - "syn 2.0.94", + "syn 2.0.96", "synstructure", ] @@ -3726,7 +3726,7 @@ checksum = "6eafa6dfb17584ea3e2bd6e76e0cc15ad7af12b09abdd1ca55961bed9b1063c6" dependencies = [ "proc-macro2", "quote", - "syn 2.0.94", + "syn 2.0.96", ] [[package]] diff --git a/v0.5/fastn-section/src/parser/kind.rs b/v0.5/fastn-section/src/parser/kind.rs index 5e2681a21f..c19f807ff6 100644 --- a/v0.5/fastn-section/src/parser/kind.rs +++ b/v0.5/fastn-section/src/parser/kind.rs @@ -1,10 +1,7 @@ pub fn kind( scanner: &mut fastn_section::Scanner, ) -> Option { - let qi = match fastn_section::parser::identifier_reference(scanner) { - Some(qi) => qi, - None => return None, - }; + let qi = fastn_section::parser::identifier_reference(scanner)?; // By scoping `index` here, it becomes eligible for garbage collection as soon // as it’s no longer necessary, reducing memory usage. diff --git a/v0.5/fastn-unresolved/src/parser/import.rs b/v0.5/fastn-unresolved/src/parser/import.rs index 3faeca0055..6f99a54838 100644 --- a/v0.5/fastn-unresolved/src/parser/import.rs +++ b/v0.5/fastn-unresolved/src/parser/import.rs @@ -176,10 +176,7 @@ fn parse_field( section: &fastn_section::Section, _document: &mut fastn_unresolved::Document, ) -> Option { - let header = match section.header_as_plain_span(field) { - Some(v) => v, - None => return None, - }; + let header = section.header_as_plain_span(field)?; Some(Export::Things( header diff --git a/v0.5/fastn-unresolved/src/resolver/symbol.rs b/v0.5/fastn-unresolved/src/resolver/symbol.rs index b6efa181e7..b75780be46 100644 --- a/v0.5/fastn-unresolved/src/resolver/symbol.rs +++ b/v0.5/fastn-unresolved/src/resolver/symbol.rs @@ -24,8 +24,8 @@ pub fn symbol( // e.g., inside a function we can have block containing blocks, and each block may have defined // some variables, each such nested block is passed as locals, // with the innermost block as the last entry. - _locals: &[Vec>], - _main_package: &fastn_package::MainPackage, + locals: &[Vec>], + main_package: &fastn_package::MainPackage, ) -> bool { let inner_name = if let fastn_unresolved::UR::UnResolved(name) = name { name @@ -186,7 +186,7 @@ mod tests { &main_package, ); - assert_eq!(resolved, true); + assert!(resolved); let output_str = name.resolved().unwrap().str(&arena); @@ -209,23 +209,23 @@ mod tests { fn basic() { t!("ftd.text", "ftd#text"); // Resolve builtin t!("ftd#text", "ftd#text"); // Resolve absolute symbol usage - // t!("foo", "-- integer foo: 10", "main.foo"); - // t!("ftd.txt", "-- integer foo: 10", "main.foo"); - // t!("ftd#txt", "-- integer foo: 10", "main.foo"); - // t!("bar", "-- import: current-package/foo", {"current-package/foo": "-- integer bar: 10"}, "foo.bar"); - // t!( - // "foo.bar", - // "-- import: other-package/foo", - // {"other-package/foo": "-- integer bar: 10"}, - // {"current-package": ["other-package"]}, - // "foo.bar" - // ); - // t!( - // "foo.bar", - // "-- import: other-package/foo", - // {"other-package/foo": "-- public integer bar: 10"}, - // {"current-package": ["other-package"]}, - // "foo.bar" - // ); + // t!("foo", "-- integer foo: 10", "main.foo"); + // t!("ftd.txt", "-- integer foo: 10", "main.foo"); + // t!("ftd#txt", "-- integer foo: 10", "main.foo"); + // t!("bar", "-- import: current-package/foo", {"current-package/foo": "-- integer bar: 10"}, "foo.bar"); + // t!( + // "foo.bar", + // "-- import: other-package/foo", + // {"other-package/foo": "-- integer bar: 10"}, + // {"current-package": ["other-package"]}, + // "foo.bar" + // ); + // t!( + // "foo.bar", + // "-- import: other-package/foo", + // {"other-package/foo": "-- public integer bar: 10"}, + // {"current-package": ["other-package"]}, + // "foo.bar" + // ); } } diff --git a/v0.5/fastn/src/commands/render.rs b/v0.5/fastn/src/commands/render.rs index 5ca7e539ec..859783b589 100644 --- a/v0.5/fastn/src/commands/render.rs +++ b/v0.5/fastn/src/commands/render.rs @@ -21,8 +21,8 @@ impl fastn::commands::Render { #[tracing::instrument] pub async fn render_document( path: &str, - _data: serde_json::Map, - _strict: bool, + data: serde_json::Map, + strict: bool, ) -> String { let source = std::fs::File::open(path) .and_then(std::io::read_to_string)