diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index 5c3168d1..6361bf1f 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -62,7 +62,8 @@ jobs: ~/.cargo/registry ~/.cargo/git target - key: ${{ runner.os }}-cargo-${{ hashFiles('**/Cargo.toml') }}-${{ hashFiles('**/Cargo.lock') }} + ~/.cache/pre-commit + key: ${{ runner.os }}-cargo-${{ hashFiles('**/Cargo.toml') }}-${{ hashFiles('**/Cargo.lock') }}-${{ hashFiles('**/.pre-commit-config.yaml') }} - name: Install libgtk run: | sudo apt-get update diff --git a/CHANGELOG.md b/CHANGELOG.md index 4b7d6ee2..42235563 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -2,6 +2,13 @@ ## [Unreleased] +## 2024-11-15 - [0.1.26] + +### Enhancements + +- Let rustc infer literal expressions booleans in `leptos_fluent!` macro + parameters, which optimizes compilation times. + ## 2024-10-26 - [0.1.25] ### Bug fixes @@ -539,7 +546,8 @@ version to `0.1` during installation. - Added all ISO-639-1 and ISO-639-2 languages. -[Unreleased]: https://github.com/mondeja/leptos-fluent/compare/v0.1.25...master +[Unreleased]: https://github.com/mondeja/leptos-fluent/compare/v0.1.26...master +[0.1.26]: https://github.com/mondeja/leptos-fluent/compare/v0.1.25...v0.1.26 [0.1.25]: https://github.com/mondeja/leptos-fluent/compare/v0.1.24...v0.1.25 [0.1.24]: https://github.com/mondeja/leptos-fluent/compare/v0.1.23...v0.1.24 [0.1.23]: https://github.com/mondeja/leptos-fluent/compare/v0.1.22...v0.1.23 diff --git a/Cargo.lock b/Cargo.lock index 0df96f34..262e119b 100644 --- a/Cargo.lock +++ b/Cargo.lock @@ -88,7 +88,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "e01ed3140b2f8d422c68afa1ed2e85d996ea619c988ac834d255db32138655cb" dependencies = [ "quote", - "syn 2.0.76", + "syn 2.0.87", ] [[package]] @@ -205,24 +205,18 @@ dependencies = [ "actix-router", "proc-macro2", "quote", - "syn 2.0.76", + "syn 2.0.87", ] [[package]] name = "addr2line" -version = "0.22.0" +version = "0.24.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "6e4503c46a5c0c7844e948c9a4d6acd9f50cccb4de1c48eb9e291ea17470c678" +checksum = "dfbe277e56a376000877090da837660b4427aad530e3028d44e0bffe4f89a1c1" dependencies = [ "gimli", ] -[[package]] -name = "adler" -version = "1.0.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f26201604c87b1e01bd3d98f8d5d9a8fcbb815e8cedb41ffccbeb4bf593a35fe" - [[package]] name = "adler2" version = "2.0.0" @@ -268,15 +262,15 @@ dependencies = [ [[package]] name = "allocator-api2" -version = "0.2.18" +version = "0.2.20" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "5c6cb57a04249c6480766f7f7cef5467412af1490f8d1e243141daddada3264f" +checksum = "45862d1c77f2228b9e10bc609d5bc203d86ebc9b87ad8d5d5167a6c9abf739d9" [[package]] name = "anyhow" -version = "1.0.86" +version = "1.0.93" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b3d1d046238990b9cf5bcde22a3fb3584ee5cf65fb2765f454ed428c7a0063da" +checksum = "4c95c10ba0b00a02636238b814946408b1322d5ac4760326e6fb8ec956d85775" [[package]] name = "async-recursion" @@ -286,18 +280,18 @@ checksum = "3b43422f69d8ff38f95f1b2bb76517c91589a924d1559a0e935d7c8ce0274c11" dependencies = [ "proc-macro2", "quote", - "syn 2.0.76", + "syn 2.0.87", ] [[package]] name = "async-trait" -version = "0.1.81" +version = "0.1.83" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "6e0c28dcc82d7c8ead5cb13beb15405b57b8546e93215673ff8ca0349a028107" +checksum = "721cae7de5c34fbb2acd27e21e6d2cf7b886dce0c27388d46c4e6c47ea4318dd" dependencies = [ "proc-macro2", "quote", - "syn 2.0.76", + "syn 2.0.87", ] [[package]] @@ -311,7 +305,7 @@ dependencies = [ "manyhow", "proc-macro2", "quote", - "syn 2.0.76", + "syn 2.0.87", ] [[package]] @@ -327,20 +321,20 @@ dependencies = [ "proc-macro2", "quote", "quote-use", - "syn 2.0.76", + "syn 2.0.87", ] [[package]] name = "autocfg" -version = "1.3.0" +version = "1.4.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "0c4b4d0bd25bd0b74681c0ad21497610ce1b7c91b1022cd21c80c6fbdd9476b0" +checksum = "ace50bade8e6234aa140d9a2f552bbee1db4d353f69b8217bc503490fc1a9f26" [[package]] name = "axum" -version = "0.7.5" +version = "0.7.7" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "3a6c9af12842a67734c9a2e355436e5d03b22383ed60cf13cd0c18fbfe3dcbcf" +checksum = "504e3947307ac8326a5437504c517c4b56716c9d98fac0028c2acc7ca47d70ae" dependencies = [ "async-trait", "axum-core", @@ -365,7 +359,7 @@ dependencies = [ "serde_urlencoded", "sync_wrapper 1.0.1", "tokio", - "tower", + "tower 0.5.1", "tower-layer", "tower-service", "tracing", @@ -373,9 +367,9 @@ dependencies = [ [[package]] name = "axum-core" -version = "0.4.3" +version = "0.4.5" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a15c63fd72d41492dc4f497196f5da1fb04fb7529e631d73630d1b491e47a2e3" +checksum = "09f2bd6146b97ae3359fa0cc6d6b376d9539582c7b4220f041a33ec24c226199" dependencies = [ "async-trait", "bytes", @@ -386,7 +380,7 @@ dependencies = [ "mime", "pin-project-lite", "rustversion", - "sync_wrapper 0.1.2", + "sync_wrapper 1.0.1", "tower-layer", "tower-service", "tracing", @@ -394,17 +388,17 @@ dependencies = [ [[package]] name = "backtrace" -version = "0.3.73" +version = "0.3.74" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "5cc23269a4f8976d0a4d2e7109211a419fe30e8d88d677cd60b6bc79c5732e0a" +checksum = "8d82cb332cdfaed17ae235a638438ac4d4839913cc2af585c3c6746e8f8bee1a" dependencies = [ "addr2line", - "cc", "cfg-if", "libc", - "miniz_oxide 0.7.4", + "miniz_oxide", "object", "rustc-demangle", + "windows-targets 0.52.6", ] [[package]] @@ -457,9 +451,9 @@ dependencies = [ [[package]] name = "bstr" -version = "1.10.0" +version = "1.11.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "40723b8fb387abc38f4f4a37c09073622e41dd12327033091ef8950659e6dc0c" +checksum = "1a68f1f47cdf0ec8ee4b941b2eee2a80cb796db73118c0dd09ac63fbe405be22" dependencies = [ "memchr", "serde", @@ -479,9 +473,9 @@ checksum = "1fd0f2584146f6f2ef48085050886acf353beff7305ebd1ae69500e27c67f64b" [[package]] name = "bytes" -version = "1.7.1" +version = "1.8.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "8318a53db07bb3f8dca91a600466bdb3f2eaadeedfdbcf02e1accbad9271ba50" +checksum = "9ac0150caa2ae65ca5bd83f25c7de183dea78d4d366469f148435e2acfbad0da" [[package]] name = "bytestring" @@ -526,9 +520,9 @@ checksum = "ade8366b8bd5ba243f0a58f036cc0ca8a2f069cff1a2351ef1cac6b083e16fc0" [[package]] name = "cairo-rs" -version = "0.20.1" +version = "0.20.5" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e8a0ea147c94108c9613235388f540e4d14c327f7081c9e471fc8ee8a2533e69" +checksum = "d7fa699e1d7ae691001a811dda5ef0e3e42e1d4119b26426352989df9e94e3e6" dependencies = [ "bitflags", "cairo-sys-rs", @@ -555,9 +549,9 @@ checksum = "8b96ec4966b5813e2c0507c1f86115c8c5abaadc3980879c3424042a02fd1ad3" [[package]] name = "cc" -version = "1.1.15" +version = "1.2.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "57b6a275aa2903740dc87da01c62040406b8812552e97129a63ea8850a17c6e6" +checksum = "fd9de9f2205d5ef3fd67e685b0df337994ddd4495e2a28d185500d0e1edfea47" dependencies = [ "jobserver", "libc", @@ -575,9 +569,9 @@ dependencies = [ [[package]] name = "cfg-expr" -version = "0.16.0" +version = "0.17.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "345c78335be0624ed29012dc10c49102196c6882c12dde65d9f35b02da2aada8" +checksum = "d0890061c4d3223e7267f3bad2ec40b997d64faac1c2815a4a9d95018e2b9e9c" dependencies = [ "smallvec", "target-lexicon", @@ -624,12 +618,11 @@ checksum = "186dce98367766de751c42c4f03970fc60fc012296e706ccbb9d5df9b6c1e271" [[package]] name = "config" -version = "0.14.0" +version = "0.14.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "7328b20597b53c2454f0b1919720c25c7339051c02b72b7e05409e00b14132be" +checksum = "68578f196d2a33ff61b27fae256c3164f65e36382648e30666dde05b8cc9dfdf" dependencies = [ "convert_case 0.6.0", - "lazy_static", "nom", "pathdiff", "serde", @@ -648,18 +641,18 @@ dependencies = [ [[package]] name = "const_format" -version = "0.2.32" +version = "0.2.33" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e3a214c7af3d04997541b18d432afaff4c455e79e2029079647e72fc2bd27673" +checksum = "50c655d81ff1114fb0dcdea9225ea9f0cc712a6f8d189378e82bdf62a473a64b" dependencies = [ "const_format_proc_macros", ] [[package]] name = "const_format_proc_macros" -version = "0.2.32" +version = "0.2.33" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c7f6ff08fd20f4f299298a28e2dfa8a8ba1036e6cd2460ac1de7b425d76f2500" +checksum = "eff1a44b93f47b1bac19a27932f5c591e43d1ba357ee4f61526c8a25603f0eb1" dependencies = [ "proc-macro2", "quote", @@ -694,9 +687,9 @@ dependencies = [ [[package]] name = "cpufeatures" -version = "0.2.13" +version = "0.2.15" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "51e852e6dc9a5bed1fae92dd2375037bf2b768725bf3be87811edee3249d09ad" +checksum = "0ca741a962e1b0bff6d724a1a0958b686406e853bb14061f218562e1896f95e6" dependencies = [ "libc", ] @@ -843,7 +836,7 @@ checksum = "62d671cc41a825ebabc75757b62d3d168c577f9149b2d49ece1dad1f72119d25" dependencies = [ "proc-macro2", "quote", - "syn 2.0.76", + "syn 2.0.87", ] [[package]] @@ -856,7 +849,7 @@ dependencies = [ "proc-macro2", "quote", "rustc_version", - "syn 2.0.76", + "syn 2.0.87", ] [[package]] @@ -898,7 +891,7 @@ checksum = "97369cbbc041bc366949bc74d34658d6cda5621039731c6310521892a3a20ae0" dependencies = [ "proc-macro2", "quote", - "syn 2.0.76", + "syn 2.0.87", ] [[package]] @@ -915,9 +908,9 @@ checksum = "60b1af1c220855b6ceac025d3f6ecdd2b7c4894bfe9cd9bda4fbb4bc7c0d4cf0" [[package]] name = "encoding_rs" -version = "0.8.34" +version = "0.8.35" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b45de904aa0b010bce2ab45264d0631681847fa7b6f2eaa7dab7619943bc4f59" +checksum = "75030f3c4f45dafd7586dd6780965a8c7e8e285a5ecb86713e63a79c5b2766f3" dependencies = [ "cfg-if", ] @@ -940,12 +933,12 @@ dependencies = [ [[package]] name = "flate2" -version = "1.0.33" +version = "1.0.35" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "324a1be68054ef05ad64b861cc9eaf1d623d2d8cb25b4bf2cb9cdd902b4bf253" +checksum = "c936bfdafb507ebbf50b8074c54fa31c5be9a1e7e5f467dd659697041407d07c" dependencies = [ "crc32fast", - "miniz_oxide 0.8.0", + "miniz_oxide", ] [[package]] @@ -984,23 +977,23 @@ dependencies = [ [[package]] name = "fluent-template-macros" -version = "0.10.1" +version = "0.11.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b86ebacac709a063f57ee83d37c451d60dc873554f9bd828531fd1ec43209c80" +checksum = "007d176e568a4f73ad4225df02aa29ccfecffd8eda31ce78da0bc8b4b310f20a" dependencies = [ "once_cell", "proc-macro2", "quote", - "syn 2.0.76", + "syn 2.0.87", "unic-langid", "walkdir", ] [[package]] name = "fluent-templates" -version = "0.10.1" +version = "0.11.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f339cc149c01ba2f7b0feba2acde6dd6e4a48472daffe2ddfdd6073e564c60b3" +checksum = "74f22f61b2c8551163ea13c16a381484e5360b089401c6e47c4bfcf6b62bb7ac" dependencies = [ "fluent-bundle", "fluent-langneg", @@ -1031,9 +1024,9 @@ dependencies = [ [[package]] name = "futures" -version = "0.3.30" +version = "0.3.31" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "645c6916888f6cb6350d2550b80fb63e734897a8498abe35cfb732b6487804b0" +checksum = "65bc07b1a8bc7c85c5f2e110c476c7389b4554ba72af57d8445ea63a576b0876" dependencies = [ "futures-channel", "futures-core", @@ -1046,9 +1039,9 @@ dependencies = [ [[package]] name = "futures-channel" -version = "0.3.30" +version = "0.3.31" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "eac8f7d7865dcb88bd4373ab671c8cf4508703796caa2b1985a9ca867b3fcb78" +checksum = "2dff15bf788c671c1934e366d07e30c1814a8ef514e1af724a602e8a2fbe1b10" dependencies = [ "futures-core", "futures-sink", @@ -1056,15 +1049,15 @@ dependencies = [ [[package]] name = "futures-core" -version = "0.3.30" +version = "0.3.31" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "dfc6580bb841c5a68e9ef15c77ccc837b40a7504914d52e47b8b0e9bbda25a1d" +checksum = "05f29059c0c2090612e8d742178b0580d2dc940c837851ad723096f87af6663e" [[package]] name = "futures-executor" -version = "0.3.30" +version = "0.3.31" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a576fc72ae164fca6b9db127eaa9a9dda0d61316034f33a0a0d4eda41f02b01d" +checksum = "1e28d1d997f585e54aebc3f97d39e72338912123a67330d723fdbb564d646c9f" dependencies = [ "futures-core", "futures-task", @@ -1073,38 +1066,38 @@ dependencies = [ [[package]] name = "futures-io" -version = "0.3.30" +version = "0.3.31" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a44623e20b9681a318efdd71c299b6b222ed6f231972bfe2f224ebad6311f0c1" +checksum = "9e5c1b78ca4aae1ac06c48a526a655760685149f0d465d21f37abfe57ce075c6" [[package]] name = "futures-macro" -version = "0.3.30" +version = "0.3.31" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "87750cf4b7a4c0625b1529e4c543c2182106e4dedc60a2a6455e00d212c489ac" +checksum = "162ee34ebcb7c64a8abebc059ce0fee27c2262618d7b60ed8faf72fef13c3650" dependencies = [ "proc-macro2", "quote", - "syn 2.0.76", + "syn 2.0.87", ] [[package]] name = "futures-sink" -version = "0.3.30" +version = "0.3.31" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "9fb8e00e87438d937621c1c6269e53f536c14d3fbd6a042bb24879e57d474fb5" +checksum = "e575fab7d1e0dcb8d0c7bcf9a63ee213816ab51902e6d244a95819acacf1d4f7" [[package]] name = "futures-task" -version = "0.3.30" +version = "0.3.31" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "38d84fa142264698cdce1a9f9172cf383a0c82de1bddcf3092901442c4097004" +checksum = "f90f7dce0722e95104fcb095585910c0977252f286e354b5e3bd38902cd99988" [[package]] name = "futures-util" -version = "0.3.30" +version = "0.3.31" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "3d6401deb83407ab3da39eba7e33987a73c3df0c82b4bb5813ee871c19c41d48" +checksum = "9fa08315bb612088cc391249efdc3bc77536f16c91f6cf495e6fbe85b20a4a81" dependencies = [ "futures-channel", "futures-core", @@ -1120,9 +1113,9 @@ dependencies = [ [[package]] name = "gdk-pixbuf" -version = "0.20.1" +version = "0.20.4" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "8730751991b97419fc3f0c2dca2c9e45b48edf46e48e0f965964ecf33889812f" +checksum = "c4c29071a9e92337d8270a85cb0510cda4ac478be26d09ad027cc1d081911b19" dependencies = [ "gdk-pixbuf-sys", "gio", @@ -1132,9 +1125,9 @@ dependencies = [ [[package]] name = "gdk-pixbuf-sys" -version = "0.20.1" +version = "0.20.4" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "1ffbf649fd5b1c8c0f0feeb015b7533c3ef92da2887fb95ddd338bc2b1644a7c" +checksum = "687343b059b91df5f3fbd87b4307038fa9e647fcc0461d0d3f93e94fee20bf3d" dependencies = [ "gio-sys", "glib-sys", @@ -1145,9 +1138,9 @@ dependencies = [ [[package]] name = "gdk4" -version = "0.9.0" +version = "0.9.4" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "4b7d7237c1487ed4b300aac7744efcbf1319e12d60d7afcd6f505414bd5b5dea" +checksum = "75933c4a86e8a2428814d367e22c733304fdfabc87f415750fd2f55409b6ee48" dependencies = [ "cairo-rs", "gdk-pixbuf", @@ -1160,9 +1153,9 @@ dependencies = [ [[package]] name = "gdk4-sys" -version = "0.9.0" +version = "0.9.4" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a67576c8ec012156d7f680e201a807b4432a77babb3157e0555e990ab6bcd878" +checksum = "20af0656d543aed3e57ac4120ef76d091c3c42ab1e0507a8febde7cd005640e2" dependencies = [ "cairo-sys-rs", "gdk-pixbuf-sys", @@ -1200,15 +1193,15 @@ dependencies = [ [[package]] name = "gimli" -version = "0.29.0" +version = "0.31.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "40ecd4077b5ae9fd2e9e169b102c6c330d0605168eb0e8bf79952b256dbefffd" +checksum = "07e28edb80900c19c28f1072f2e8aeca7fa06b23cd4169cefe1af5aa3260783f" [[package]] name = "gio" -version = "0.20.1" +version = "0.20.6" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "dcacaa37401cad0a95aadd266bc39c72a131d454fc012f6dfd217f891d76cc52" +checksum = "8826d2a9ad56ce3de1f04bea0bea0daff6f5f1c913cc834996cfea1f9401361c" dependencies = [ "futures-channel", "futures-core", @@ -1223,9 +1216,9 @@ dependencies = [ [[package]] name = "gio-sys" -version = "0.20.1" +version = "0.20.6" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "5237611e97e9b86ab5768adc3eef853ae713ea797aa3835404acdfacffc9fb38" +checksum = "b965df6f3534c84816b5c1a7d9efcb5671ae790822de5abe8e299797039529bc" dependencies = [ "glib-sys", "gobject-sys", @@ -1236,9 +1229,9 @@ dependencies = [ [[package]] name = "glib" -version = "0.20.1" +version = "0.20.6" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b19429cb83fcbf1f00b31ae3a123fab5cd3761bdd15b0cc07905804742f0d0e4" +checksum = "86bd3e4ee7998ab5a135d900db56930cc19ad16681adf245daff54f618b9d5e1" dependencies = [ "bitflags", "futures-channel", @@ -1257,22 +1250,22 @@ dependencies = [ [[package]] name = "glib-macros" -version = "0.20.1" +version = "0.20.5" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "960349f56469b75794157e93bf04f0bc8a622d0a6612d6a8f8d7eac41e0e1ee1" +checksum = "e7d21ca27acfc3e91da70456edde144b4ac7c36f78ee77b10189b3eb4901c156" dependencies = [ "heck", "proc-macro-crate", "proc-macro2", "quote", - "syn 2.0.76", + "syn 2.0.87", ] [[package]] name = "glib-sys" -version = "0.20.1" +version = "0.20.6" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "44edae63bea922f18f7e63977ee60a257ec27c4613aff1a6a9bb572ad0d88269" +checksum = "3d0b1827e8621fc42c0dfb228e5d57ff6a71f9699e666ece8113f979ad87c2de" dependencies = [ "libc", "system-deps", @@ -1286,15 +1279,15 @@ checksum = "d2fabcfbdc87f4758337ca535fb41a6d701b65693ce38287d856d1674551ec9b" [[package]] name = "globset" -version = "0.4.14" +version = "0.4.15" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "57da3b9b5b85bd66f31093f8c408b90a74431672542466497dcbdfdc02034be1" +checksum = "15f1ce686646e7f1e19bf7d5533fe443a45dbfb990e00629110797578b42fb19" dependencies = [ "aho-corasick", "bstr", "log", - "regex-automata 0.4.7", - "regex-syntax 0.8.4", + "regex-automata 0.4.9", + "regex-syntax 0.8.5", ] [[package]] @@ -1344,9 +1337,9 @@ dependencies = [ [[package]] name = "gobject-sys" -version = "0.20.1" +version = "0.20.4" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "fa3d1dcd8a1eb2e7c22be3d5e792b14b186f3524f79b25631730f9a8c169d49a" +checksum = "a4c674d2ff8478cf0ec29d2be730ed779fef54415a2fb4b565c52def62696462" dependencies = [ "glib-sys", "libc", @@ -1355,9 +1348,9 @@ dependencies = [ [[package]] name = "graphene-rs" -version = "0.20.1" +version = "0.20.4" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "80aac87f74e81c0e13433e892a047237abdc37945c86887f5eed905038356e69" +checksum = "1f53144c7fe78292705ff23935f1477d511366fb2f73c43d63b37be89076d2fe" dependencies = [ "glib", "graphene-sys", @@ -1366,9 +1359,9 @@ dependencies = [ [[package]] name = "graphene-sys" -version = "0.20.1" +version = "0.20.4" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "cc2f91ecd32989efad60326cc20a8fb252bd2852239a08e4e70cde8c100de9ca" +checksum = "e741797dc5081e59877a4d72c442c72d61efdd99161a0b1c1b29b6b988934b99" dependencies = [ "glib-sys", "libc", @@ -1378,9 +1371,9 @@ dependencies = [ [[package]] name = "gsk4" -version = "0.9.0" +version = "0.9.4" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "1f3cf2091e1af185b347b3450817d93dea6fe435df7abd4c2cd7fb5bcb4cfda8" +checksum = "b36933c1e79df378aa6e606576e680358a9582ed8c16f33e94899636e6fa6df6" dependencies = [ "cairo-rs", "gdk4", @@ -1393,9 +1386,9 @@ dependencies = [ [[package]] name = "gsk4-sys" -version = "0.9.0" +version = "0.9.4" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "6aa69614a26d8760c186c3690f1b0fbb917572ca23ef83137445770ceddf8cde" +checksum = "0877a9d485bd9ba5262b0c9bce39e63750e525e3aebeb359d271ca1f0e111f1d" dependencies = [ "cairo-sys-rs", "gdk4-sys", @@ -1409,9 +1402,9 @@ dependencies = [ [[package]] name = "gtk4" -version = "0.9.0" +version = "0.9.4" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "eaffc6c743c9160514cc9b67eace364e5dc5798369fa809cdb04e035c21c5c5d" +checksum = "9376d14d7e33486c54823a42bef296e882b9f25cb4c52b52f4d1d57bbadb5b6d" dependencies = [ "cairo-rs", "field-offset", @@ -1430,21 +1423,21 @@ dependencies = [ [[package]] name = "gtk4-macros" -version = "0.9.0" +version = "0.9.3" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "188211f546ce5801f6d0245c37b6249143a2cb4fa040e54829ca1e76796e9f09" +checksum = "a7c518d5dd41c57385c7cd30af52e261820c897fc1144e558bb88c303d048ae2" dependencies = [ "proc-macro-crate", "proc-macro2", "quote", - "syn 2.0.76", + "syn 2.0.87", ] [[package]] name = "gtk4-sys" -version = "0.9.0" +version = "0.9.4" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "1114a207af8ada02cf4658a76692f4190f06f093380d5be07e3ca8b43aa7c666" +checksum = "e653b0a9001ba9be1ffddb9373bfe9a111f688222f5aeee2841481300d91b55a" dependencies = [ "cairo-sys-rs", "gdk-pixbuf-sys", @@ -1504,6 +1497,12 @@ dependencies = [ "allocator-api2", ] +[[package]] +name = "hashbrown" +version = "0.15.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "3a9bfc1af68b1726ea47d3d5109de126281def866b33970e10fbab11b5dafab3" + [[package]] name = "heck" version = "0.5.0" @@ -1584,9 +1583,9 @@ checksum = "08a397c49fec283e3d6211adbe480be95aae5f304cfb923e9970e08956d5168a" [[package]] name = "httparse" -version = "1.9.4" +version = "1.9.5" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "0fcc0b4a115bf80b728eb8ea024ad5bd707b615bfed49e0665b6e0f86fd082d9" +checksum = "7d71d3574edd2771538b901e6549113b4006ece66150fb69c0fb6d9a2adae946" [[package]] name = "httpdate" @@ -1596,9 +1595,9 @@ checksum = "df3b46402a9d5adb4c86a0cf463f42e19994e3ee891101b1841f30a545cb49a9" [[package]] name = "hyper" -version = "1.4.1" +version = "1.5.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "50dfd22e0e76d0f662d429a5f80fcaf3855009297eab6a0a9f8543834744ba05" +checksum = "bbbff0a806a4728c99295b254c8838933b5b082d75e3cb70c8dab21fdfbcfa9a" dependencies = [ "bytes", "futures-channel", @@ -1615,9 +1614,9 @@ dependencies = [ [[package]] name = "hyper-util" -version = "0.1.7" +version = "0.1.10" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "cde7055719c54e36e95e8719f95883f22072a48ede39db7fc17a4e1d5281e9b9" +checksum = "df2dcfbe0677734ab2f3ffa7fa7bfd4706bfdc1ef393f2ee30184aed67e631b4" dependencies = [ "bytes", "futures-util", @@ -1626,6 +1625,125 @@ dependencies = [ "hyper", "pin-project-lite", "tokio", + "tower-service", +] + +[[package]] +name = "icu_collections" +version = "1.5.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "db2fa452206ebee18c4b5c2274dbf1de17008e874b4dc4f0aea9d01ca79e4526" +dependencies = [ + "displaydoc", + "yoke", + "zerofrom", + "zerovec", +] + +[[package]] +name = "icu_locid" +version = "1.5.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "13acbb8371917fc971be86fc8057c41a64b521c184808a698c02acc242dbf637" +dependencies = [ + "displaydoc", + "litemap", + "tinystr", + "writeable", + "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.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "fdc8ff3388f852bede6b579ad4e978ab004f139284d7b28715f773507b946f6e" + +[[package]] +name = "icu_normalizer" +version = "1.5.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "19ce3e0da2ec68599d193c93d088142efd7f9c5d6fc9b803774855747dc6a84f" +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.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "f8cafbf7aa791e9b22bec55a167906f9e1215fd475cd22adfcf660e03e989516" + +[[package]] +name = "icu_properties" +version = "1.5.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "93d6020766cfc6302c15dbbc9c8778c37e62c14427cb7f6e601d849e092aeef5" +dependencies = [ + "displaydoc", + "icu_collections", + "icu_locid_transform", + "icu_properties_data", + "icu_provider", + "tinystr", + "zerovec", +] + +[[package]] +name = "icu_properties_data" +version = "1.5.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "67a8effbc3dd3e4ba1afa8ad918d5684b8868b3b26500753effea8d2eed19569" + +[[package]] +name = "icu_provider" +version = "1.5.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "6ed421c8a8ef78d3e2dbc98a973be2f3770cb42b606e3ab18d6237c4dfde68d9" +dependencies = [ + "displaydoc", + "icu_locid", + "icu_provider_macros", + "stable_deref_trait", + "tinystr", + "writeable", + "yoke", + "zerofrom", + "zerovec", +] + +[[package]] +name = "icu_provider_macros" +version = "1.5.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "1ec89e9337638ecdc08744df490b221a7399bf8d164eb52a665454e60e075ad6" +dependencies = [ + "proc-macro2", + "quote", + "syn 2.0.87", ] [[package]] @@ -1636,25 +1754,36 @@ checksum = "b9e0384b61958566e926dc50660321d12159025e767c18e043daf26b70104c39" [[package]] name = "idna" -version = "0.5.0" +version = "1.0.3" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "686f825264d630750a544639377bae737628043f20d38bbc029e8f29ea968a7e" +dependencies = [ + "idna_adapter", + "smallvec", + "utf8_iter", +] + +[[package]] +name = "idna_adapter" +version = "1.2.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "634d9b1461af396cad843f47fdba5597a4f9e6ddd4bfb6ff5d85028c25cb12f6" +checksum = "daca1df1c957320b2cf139ac61e7bd64fed304c5040df000a745aa1de3b4ef71" dependencies = [ - "unicode-bidi", - "unicode-normalization", + "icu_normalizer", + "icu_properties", ] [[package]] name = "ignore" -version = "0.4.22" +version = "0.4.23" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b46810df39e66e925525d6e38ce1e7f6e1d208f72dc39757880fcb66e2c58af1" +checksum = "6d89fd380afde86567dfba715db065673989d6253f42b88179abd3eae47bda4b" dependencies = [ "crossbeam-deque", "globset", "log", "memchr", - "regex-automata 0.4.7", + "regex-automata 0.4.9", "same-file", "walkdir", "winapi-util", @@ -1662,18 +1791,18 @@ dependencies = [ [[package]] name = "impl-more" -version = "0.1.6" +version = "0.1.8" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "206ca75c9c03ba3d4ace2460e57b189f39f43de612c2f85836e65c929701bb2d" +checksum = "aae21c3177a27788957044151cc2800043d127acaa460a47ebb9b84dfa2c6aa0" [[package]] name = "indexmap" -version = "2.4.0" +version = "2.6.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "93ead53efc7ea8ed3cfb0c79fc8023fbb782a5432b52830b6518941cebe6505c" +checksum = "707907fe3c25f5424cce2cb7e1cbcafee6bdbe735ca90ef77c29e84591e5b9da" dependencies = [ "equivalent", - "hashbrown 0.14.5", + "hashbrown 0.15.1", ] [[package]] @@ -1742,9 +1871,9 @@ dependencies = [ [[package]] name = "js-sys" -version = "0.3.70" +version = "0.3.72" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "1868808506b929d7b0cfa8f75951347aa71bb21144b7791bae35d9bccfcfe37a" +checksum = "6a88f1bda2bd75b0452a14784937d796722fdebfe50df998aeb3f0b7603019a9" dependencies = [ "wasm-bindgen", ] @@ -1774,9 +1903,9 @@ checksum = "bbd2bcb4c963f2ddae06a2efc7e9f3591312473c50c6685e1f298068316e66fe" [[package]] name = "leptos" -version = "0.6.14" +version = "0.6.15" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a15911b4e53bb6e1b033d717eadb39924418a4a288279128122e5a65c70ba3e6" +checksum = "0cbb3237c274dadf00dcc27db96c52601b40375117178fb24a991cda073624f0" dependencies = [ "cfg-if", "leptos_config", @@ -1796,7 +1925,7 @@ dependencies = [ [[package]] name = "leptos-fluent" -version = "0.1.25" +version = "0.1.26" dependencies = [ "current_locale", "directories", @@ -1859,7 +1988,7 @@ dependencies = [ [[package]] name = "leptos-fluent-macros" -version = "0.1.25" +version = "0.1.26" dependencies = [ "cfg-expr 0.15.8", "current_platform", @@ -1876,7 +2005,7 @@ dependencies = [ "serde", "serde_json", "serde_yaml", - "syn 2.0.76", + "syn 2.0.87", "tracing", "trybuild", "walkdir", @@ -1913,7 +2042,7 @@ dependencies = [ "leptos_router", "thiserror", "tokio", - "tower", + "tower 0.4.13", "tower-http", "wasm-bindgen", ] @@ -1934,16 +2063,16 @@ dependencies = [ "serde", "thiserror", "tokio", - "tower", + "tower 0.4.13", "tower-http", "wasm-bindgen", ] [[package]] name = "leptos_actix" -version = "0.6.14" +version = "0.6.15" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "65d2679168cf748d4c560799981d827f284bdc47b115df03a90e5fddffadbd7e" +checksum = "29155efba54ab8c6c3038ce2608500b4aa5d8be04330e5fa08d0fe7cae85308c" dependencies = [ "actix-http", "actix-web", @@ -1963,9 +2092,9 @@ dependencies = [ [[package]] name = "leptos_axum" -version = "0.6.14" +version = "0.6.15" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ee520a923a9c93f68ca78d6b8884fc69066c6d88ce294eafa0fb9a157873bec0" +checksum = "910681b920c48a43508b2bd0261bdb67c4ef9456a0b3613f956a0d30e832e9de" dependencies = [ "axum", "cfg-if", @@ -1987,9 +2116,9 @@ dependencies = [ [[package]] name = "leptos_config" -version = "0.6.14" +version = "0.6.15" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "dbc4d78fba18c1ccab48ffc9f3d35b39821f896b0a28bdd616a846b6241036c9" +checksum = "62ed778611380ddea47568ac6ad6ec5158d39b5bd59e6c4dcd24efc15dc3dc0d" dependencies = [ "config", "regex", @@ -2000,9 +2129,9 @@ dependencies = [ [[package]] name = "leptos_dom" -version = "0.6.14" +version = "0.6.15" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "1ccb04d4763603bb665fa35cb9642d0bd75313117d10efda9b79243c023e69df" +checksum = "8401c46c86c1f4c16dcb7881ed319fcdca9cda9b9e78a6088955cb423afcf119" dependencies = [ "async-recursion", "cfg-if", @@ -2030,9 +2159,9 @@ dependencies = [ [[package]] name = "leptos_hot_reload" -version = "0.6.14" +version = "0.6.15" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "2cc61e5cce26761562cd3332630b3fbaddb1c4f77744e41474c7212ad279c5d9" +checksum = "6cb53d4794240b684a2f4be224b84bee9e62d2abc498cf2bcd643cd565e01d96" dependencies = [ "anyhow", "camino", @@ -2042,15 +2171,15 @@ dependencies = [ "quote", "rstml", "serde", - "syn 2.0.76", + "syn 2.0.87", "walkdir", ] [[package]] name = "leptos_integration_utils" -version = "0.6.14" +version = "0.6.15" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ac080e02d0230481d80aa6920be2d634a2243f1ebbc2b8c1d57bf1bd46ca8a5b" +checksum = "5a96976631c2225ec116a7bf9c0ed5bf6999a19fed33f5e3cbcf37af44c384dc" dependencies = [ "futures", "leptos", @@ -2062,9 +2191,9 @@ dependencies = [ [[package]] name = "leptos_macro" -version = "0.6.14" +version = "0.6.15" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "90eaea005cabb879c091c84cfec604687ececfd540469e5a30a60c93489a2f23" +checksum = "4b13bc3db70715cd8218c4535a5af3ae3c0e5fea6f018531fc339377b36bc0e0" dependencies = [ "attribute-derive", "cfg-if", @@ -2073,21 +2202,21 @@ dependencies = [ "itertools", "leptos_hot_reload", "prettyplease", - "proc-macro-error", + "proc-macro-error2", "proc-macro2", "quote", "rstml", "server_fn_macro", - "syn 2.0.76", + "syn 2.0.87", "tracing", "uuid", ] [[package]] name = "leptos_meta" -version = "0.6.14" +version = "0.6.15" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "779bc68f8c05b15dde6557f9eb7baef4fa606a5bc450c1d6ff8787b092d0ae93" +checksum = "25acc2f63cf91932013e400a95bf6e35e5d3dbb44a7b7e25a8e3057d12005b3b" dependencies = [ "cfg-if", "indexmap", @@ -2099,9 +2228,9 @@ dependencies = [ [[package]] name = "leptos_reactive" -version = "0.6.14" +version = "0.6.15" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "0ef2f99f377472459b0d320b46e9a9516b0e68dee5ed8c9eeb7e8eb9fefec5d2" +checksum = "e4161acbf80f59219d8d14182371f57302bc7ff81ee41aba8ba1ff7295727f23" dependencies = [ "base64", "cfg-if", @@ -2127,9 +2256,9 @@ dependencies = [ [[package]] name = "leptos_router" -version = "0.6.14" +version = "0.6.15" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e5006e35b7c768905286dbea0d3525396cd39d961cb7b9fb664aa00b0c984ae6" +checksum = "8d71dea7d42c0d29c40842750232d3425ed1cf10e313a1f898076d20871dad32" dependencies = [ "cached", "cfg-if", @@ -2159,9 +2288,9 @@ dependencies = [ [[package]] name = "leptos_server" -version = "0.6.14" +version = "0.6.15" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "9f07be202a433baa8c50050de4f9c116efccffc57208bcda7bd1bb9b8e87dca9" +checksum = "4a97eb90a13f71500b831c7119ddd3bdd0d7ae0a6b0487cade4fddeed3b8c03f" dependencies = [ "inventory", "lazy_static", @@ -2175,9 +2304,9 @@ dependencies = [ [[package]] name = "libc" -version = "0.2.158" +version = "0.2.162" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d8adc4bb1803a324070e64a98ae98f38934d91957a99cfb3a43dcbc01bc56439" +checksum = "18d287de67fe55fd7e1581fe933d965a5a9477b38e949cfa9f8574ef01506398" [[package]] name = "libredox" @@ -2199,6 +2328,12 @@ dependencies = [ "serde_test", ] +[[package]] +name = "litemap" +version = "0.7.3" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "643cb0b8d4fcc284004d5fd0d67ccf61dfffadb7f75e1e71bc420f4688a3a704" + [[package]] name = "local-channel" version = "0.1.5" @@ -2259,7 +2394,7 @@ dependencies = [ "manyhow-macros", "proc-macro2", "quote", - "syn 2.0.76", + "syn 2.0.87", ] [[package]] @@ -2321,9 +2456,9 @@ dependencies = [ [[package]] name = "minicov" -version = "0.3.5" +version = "0.3.7" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "5c71e683cd655513b99affab7d317deb690528255a0d5f717f1024093c12b169" +checksum = "f27fe9f1cc3c22e1687f9446c2083c4c5fc7f0bcf1c7a86bdbded14985895b4b" dependencies = [ "cc", "walkdir", @@ -2335,15 +2470,6 @@ version = "0.2.1" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "68354c5c6bd36d73ff3feceb05efa59b6acb7626617f4962be322a825e61f79a" -[[package]] -name = "miniz_oxide" -version = "0.7.4" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b8a240ddb74feaf34a79a7add65a741f3167852fba007066dcac1ca548d89c08" -dependencies = [ - "adler", -] - [[package]] name = "miniz_oxide" version = "0.8.0" @@ -2440,9 +2566,9 @@ dependencies = [ [[package]] name = "object" -version = "0.36.3" +version = "0.36.5" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "27b64972346851a39438c60b341ebc01bba47464ae329e55cf343eb93964efd9" +checksum = "aedf0a2d09c573ed1d8d85b30c119153926a2b36dce0ab28322c09a117a4683e" dependencies = [ "memchr", ] @@ -2459,9 +2585,9 @@ dependencies = [ [[package]] name = "once_cell" -version = "1.19.0" +version = "1.20.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "3fdb12b2476b595f9358c5161aa467c2438859caa136dec86c26fdd2efe17b92" +checksum = "1261fe7e33c73b354eab43b1273a57c8f967d0391e80353e51f764ac02cf6775" [[package]] name = "option-ext" @@ -2483,9 +2609,9 @@ checksum = "56d80efc4b6721e8be2a10a5df21a30fa0b470f1539e53d8b4e6e75faf938b63" [[package]] name = "pango" -version = "0.20.1" +version = "0.20.6" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "5764e5a174a5a0ec054fe5962ce6d4fc7052e2d0dcc23bbc77202b40a4a403d3" +checksum = "71e34e7ca2c52e3933d7e5251409a82b83725fa9d6d48fbdaacec056b3a0554a" dependencies = [ "gio", "glib", @@ -2495,9 +2621,9 @@ dependencies = [ [[package]] name = "pango-sys" -version = "0.20.1" +version = "0.20.4" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "fd317e1de76b14b3d3efe05518c08b360327f1ab7fec150473a89ffcad4b072d" +checksum = "84fd65917bf12f06544ae2bbc200abf9fc0a513a5a88a0fa81013893aef2b838" dependencies = [ "glib-sys", "gobject-sys", @@ -2536,9 +2662,9 @@ checksum = "57c0d7b74b563b49d38dae00a0c37d4d6de9b432382b2892f0574ddcae73fd0a" [[package]] name = "pathdiff" -version = "0.2.1" +version = "0.2.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "8835116a5c179084a830efb3adc117ab007512b535bc1a21c991d3b32a6b44dd" +checksum = "d61c5ce1153ab5b689d0c074c4e7fc613e942dfb7dd9eea5ab202d2ad91fe361" [[package]] name = "percent-encoding" @@ -2548,9 +2674,9 @@ checksum = "e3148f5046208a5d56bcfc03053e3ca6334e51da8dfb19b6cdc8b306fae3283e" [[package]] name = "pest" -version = "2.7.11" +version = "2.7.14" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "cd53dff83f26735fdc1ca837098ccf133605d794cdae66acfc2bfac3ec809d95" +checksum = "879952a81a83930934cbf1786752d6dedc3b1f29e8f8fb2ad1d0a36f377cf442" dependencies = [ "memchr", "thiserror", @@ -2559,9 +2685,9 @@ dependencies = [ [[package]] name = "pest_derive" -version = "2.7.11" +version = "2.7.14" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "2a548d2beca6773b1c244554d36fcf8548a8a58e74156968211567250e48e49a" +checksum = "d214365f632b123a47fd913301e14c946c61d1c183ee245fa76eb752e59a02dd" dependencies = [ "pest", "pest_generator", @@ -2569,22 +2695,22 @@ dependencies = [ [[package]] name = "pest_generator" -version = "2.7.11" +version = "2.7.14" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "3c93a82e8d145725dcbaf44e5ea887c8a869efdcc28706df2d08c69e17077183" +checksum = "eb55586734301717aea2ac313f50b2eb8f60d2fc3dc01d190eefa2e625f60c4e" dependencies = [ "pest", "pest_meta", "proc-macro2", "quote", - "syn 2.0.76", + "syn 2.0.87", ] [[package]] name = "pest_meta" -version = "2.7.11" +version = "2.7.14" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a941429fea7e08bedec25e4f6785b6ffaacc6b755da98df5ef3e7dcf4a124c4f" +checksum = "b75da2a70cf4d9cb76833c990ac9cd3923c9a8905a8929789ce347c84564d03d" dependencies = [ "once_cell", "pest", @@ -2593,29 +2719,29 @@ dependencies = [ [[package]] name = "pin-project" -version = "1.1.5" +version = "1.1.7" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b6bf43b791c5b9e34c3d182969b4abb522f9343702850a2e57f460d00d09b4b3" +checksum = "be57f64e946e500c8ee36ef6331845d40a93055567ec57e8fae13efd33759b95" dependencies = [ "pin-project-internal", ] [[package]] name = "pin-project-internal" -version = "1.1.5" +version = "1.1.7" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "2f38a4412a78282e09a2cf38d195ea5420d15ba0602cb375210efbc877243965" +checksum = "3c0f5fad0874fc7abcd4d750e76917eaebbecaa2c20bde22e1dbeeba8beb758c" dependencies = [ "proc-macro2", "quote", - "syn 2.0.76", + "syn 2.0.87", ] [[package]] name = "pin-project-lite" -version = "0.2.14" +version = "0.2.15" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "bda66fc9667c18cb2758a2ac84d1167245054bcf85d5d1aaa6923f45801bdd02" +checksum = "915a1e146535de9163f3987b8944ed8cf49a18bb0056bcebcdcece385cece4ff" [[package]] name = "pin-utils" @@ -2625,9 +2751,9 @@ checksum = "8b870d8c151b6f2fb93e84a13146138f05d02ed11c7e7c54f8826aaaf7c9f184" [[package]] name = "pkg-config" -version = "0.3.30" +version = "0.3.31" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d231b230927b5e4ad203db57bbcbee2802f6bce620b1e4a9024a07d94e2907ec" +checksum = "953ec861398dccce10c670dfeaf3ec4911ca479e9c02154b3a215178c5f566f2" [[package]] name = "powerfmt" @@ -2646,21 +2772,21 @@ dependencies = [ [[package]] name = "prettyplease" -version = "0.2.22" +version = "0.2.25" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "479cf940fbbb3426c32c5d5176f62ad57549a0bb84773423ba8be9d089f5faba" +checksum = "64d1ec885c64d0457d564db4ec299b2dae3f9c02808b8ad9c3a089c591b18033" dependencies = [ "proc-macro2", - "syn 2.0.76", + "syn 2.0.87", ] [[package]] name = "proc-macro-crate" -version = "3.1.0" +version = "3.2.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "6d37c51ca738a55da99dc0c4a34860fd675453b8b36209178c2249bb13651284" +checksum = "8ecf48c7ca261d60b74ab1a7b20da18bede46776b2e55535cb958eb595c5fa7b" dependencies = [ - "toml_edit 0.21.1", + "toml_edit", ] [[package]] @@ -2686,6 +2812,27 @@ dependencies = [ "version_check", ] +[[package]] +name = "proc-macro-error-attr2" +version = "2.0.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "96de42df36bb9bba5542fe9f1a054b8cc87e172759a1868aa05c1f3acc89dfc5" +dependencies = [ + "proc-macro2", + "quote", +] + +[[package]] +name = "proc-macro-error2" +version = "2.0.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "11ec05c52be0a07b08061f7dd003e7d7092e0472bc731b4af7bb1ef876109802" +dependencies = [ + "proc-macro-error-attr2", + "proc-macro2", + "quote", +] + [[package]] name = "proc-macro-hack" version = "0.5.20+deprecated" @@ -2722,14 +2869,14 @@ checksum = "834da187cfe638ae8abb0203f0b33e5ccdb02a28e7199f2f47b3e2754f50edca" dependencies = [ "proc-macro2", "quote", - "syn 2.0.76", + "syn 2.0.87", ] [[package]] name = "proc-macro2" -version = "1.0.86" +version = "1.0.89" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "5e719e8df665df0d1c8fbfd238015744736151d4445ec0836b8e628aae103b77" +checksum = "f139b0662de085916d1fb67d2b4169d1addddda1919e696f3252b740b629986e" dependencies = [ "unicode-ident", ] @@ -2742,7 +2889,7 @@ checksum = "af066a9c399a26e020ada66a034357a868728e72cd426f3adcd35f80d88d88c8" dependencies = [ "proc-macro2", "quote", - "syn 2.0.76", + "syn 2.0.87", "version_check", "yansi", ] @@ -2775,7 +2922,7 @@ dependencies = [ "proc-macro-utils 0.10.0", "proc-macro2", "quote", - "syn 2.0.76", + "syn 2.0.87", ] [[package]] @@ -2810,9 +2957,9 @@ dependencies = [ [[package]] name = "redox_syscall" -version = "0.5.3" +version = "0.5.7" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "2a908a6e00f1fdd0dfd9c0eb08ce85126f6d8bbda50017e74bc4a4b7d4a926a4" +checksum = "9b6dfecf2c74bce2466cabf93f6664d6998a69eb21e39f4207930065b27b771f" dependencies = [ "bitflags", ] @@ -2830,14 +2977,14 @@ dependencies = [ [[package]] name = "regex" -version = "1.10.6" +version = "1.11.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "4219d74c6b67a3654a9fbebc4b419e22126d13d2f3c4a07ee0cb61ff79a79619" +checksum = "b544ef1b4eac5dc2db33ea63606ae9ffcfac26c1416a2806ae0bf5f56b201191" dependencies = [ "aho-corasick", "memchr", - "regex-automata 0.4.7", - "regex-syntax 0.8.4", + "regex-automata 0.4.9", + "regex-syntax 0.8.5", ] [[package]] @@ -2851,13 +2998,13 @@ dependencies = [ [[package]] name = "regex-automata" -version = "0.4.7" +version = "0.4.9" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "38caf58cc5ef2fed281f89292ef23f6365465ed9a41b7a7754eb4e26496c92df" +checksum = "809e8dc61f6de73b46c85f4c96486310fe304c434cfa43669d7b40f711150908" dependencies = [ "aho-corasick", "memchr", - "regex-syntax 0.8.4", + "regex-syntax 0.8.5", ] [[package]] @@ -2874,9 +3021,9 @@ checksum = "f162c6dd7b008981e4d40210aca20b4bd0f9b60ca9271061b07f78537722f2e1" [[package]] name = "regex-syntax" -version = "0.8.4" +version = "0.8.5" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "7a66a03ae7c801facd77a29370b4faec201768915ac14a721ba36f20bc9c209b" +checksum = "2b15c43186be67a4fd63bee50d0303afffcef381492ebe2c5d87f324e1b8815c" [[package]] name = "rstml" @@ -2887,7 +3034,7 @@ dependencies = [ "proc-macro2", "proc-macro2-diagnostics", "quote", - "syn 2.0.76", + "syn 2.0.87", "syn_derive", "thiserror", ] @@ -2906,18 +3053,18 @@ checksum = "08d43f7aa6b08d49f382cde6a7982047c3426db949b1424bc4b7ec9ae12c6ce2" [[package]] name = "rustc_version" -version = "0.4.0" +version = "0.4.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "bfa0f585226d2e68097d4f95d113b15b83a82e819ab25717ec0590d9584ef366" +checksum = "cfcb3a22ef46e85b45de6ee7e79d063319ebb6594faafcf1c225ea92ab6e9b92" dependencies = [ "semver", ] [[package]] name = "rustversion" -version = "1.0.17" +version = "1.0.18" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "955d28af4278de8121b7ebeb796b6a45735dc01436d898801014aced2773a3d6" +checksum = "0e819f2bc632f285be6d7cd36e25940d45b2391dd6d9b939e79de557f7014248" [[package]] name = "ryu" @@ -2978,9 +3125,9 @@ dependencies = [ [[package]] name = "serde" -version = "1.0.209" +version = "1.0.215" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "99fce0ffe7310761ca6bf9faf5115afbc19688edd00171d81b1bb1b116c63e09" +checksum = "6513c1ad0b11a9376da888e3e0baa0077f1aed55c17f50e7b2397136129fb88f" dependencies = [ "serde_derive", ] @@ -2998,20 +3145,20 @@ dependencies = [ [[package]] name = "serde_derive" -version = "1.0.209" +version = "1.0.215" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a5831b979fd7b5439637af1752d535ff49f4860c0f341d1baeb6faf0f4242170" +checksum = "ad1e866f866923f252f05c889987993144fb74e722403468a4ebd70c3cd756c0" dependencies = [ "proc-macro2", "quote", - "syn 2.0.76", + "syn 2.0.87", ] [[package]] name = "serde_json" -version = "1.0.127" +version = "1.0.132" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "8043c06d9f82bd7271361ed64f415fe5e12a77fdb52e573e7f06a516dea329ad" +checksum = "d726bfaff4b320266d395898905d0eba0345aae23b54aee3a737e260fd46db03" dependencies = [ "itoa", "memchr", @@ -3053,9 +3200,9 @@ dependencies = [ [[package]] name = "serde_spanned" -version = "0.6.7" +version = "0.6.8" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "eb5b1b31579f3811bf615c144393417496f152e12ac8b7663bf664f4a815306d" +checksum = "87607cb1398ed59d48732e575a4c28a7a8ebf2454b964fe3f224f2afc07909e1" dependencies = [ "serde", ] @@ -3096,9 +3243,9 @@ dependencies = [ [[package]] name = "server_fn" -version = "0.6.14" +version = "0.6.15" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "024b400db1aca5bd4188714f7bbbf7a2e1962b9a12a80b2a21e937e509086963" +checksum = "4fae7a3038a32e5a34ba32c6c45eb4852f8affaf8b794ebfcd4b1099e2d62ebe" dependencies = [ "actix-web", "axum", @@ -3120,7 +3267,7 @@ dependencies = [ "serde_qs 0.12.0", "server_fn_macro_default", "thiserror", - "tower", + "tower 0.4.13", "tower-layer", "url", "wasm-bindgen", @@ -3132,26 +3279,26 @@ dependencies = [ [[package]] name = "server_fn_macro" -version = "0.6.14" +version = "0.6.15" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "9cf0e6f71fc924df36e87f27dfbd447f0bedd092d365db3a5396878256d9f00c" +checksum = "faaaf648c6967aef78177c0610478abb5a3455811f401f3c62d10ae9bd3901a1" dependencies = [ "const_format", "convert_case 0.6.0", "proc-macro2", "quote", - "syn 2.0.76", + "syn 2.0.87", "xxhash-rust", ] [[package]] name = "server_fn_macro_default" -version = "0.6.14" +version = "0.6.15" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "556e4fd51eb9ee3e7d9fb0febec6cef486dcbc8f7f427591dfcfebee1abe1ad4" +checksum = "7f2aa8119b558a17992e0ac1fd07f080099564f24532858811ce04f742542440" dependencies = [ "server_fn_macro", - "syn 2.0.76", + "syn 2.0.87", ] [[package]] @@ -3241,6 +3388,12 @@ version = "0.9.8" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "6980e8d7511241f8acf4aebddbb1ff938df5eebe98691418c4468d0b72a96a67" +[[package]] +name = "stable_deref_trait" +version = "1.2.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "a8f112729512f8e442d81f95a8a7ddf2b7c6b8a1a6f509a95864142b30cab2d3" + [[package]] name = "strsim" version = "0.10.0" @@ -3260,9 +3413,9 @@ dependencies = [ [[package]] name = "syn" -version = "2.0.76" +version = "2.0.87" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "578e081a14e0cefc3279b0472138c513f37b41a08d5a3cca9b6e4e8ceb6cd525" +checksum = "25aa4ce346d03a6dcd68dd8b4010bcb74e54e62c90c573f394c46eae99aba32d" dependencies = [ "proc-macro2", "quote", @@ -3278,7 +3431,7 @@ dependencies = [ "proc-macro-error", "proc-macro2", "quote", - "syn 2.0.76", + "syn 2.0.87", ] [[package]] @@ -3293,13 +3446,24 @@ version = "1.0.1" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "a7065abeca94b6a8a577f9bd45aa0867a2238b74e8eb67cf10d492bc39351394" +[[package]] +name = "synstructure" +version = "0.13.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "c8af7666ab7b6390ab78131fb5b0fce11d6b7a6951602017c35fa82800708971" +dependencies = [ + "proc-macro2", + "quote", + "syn 2.0.87", +] + [[package]] name = "system-deps" -version = "7.0.2" +version = "7.0.3" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "070a0a5e7da2d24be457809c4b3baa57a835fd2829ad8b86f9a049052fe71031" +checksum = "66d23aaf9f331227789a99e8de4c91bf46703add012bdfd45fdecdfb2975a005" dependencies = [ - "cfg-expr 0.16.0", + "cfg-expr 0.17.0", "heck", "pkg-config", "toml", @@ -3312,6 +3476,12 @@ version = "0.12.16" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "61c41af27dd6d1e27b1b16b489db798443478cef1f06a660c96db617ba5de3b1" +[[package]] +name = "target-triple" +version = "0.1.3" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "42a4d50cdb458045afc8131fd91b64904da29548bcb63c7236e0844936c13078" + [[package]] name = "termcolor" version = "1.4.1" @@ -3334,22 +3504,22 @@ dependencies = [ [[package]] name = "thiserror" -version = "1.0.63" +version = "1.0.69" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c0342370b38b6a11b6cc11d6a805569958d54cfa061a29969c3b5ce2ea405724" +checksum = "b6aaf5339b578ea85b50e080feb250a3e8ae8cfcdff9a461c9ec2904bc923f52" dependencies = [ "thiserror-impl", ] [[package]] name = "thiserror-impl" -version = "1.0.63" +version = "1.0.69" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a4558b58466b9ad7ca0f102865eccc95938dca1a74a856f2b57b6629050da261" +checksum = "4fee6c4efc90059e10f81e6d42c60a18f76588c3d74cb83a0b242a2b6c7504c1" dependencies = [ "proc-macro2", "quote", - "syn 2.0.76", + "syn 2.0.87", ] [[package]] @@ -3400,28 +3570,14 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "9117f5d4db391c1cf6927e7bea3db74b9a1c1add8f7eda9ffd5364f40f57b82f" dependencies = [ "displaydoc", + "zerovec", ] -[[package]] -name = "tinyvec" -version = "1.8.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "445e881f4f6d382d5f27c034e25eb92edd7c784ceab92a0937db7f2e9471b938" -dependencies = [ - "tinyvec_macros", -] - -[[package]] -name = "tinyvec_macros" -version = "0.1.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "1f3ccbac311fea05f86f61904b462b55fb3df8837a366dfc601a0161d0532f20" - [[package]] name = "tokio" -version = "1.39.3" +version = "1.41.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "9babc99b9923bfa4804bd74722ff02c0381021eafa4db9949217e3be8e84fff5" +checksum = "22cfb5bee7a6a52939ca9224d6ac897bb669134078daa8735560897f69de4d33" dependencies = [ "backtrace", "bytes", @@ -3443,14 +3599,14 @@ checksum = "693d596312e88961bc67d7f1f97af8a70227d9f90c31bba5806eec004978d752" dependencies = [ "proc-macro2", "quote", - "syn 2.0.76", + "syn 2.0.87", ] [[package]] name = "tokio-util" -version = "0.7.11" +version = "0.7.12" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "9cf6b47b3771c49ac75ad09a6162f53ad4b8088b76ac60e8ec1455b31a189fe1" +checksum = "61e7c3654c13bcd040d4a03abee2c75b1d14a37b423cf5a813ceae1cc903ec6a" dependencies = [ "bytes", "futures-core", @@ -3470,7 +3626,7 @@ dependencies = [ "serde", "serde_spanned", "toml_datetime", - "toml_edit 0.22.20", + "toml_edit", ] [[package]] @@ -3484,26 +3640,15 @@ dependencies = [ [[package]] name = "toml_edit" -version = "0.21.1" +version = "0.22.22" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "6a8534fd7f78b5405e860340ad6575217ce99f38d4d5c8f2442cb5ecb50090e1" -dependencies = [ - "indexmap", - "toml_datetime", - "winnow 0.5.40", -] - -[[package]] -name = "toml_edit" -version = "0.22.20" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "583c44c02ad26b0c3f3066fe629275e50627026c51ac2e595cca4c230ce1ce1d" +checksum = "4ae48d6208a266e853d946088ed816055e556cc6028c5e8e2b84d9fa5dd7c7f5" dependencies = [ "indexmap", "serde", "serde_spanned", "toml_datetime", - "winnow 0.6.18", + "winnow", ] [[package]] @@ -3516,6 +3661,21 @@ dependencies = [ "futures-util", "pin-project", "pin-project-lite", + "tower-layer", + "tower-service", + "tracing", +] + +[[package]] +name = "tower" +version = "0.5.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "2873938d487c3cfb9aed7546dc9f2711d867c9f90c46b889989a2cb84eba6b4f" +dependencies = [ + "futures-core", + "futures-util", + "pin-project-lite", + "sync_wrapper 0.1.2", "tokio", "tower-layer", "tower-service", @@ -3591,7 +3751,7 @@ checksum = "34704c8d6ebcbc939824180af020566b01a7c01f80641264eba0999f6c2b6be7" dependencies = [ "proc-macro2", "quote", - "syn 2.0.76", + "syn 2.0.87", ] [[package]] @@ -3621,14 +3781,15 @@ dependencies = [ [[package]] name = "trybuild" -version = "1.0.99" +version = "1.0.101" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "207aa50d36c4be8d8c6ea829478be44a372c6a77669937bb39c698e52f1491e8" +checksum = "8dcd332a5496c026f1e14b7f3d2b7bd98e509660c04239c58b0ba38a12daded4" dependencies = [ "glob", "serde", "serde_derive", "serde_json", + "target-triple", "termcolor", "toml", ] @@ -3659,7 +3820,7 @@ checksum = "1f718dfaf347dcb5b983bfc87608144b0bad87970aebcbea5ce44d2a30c08e63" dependencies = [ "proc-macro2", "quote", - "syn 2.0.76", + "syn 2.0.87", ] [[package]] @@ -3670,9 +3831,9 @@ checksum = "42ff0bf0c66b8238c6f3b578df37d0b7848e55df8577b3f74f92a69acceeb825" [[package]] name = "ucd-trie" -version = "0.1.6" +version = "0.1.7" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ed646292ffc8188ef8ea4d1e0e0150fb15a5c2e12ad9b8fc191ae7a8a7f3c4b9" +checksum = "2896d95c02a80c6d6a5d6e953d479f5ddf2dfdb6a244441010e373ac0fb88971" [[package]] name = "unic-langid" @@ -3713,51 +3874,33 @@ checksum = "1ed7f4237ba393424195053097c1516bd4590dc82b84f2f97c5c69e12704555b" dependencies = [ "proc-macro-hack", "quote", - "syn 2.0.76", + "syn 2.0.87", "unic-langid-impl", ] [[package]] name = "unicase" -version = "2.7.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f7d2d4dafb69621809a81864c9c1b864479e1235c0dd4e199924b9742439ed89" -dependencies = [ - "version_check", -] - -[[package]] -name = "unicode-bidi" -version = "0.3.15" +version = "2.8.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "08f95100a766bf4f8f28f90d77e0a5461bbdb219042e7679bebe79004fed8d75" +checksum = "7e51b68083f157f853b6379db119d1c1be0e6e4dec98101079dec41f6f5cf6df" [[package]] name = "unicode-ident" -version = "1.0.12" +version = "1.0.13" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "3354b9ac3fae1ff6755cb6db53683adb661634f67557942dea4facebec0fee4b" - -[[package]] -name = "unicode-normalization" -version = "0.1.23" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a56d1686db2308d901306f92a263857ef59ea39678a5458e7cb17f01415101f5" -dependencies = [ - "tinyvec", -] +checksum = "e91b56cd4cadaeb79bbf1a5645f6b4f8dc5bde8834ad5894a8db35fda9efa1fe" [[package]] name = "unicode-segmentation" -version = "1.11.0" +version = "1.12.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d4c87d22b6e3f4a18d4d40ef354e97c90fcb14dd91d7dc0aa9d8a1172ebf7202" +checksum = "f6ccf251212114b54433ec949fd6a7841275f9ada20dddd2f29e9ceea4501493" [[package]] name = "unicode-xid" -version = "0.2.5" +version = "0.2.6" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "229730647fbc343e3a80e463c1db7f78f3855d3f3739bee0dda773c9a037c90a" +checksum = "ebc1c04c71510c7f702b52b7c350734c9ff1295c464a03335b00bb84fc54f853" [[package]] name = "unsafe-libyaml" @@ -3767,26 +3910,38 @@ checksum = "673aac59facbab8a9007c7f6108d11f63b603f7cabff99fabf650fea5c32b861" [[package]] name = "url" -version = "2.5.2" +version = "2.5.3" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "22784dbdf76fdde8af1aeda5622b546b422b6fc585325248a2bf9f5e41e94d6c" +checksum = "8d157f1b96d14500ffdc1f10ba712e780825526c03d9a49b4d0324b0d9113ada" dependencies = [ "form_urlencoded", "idna", "percent-encoding", ] +[[package]] +name = "utf16_iter" +version = "1.0.5" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "c8232dd3cdaed5356e0f716d285e4b40b932ac434100fe9b7e0e8e935b9e6246" + [[package]] name = "utf8-width" version = "0.1.7" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "86bd8d4e895da8537e5315b8254664e6b769c4ff3db18321b297a1e7004392e3" +[[package]] +name = "utf8_iter" +version = "1.0.4" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "b6c140620e7ffbb22c2dee59cafe6084a59b5ffc27a8859a5f0d494b5d52b6be" + [[package]] name = "uuid" -version = "1.10.0" +version = "1.11.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "81dfa00651efa65069b0b6b651f4aaa31ba9e3c3ce0137aaad053604ee7e0314" +checksum = "f8c5f0a0af699448548ad1a2fbf920fb4bee257eae39953ba95cb84891a0446a" dependencies = [ "getrandom", ] @@ -3827,9 +3982,9 @@ checksum = "9c8d87e72b64a3b4db28d11ce29237c246188f4f51057d65a7eab63b7987e423" [[package]] name = "wasm-bindgen" -version = "0.2.93" +version = "0.2.95" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a82edfc16a6c469f5f44dc7b571814045d60404b55a0ee849f9bcfa2e63dd9b5" +checksum = "128d1e363af62632b8eb57219c8fd7877144af57558fb2ef0368d0087bddeb2e" dependencies = [ "cfg-if", "once_cell", @@ -3838,24 +3993,24 @@ dependencies = [ [[package]] name = "wasm-bindgen-backend" -version = "0.2.93" +version = "0.2.95" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "9de396da306523044d3302746f1208fa71d7532227f15e347e2d93e4145dd77b" +checksum = "cb6dd4d3ca0ddffd1dd1c9c04f94b868c37ff5fac97c30b97cff2d74fce3a358" dependencies = [ "bumpalo", "log", "once_cell", "proc-macro2", "quote", - "syn 2.0.76", + "syn 2.0.87", "wasm-bindgen-shared", ] [[package]] name = "wasm-bindgen-futures" -version = "0.4.43" +version = "0.4.45" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "61e9300f63a621e96ed275155c108eb6f843b6a26d053f122ab69724559dc8ed" +checksum = "cc7ec4f8827a71586374db3e87abdb5a2bb3a15afed140221307c3ec06b1f63b" dependencies = [ "cfg-if", "js-sys", @@ -3865,9 +4020,9 @@ dependencies = [ [[package]] name = "wasm-bindgen-macro" -version = "0.2.93" +version = "0.2.95" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "585c4c91a46b072c92e908d99cb1dcdf95c5218eeb6f3bf1efa991ee7a68cccf" +checksum = "e79384be7f8f5a9dd5d7167216f022090cf1f9ec128e6e6a482a2cb5c5422c56" dependencies = [ "quote", "wasm-bindgen-macro-support", @@ -3875,28 +4030,28 @@ dependencies = [ [[package]] name = "wasm-bindgen-macro-support" -version = "0.2.93" +version = "0.2.95" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "afc340c74d9005395cf9dd098506f7f44e38f2b4a21c6aaacf9a105ea5e1e836" +checksum = "26c6ab57572f7a24a4985830b120de1594465e5d500f24afe89e16b4e833ef68" dependencies = [ "proc-macro2", "quote", - "syn 2.0.76", + "syn 2.0.87", "wasm-bindgen-backend", "wasm-bindgen-shared", ] [[package]] name = "wasm-bindgen-shared" -version = "0.2.93" +version = "0.2.95" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c62a0a307cb4a311d3a07867860911ca130c3494e8c2719593806c08bc5d0484" +checksum = "65fc09f10666a9f147042251e0dda9c18f166ff7de300607007e96bdebc1068d" [[package]] name = "wasm-bindgen-test" -version = "0.3.43" +version = "0.3.45" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "68497a05fb21143a08a7d24fc81763384a3072ee43c44e86aad1744d6adef9d9" +checksum = "d381749acb0943d357dcbd8f0b100640679883fcdeeef04def49daf8d33a5426" dependencies = [ "console_error_panic_hook", "js-sys", @@ -3909,20 +4064,20 @@ dependencies = [ [[package]] name = "wasm-bindgen-test-macro" -version = "0.3.43" +version = "0.3.45" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "4b8220be1fa9e4c889b30fd207d4906657e7e90b12e0e6b0c8b8d8709f5de021" +checksum = "c97b2ef2c8d627381e51c071c2ab328eac606d3f69dd82bcbca20a9e389d95f0" dependencies = [ "proc-macro2", "quote", - "syn 2.0.76", + "syn 2.0.87", ] [[package]] name = "wasm-streams" -version = "0.4.0" +version = "0.4.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b65dc4c90b63b118468cf747d8bf3566c1913ef60be765b5730ead9e0a3ba129" +checksum = "15053d8d85c7eccdbefef60f06769760a563c7f0a9d6902a13d35c7800b0ad65" dependencies = [ "futures-util", "js-sys", @@ -3933,9 +4088,9 @@ dependencies = [ [[package]] name = "web-sys" -version = "0.3.70" +version = "0.3.72" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "26fdeaafd9bd129f65e7c031593c24d62186301e0c72c8978fa1678be7d532c0" +checksum = "f6488b90108c040df0fe62fa815cbdee25124641df01814dd7282749234c6112" dependencies = [ "js-sys", "wasm-bindgen", @@ -4122,21 +4277,24 @@ checksum = "589f6da84c646204747d1270a2a5661ea66ed1cced2631d546fdfb155959f9ec" [[package]] name = "winnow" -version = "0.5.40" +version = "0.6.20" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f593a95398737aeed53e489c785df13f3618e41dbcd6718c6addbf1395aa6876" +checksum = "36c1fec1a2bb5866f07c25f68c26e565c4c200aebb96d7e55710c19d3e8ac49b" dependencies = [ "memchr", ] [[package]] -name = "winnow" -version = "0.6.18" +name = "write16" +version = "1.0.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "68a9bda4691f099d435ad181000724da8e5899daa10713c2d432552b9ccd3a6f" -dependencies = [ - "memchr", -] +checksum = "d1890f4022759daae28ed4fe62859b1236caebfc61ede2f63ed4e695f3f6d936" + +[[package]] +name = "writeable" +version = "0.5.5" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "1e9df38ee2d2c3c5948ea468a8406ff0db0b29ae1ffde1bcf20ef305bcc95c51" [[package]] name = "xxhash-rust" @@ -4150,6 +4308,30 @@ version = "1.0.1" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "cfe53a6657fd280eaa890a3bc59152892ffa3e30101319d168b781ed6529b049" +[[package]] +name = "yoke" +version = "0.7.4" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "6c5b1314b079b0930c31e3af543d8ee1757b1951ae1e1565ec704403a7240ca5" +dependencies = [ + "serde", + "stable_deref_trait", + "yoke-derive", + "zerofrom", +] + +[[package]] +name = "yoke-derive" +version = "0.7.4" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "28cc31741b18cb6f1d5ff12f5b7523e3d6eb0852bbbad19d73905511d9849b95" +dependencies = [ + "proc-macro2", + "quote", + "syn 2.0.87", + "synstructure", +] + [[package]] name = "zerocopy" version = "0.7.35" @@ -4168,7 +4350,50 @@ checksum = "fa4f8080344d4671fb4e831a13ad1e68092748387dfc4f55e356242fae12ce3e" dependencies = [ "proc-macro2", "quote", - "syn 2.0.76", + "syn 2.0.87", +] + +[[package]] +name = "zerofrom" +version = "0.1.4" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "91ec111ce797d0e0784a1116d0ddcdbea84322cd79e5d5ad173daeba4f93ab55" +dependencies = [ + "zerofrom-derive", +] + +[[package]] +name = "zerofrom-derive" +version = "0.1.4" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "0ea7b4a3637ea8669cedf0f1fd5c286a17f3de97b8dd5a70a6c167a1730e63a5" +dependencies = [ + "proc-macro2", + "quote", + "syn 2.0.87", + "synstructure", +] + +[[package]] +name = "zerovec" +version = "0.10.4" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "aa2b893d79df23bfb12d5461018d408ea19dfafe76c2c7ef6d4eba614f8ff079" +dependencies = [ + "yoke", + "zerofrom", + "zerovec-derive", +] + +[[package]] +name = "zerovec-derive" +version = "0.10.3" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "6eafa6dfb17584ea3e2bd6e76e0cc15ad7af12b09abdd1ca55961bed9b1063c6" +dependencies = [ + "proc-macro2", + "quote", + "syn 2.0.87", ] [[package]] diff --git a/README.md b/README.md index f51082ad..81bb4140 100644 --- a/README.md +++ b/README.md @@ -22,7 +22,7 @@ Add the following to your `Cargo.toml` file: ```toml [dependencies] leptos-fluent = "0.1" -fluent-templates = "0.10" +fluent-templates = "0.11" [features] hydrate = [ diff --git a/book/src/basic-usage.md b/book/src/basic-usage.md index e0cb4ab4..b19157ee 100644 --- a/book/src/basic-usage.md +++ b/book/src/basic-usage.md @@ -116,7 +116,7 @@ path = "src/lib.rs" [dependencies] leptos = { version = "0.6.12", features = ["csr"] } leptos-fluent = "0.1" -fluent-templates = "0.10" +fluent-templates = "0.11" console_error_panic_hook = "0.1" # Using cargo-leptos diff --git a/book/src/install.md b/book/src/install.md index 0dfdd615..c9399765 100644 --- a/book/src/install.md +++ b/book/src/install.md @@ -11,7 +11,7 @@ For client side rendering apps install **leptos-fluent** and [`fluent-templates` ```toml [dependencies] leptos-fluent = "0.1" -fluent-templates = "0.10" +fluent-templates = "0.11" ```
@@ -20,7 +20,7 @@ fluent-templates = "0.10" ```toml [dependencies] leptos-fluent = { version = "0.1", default-features = false } -fluent-templates = { version = "0.10", default-features = false, features = [ +fluent-templates = { version = "0.11", default-features = false, features = [ "macros", "walkdir" ] } @@ -45,7 +45,7 @@ respective features set. ```toml [dependencies] leptos-fluent = "0.1" -fluent-templates = "0.10" +fluent-templates = "0.11" [features] hydrate = [ @@ -70,7 +70,7 @@ and enable the `system` feature: ```toml [dependencies] leptos-fluent = { version = "0.1", features = ["system"] } -fluent-templates = "0.10" +fluent-templates = "0.11" ``` ```admonish example @@ -99,7 +99,7 @@ feature: ```toml [dependencies] leptos-fluent = { version = "0.1", features = ["nightly"] } -fluent-templates = "0.10" +fluent-templates = "0.11" ``` ## Language files @@ -112,7 +112,7 @@ enabled: ```toml [dependencies] -fluent-templates = "0.10" +fluent-templates = "0.11" leptos-fluent = { version = "0.1", features = ["json5"], default-features = false } ``` @@ -148,7 +148,7 @@ To enable [`tracing`] support, add the `tracing` feature to **leptos-fluent**: ```toml [dependencies] leptos-fluent = { version = "0.1", features = ["tracing"] } -fluent-templates = "0.10" +fluent-templates = "0.11" ``` ```admonish example diff --git a/end2end/Cargo.toml b/end2end/Cargo.toml index 5f6f23f4..d7ebc54f 100644 --- a/end2end/Cargo.toml +++ b/end2end/Cargo.toml @@ -7,7 +7,7 @@ publish = false [dependencies] tests-helpers = { path = "./tests-helpers" } leptos-fluent = { path = "../leptos-fluent" } -fluent-templates = { version = "0.10", default-features = false, features = [ +fluent-templates = { version = "0.11", default-features = false, features = [ "macros", "walkdir" ] } diff --git a/examples/csr-complete/Cargo.toml b/examples/csr-complete/Cargo.toml index 3bd53545..c030e9a0 100644 --- a/examples/csr-complete/Cargo.toml +++ b/examples/csr-complete/Cargo.toml @@ -11,7 +11,7 @@ path = "src/lib.rs" [dependencies] leptos = { version = "0.6", features = ["csr"] } leptos-fluent = { path = "../../leptos-fluent" } -fluent-templates = { version = "0.10", default-features = false, features = [ +fluent-templates = { version = "0.11", default-features = false, features = [ "macros", "walkdir" ] } diff --git a/examples/csr-minimal/Cargo.toml b/examples/csr-minimal/Cargo.toml index 1dc002f7..ce7b845a 100644 --- a/examples/csr-minimal/Cargo.toml +++ b/examples/csr-minimal/Cargo.toml @@ -11,7 +11,7 @@ path = "src/lib.rs" [dependencies] leptos = { version = "0.6", features = ["csr"] } leptos-fluent = { path = "../../leptos-fluent", default-features = false } -fluent-templates = { version = "0.10", default-features = false, features = [ +fluent-templates = { version = "0.11", default-features = false, features = [ "macros", "walkdir" ] } diff --git a/examples/ssr-hydrate-actix/Cargo.toml b/examples/ssr-hydrate-actix/Cargo.toml index 84035a81..03697a39 100644 --- a/examples/ssr-hydrate-actix/Cargo.toml +++ b/examples/ssr-hydrate-actix/Cargo.toml @@ -16,11 +16,11 @@ leptos_meta = "0.6" leptos_actix = { version = "0.6", optional = true } leptos_router = "0.6" leptos-fluent = { path = "../../leptos-fluent" } -fluent-templates = { version = "0.10", default-features = false, features = [ +fluent-templates = { version = "0.11", default-features = false, features = [ "macros", "walkdir" ] } -wasm-bindgen = "=0.2.93" +wasm-bindgen = "=0.2.95" [features] csr = ["leptos/csr", "leptos_meta/csr", "leptos_router/csr"] diff --git a/examples/ssr-hydrate-axum/Cargo.toml b/examples/ssr-hydrate-axum/Cargo.toml index 07d3e913..396d23f6 100644 --- a/examples/ssr-hydrate-axum/Cargo.toml +++ b/examples/ssr-hydrate-axum/Cargo.toml @@ -10,7 +10,7 @@ crate-type = ["cdylib", "rlib"] [dependencies] axum = { version = "0.7", optional = true } console_error_panic_hook = "0.1" -tower = { version = "0.4", optional = true } +tower = { version = "0.4", optional = true, features = ["util"] } tower-http = { version = "0.5", features = ["fs"], optional = true } http = "1" thiserror = "1" @@ -22,11 +22,11 @@ leptos_router = "0.6" leptos-fluent = { path = "../../leptos-fluent", features = [ "yaml" ], default-features = false } -fluent-templates = { version = "0.10", default-features = false, features = [ +fluent-templates = { version = "0.11", default-features = false, features = [ "macros", "walkdir" ] } -wasm-bindgen = "=0.2.93" +wasm-bindgen = "=0.2.95" [features] csr = ["leptos/csr", "leptos_meta/csr", "leptos_router/csr"] diff --git a/examples/ssr-hydrate-axum/src/fileserv.rs b/examples/ssr-hydrate-axum/src/fileserv.rs index 7ae81c02..cdb9b648 100644 --- a/examples/ssr-hydrate-axum/src/fileserv.rs +++ b/examples/ssr-hydrate-axum/src/fileserv.rs @@ -8,7 +8,7 @@ use axum::{ }; use leptos::*; use std::convert::Infallible; -use tower::ServiceExt; +use tower::util::ServiceExt; use tower_http::services::{fs::ServeFileSystemResponseBody, ServeDir}; pub async fn file_and_error_handler( diff --git a/examples/ssr-islands-axum/Cargo.toml b/examples/ssr-islands-axum/Cargo.toml index 646bc56e..a423203d 100644 --- a/examples/ssr-islands-axum/Cargo.toml +++ b/examples/ssr-islands-axum/Cargo.toml @@ -19,13 +19,13 @@ leptos_router = { version = "0.6" } tokio = { version = "1", features = ["rt-multi-thread"], optional = true } tower = { version = "0.4", optional = true, features = ["util"] } tower-http = { version = "0.5", features = ["fs"], optional = true } -wasm-bindgen = "=0.2.93" +wasm-bindgen = "=0.2.95" thiserror = "1" http = "1" serde = "1" leptos-fluent = { path = "../../leptos-fluent" } -fluent-templates = { version = "0.10", default-features = false, features = [ +fluent-templates = { version = "0.11", default-features = false, features = [ "macros", "walkdir", ] } diff --git a/examples/ssr-islands-axum/src/app.rs b/examples/ssr-islands-axum/src/app.rs index 82988ab1..2c47bc4b 100644 --- a/examples/ssr-islands-axum/src/app.rs +++ b/examples/ssr-islands-axum/src/app.rs @@ -201,7 +201,7 @@ mod header { } #[island] - fn LanguageSelector(name: String) -> impl IntoView { + fn LanguageSelector(#[allow(dead_code)] name: String) -> impl IntoView { let i18n = expect_i18n(); // A page reload is necessary after changing the language because diff --git a/examples/ssr-islands-axum/src/fileserv.rs b/examples/ssr-islands-axum/src/fileserv.rs index 7ae81c02..cdb9b648 100644 --- a/examples/ssr-islands-axum/src/fileserv.rs +++ b/examples/ssr-islands-axum/src/fileserv.rs @@ -8,7 +8,7 @@ use axum::{ }; use leptos::*; use std::convert::Infallible; -use tower::ServiceExt; +use tower::util::ServiceExt; use tower_http::services::{fs::ServeFileSystemResponseBody, ServeDir}; pub async fn file_and_error_handler( diff --git a/examples/system-gtk/Cargo.toml b/examples/system-gtk/Cargo.toml index 052df965..48efccc9 100644 --- a/examples/system-gtk/Cargo.toml +++ b/examples/system-gtk/Cargo.toml @@ -10,7 +10,7 @@ leptos-fluent = { path = "../../leptos-fluent", default-features = false, featur "system", "tracing" ] } -fluent-templates = { version = "0.10", default-features = false, features = [ +fluent-templates = { version = "0.11", default-features = false, features = [ "macros", "walkdir" ] } diff --git a/leptos-fluent-macros/Cargo.toml b/leptos-fluent-macros/Cargo.toml index 7e7d3584..eb872a6d 100644 --- a/leptos-fluent-macros/Cargo.toml +++ b/leptos-fluent-macros/Cargo.toml @@ -2,7 +2,7 @@ name = "leptos-fluent-macros" description = "Macros for leptos-fluent" edition.workspace = true -version = "0.1.25" +version = "0.1.26" license = "MIT" documentation.workspace = true repository.workspace = true diff --git a/leptos-fluent-macros/src/lib.rs b/leptos-fluent-macros/src/lib.rs index 07a0c893..92363713 100644 --- a/leptos-fluent-macros/src/lib.rs +++ b/leptos-fluent-macros/src/lib.rs @@ -248,31 +248,19 @@ pub fn leptos_fluent( }; initial_language_from_system_to_data_file.iter().map(|param| { - let quote = match param.lit { - Some(ref lit) => match lit.value { - true => quote! { - if lang.is_none() && !#data_file_key_quote.is_empty() { - #effect_quote - } - }, - false => quote!(), - }, - None => match param.expr { - Some(ref expr) => quote! { + match param.expr { + Some(ref expr) => { + let q = quote! { if lang.is_none() && #expr && !#data_file_key_quote.is_empty() { #effect_quote } - }, - None => quote!(), + }; + match param.exprpath { + Some(ref path) => quote!(#path{#q}), + None => q, + } }, - }; - - match quote.is_empty() { - true => quote!(), - false => match param.exprpath { - Some(ref path) => quote!(#path{#quote}), - None => quote, - } + None => quote!(), } }).collect() }; @@ -288,33 +276,19 @@ pub fn leptos_fluent( initial_language_from_system .iter() - .map(|param| { - let quote = match param.lit { - Some(ref lit) => match lit.value { - true => quote! { - if lang.is_none() { - #effect_quote - } - }, - false => quote!(), - }, - None => match param.expr { - Some(ref expr) => quote! { - if #expr && lang.is_none() { - #effect_quote - } - }, - None => quote!(), - }, - }; - - match quote.is_empty() { - true => quote!(), - false => match param.exprpath { - Some(ref path) => quote!(#path{#quote}), - None => quote, - }, + .map(|param| match param.expr { + Some(ref expr) => { + let q = quote! { + if #expr && lang.is_none() { + #effect_quote + } + }; + match param.exprpath { + Some(ref path) => quote!(#path{#q}), + None => q, + } } + None => quote!(), }) .collect() }; @@ -334,21 +308,15 @@ pub fn leptos_fluent( set_language_to_data_file .iter() .map(|param| { - let set_language_to_data_file_quote = match param.lit { - Some(ref lit) => match lit.value { - true => quote! { #data_file_key_quote }, - false => quote! { "" }, - }, - None => match param.expr { - Some(ref expr) => quote! { - if #expr { - #data_file_key_quote - } else { - "" - } - }, - None => quote! { "" }, + let set_language_to_data_file_quote = match param.expr { + Some(ref expr) => quote! { + if #expr { + #data_file_key_quote + } else { + "" + } }, + None => quote! { "" }, }; // TODO: optimize checking if empty at compile time when literal @@ -364,27 +332,19 @@ pub fn leptos_fluent( }); }; - let quote = match param.lit { - Some(ref lit) => match lit.value { - true => effect_quote, - false => quote!(), - }, - None => match param.expr { - Some(ref expr) => quote! { + match param.expr { + Some(ref expr) => { + let q = quote! { if #expr { #effect_quote } - }, - None => quote!(), - }, - }; - - match quote.is_empty() { - true => quote!(), - false => match param.exprpath { - Some(ref path) => quote!(#path{#quote}), - None => quote, - }, + }; + match param.exprpath { + Some(ref path) => quote!(#path{#q}), + None => q, + } + } + None => quote!(), } }) .collect(); @@ -397,21 +357,15 @@ pub fn leptos_fluent( initial_language_from_data_file .iter() .map(|param| { - let initial_language_from_data_file_quote = match param.lit { - Some(ref lit) => match lit.value() { - true => quote! { #data_file_key_quote }, - false => quote! { "" }, - }, - None => match param.expr { - Some(ref expr) => quote! { - if #expr { - #data_file_key_quote - } else { - "" - } - }, - None => quote! { "" }, + let initial_language_from_data_file_quote = match param.expr { + Some(ref expr) => quote! { + if #expr { + #data_file_key_quote + } else { + "" + } }, + None => quote! { "" }, }; let effect_quote = quote! { @@ -425,31 +379,19 @@ pub fn leptos_fluent( } }; - let quote = match param.lit { - Some(ref lit) => match lit.value() { - true => quote! { - if lang.is_none() { - #effect_quote - } - }, - false => quote!(), - }, - None => match param.expr { - Some(ref expr) => quote! { + match param.expr { + Some(ref expr) => { + let q = quote! { if #expr && lang.is_none() { #effect_quote } - }, - None => quote!(), - }, - }; - - match quote.is_empty() { - true => quote!(), - false => match param.exprpath { - Some(ref path) => quote!(#path{#quote}), - None => quote, - }, + }; + match param.exprpath { + Some(ref path) => quote!(#path{#q}), + None => q, + } + } + None => quote!(), } }) .collect(); @@ -474,29 +416,19 @@ pub fn leptos_fluent( initial_language_from_server_function_to_cookie .iter() - .map(|param| { - let quote = match param.lit { - Some(ref lit) => match lit.value { - true => effect_quote.clone(), - false => quote!(), - }, - None => match param.expr { - Some(ref expr) => quote! { - if #expr { - #effect_quote - } - }, - None => quote!(), - }, - }; - - match quote.is_empty() { - true => quote!(), - false => match param.exprpath { - Some(ref path) => quote!(#path{#quote}), - None => quote, - }, + .map(|param| match param.expr { + Some(ref expr) => { + let q = quote! { + if #expr { + #effect_quote + } + }; + match param.exprpath { + Some(ref path) => quote!(#path{#q}), + None => q, + } } + None => quote!(), }) .collect() }; @@ -512,29 +444,19 @@ pub fn leptos_fluent( initial_language_from_server_function_to_localstorage .iter() - .map(|param| { - let quote = match param.lit { - Some(ref lit) => match lit.value { - true => effect_quote.clone(), - false => quote!(), - }, - None => match param.expr { - Some(ref expr) => quote! { - if #expr { - #effect_quote - } - }, - None => quote!(), - }, - }; - - match quote.is_empty() { - true => quote!(), - false => match param.exprpath { - Some(ref path) => quote!(#path{#quote}), - None => quote, - }, + .map(|param| match param.expr { + Some(ref expr) => { + let q = quote! { + if #expr { + #effect_quote + } + }; + match param.exprpath { + Some(ref path) => quote!(#path{#q}), + None => q, + } } + None => quote!(), }) .collect() }; @@ -641,27 +563,19 @@ pub fn leptos_fluent( ); }; - let quote = match param.lit { - Some(ref lit) => match lit.value { - true => effect_quote, - false => quote!(), - }, - None => match param.expr { - Some(ref expr) => quote! { + match param.expr { + Some(ref expr) => { + let q = quote! { if #expr { #effect_quote } - }, - None => quote!(), - }, - }; - - match quote.is_empty() { - true => quote!(), - false => match param.exprpath { - Some(ref path) => quote!(#path{#quote}), - None => quote, + }; + match param.exprpath { + Some(ref path) => quote!(#path{#q}), + None => q, + } }, + None => quote!(), } }).collect(); @@ -674,27 +588,19 @@ pub fn leptos_fluent( ); }; - let quote = match param.lit { - Some(ref lit) => match lit.value { - true => effect_quote, - false => quote!(), - }, - None => match param.expr { - Some(ref expr) => quote! { + match param.expr { + Some(ref expr) => { + let q = quote! { if #expr { #effect_quote } - }, - None => quote!(), - }, - }; - - match quote.is_empty() { - true => quote!(), - false => match param.exprpath { - Some(ref path) => quote!(#path{#quote}), - None => quote, + }; + match param.exprpath { + Some(ref path) => quote!(#path{#q}), + None => q, + } }, + None => quote!(), } }).collect(); @@ -786,22 +692,15 @@ pub fn leptos_fluent( let sync_html_tag_dir_bool_quote: proc_macro2::TokenStream = { let quote = sync_html_tag_dir .iter() - .map(|param| { - let quote = match param.lit { - Some(ref lit) => quote! { #lit }, - None => match param.expr { - Some(ref expr) => quote! { #expr }, - None => quote! { false }, - }, - }; - - match quote.is_empty() { - true => quote! { false }, - false => match param.exprpath { - Some(ref path) => quote!(#path{#quote}), - None => quote, - }, + .map(|param| match param.expr { + Some(ref expr) => { + let q = quote! { #expr }; + match param.exprpath { + Some(ref path) => quote!(#path{#q}), + None => q, + } } + None => quote! { false }, }) .collect::(); @@ -851,22 +750,15 @@ pub fn leptos_fluent( let sync_html_tag_lang_bool_quote: proc_macro2::TokenStream = { let quote = sync_html_tag_lang .iter() - .map(|param| { - let quote = match param.lit { - Some(ref lit) => quote! { #lit }, - None => match param.expr { - Some(ref expr) => quote! { #expr }, - None => quote! { false }, - }, - }; - - match quote.is_empty() { - true => quote! { false }, - false => match param.exprpath { - Some(ref path) => quote!(#path{#quote}), - None => quote, - }, + .map(|param| match param.expr { + Some(ref expr) => { + let q = quote! { #expr }; + match param.exprpath { + Some(ref path) => quote!(#path{#q}), + None => q, + } } + None => quote! { false }, }) .collect::(); @@ -913,58 +805,38 @@ pub fn leptos_fluent( let sync_html_tag_lang_quote: proc_macro2::TokenStream = sync_html_tag_lang .iter() - .map(|param| { - let quote = match param.lit { - Some(ref lit) => match lit.value { - true => sync_html_tag_lang_effect_quote.clone(), - false => quote!(), - }, - None => match param.expr { - Some(ref expr) => quote! { - if #expr { - #sync_html_tag_lang_effect_quote - } - }, - None => quote!(), - }, - }; - - match quote.is_empty() { - true => quote!(), - false => match param.exprpath { - Some(ref path) => quote!(#path{#quote}), - None => quote, - }, + .map(|param| match param.expr { + Some(ref expr) => { + let q = quote! { + if #expr { + #sync_html_tag_lang_effect_quote + } + }; + match param.exprpath { + Some(ref path) => quote!(#path{#q}), + None => q, + } } + None => quote!(), }) .collect(); let sync_html_tag_dir_quote: proc_macro2::TokenStream = sync_html_tag_dir .iter() - .map(|param| { - let quote = match param.lit { - Some(ref lit) => match lit.value { - true => sync_html_tag_dir_effect_quote.clone(), - false => quote!(), - }, - None => match param.expr { - Some(ref expr) => quote! { - if #expr { - #sync_html_tag_dir_effect_quote - } - }, - None => quote!(), - }, - }; - - match quote.is_empty() { - true => quote!(), - false => match param.exprpath { - Some(ref path) => quote!(#path{#quote}), - None => quote, - }, + .map(|param| match param.expr { + Some(ref expr) => { + let q = quote! { + if #expr { + #sync_html_tag_dir_effect_quote + } + }; + match param.exprpath { + Some(ref path) => quote!(#path{#q}), + None => q, + } } + None => quote!(), }) .collect(); @@ -994,29 +866,19 @@ pub fn leptos_fluent( set_language_to_localstorage .iter() - .map(|param| { - let quote = match param.lit { - Some(ref lit) => match lit.value { - true => effect_quote.clone(), - false => quote!(), - }, - None => match param.expr { - Some(ref expr) => quote! { - if #expr { - #effect_quote - } - }, - None => quote!(), - }, - }; - - match quote.is_empty() { - true => quote!(), - false => match param.exprpath { - Some(ref path) => quote!(#path{#quote}), - None => quote, - }, + .map(|param| match param.expr { + Some(ref expr) => { + let q = quote! { + if #expr { + #effect_quote + } + }; + match param.exprpath { + Some(ref path) => quote!(#path{#q}), + None => q, + } } + None => quote!(), }) .collect() }; @@ -1045,29 +907,19 @@ pub fn leptos_fluent( initial_language_from_url_param_to_localstorage .iter() - .map(|param| { - let quote = match param.lit { - Some(ref lit) => match lit.value { - true => effect_quote.clone(), - false => quote!(), - }, - None => match param.expr { - Some(ref expr) => quote! { - if #expr { - #effect_quote - } - }, - None => quote!(), - }, - }; - - match quote.is_empty() { - true => quote!(), - false => match param.exprpath { - Some(ref path) => quote!(#path{#quote}), - None => quote, - }, + .map(|param| match param.expr { + Some(ref expr) => { + let q = quote! { + if #expr { + #effect_quote + } + }; + match param.exprpath { + Some(ref path) => quote!(#path{#q}), + None => q, + } } + None => quote!(), }) .collect() }; @@ -1084,29 +936,19 @@ pub fn leptos_fluent( initial_language_from_url_param_to_cookie .iter() - .map(|param| { - let quote = match param.lit { - Some(ref lit) => match lit.value { - true => effect_quote.clone(), - false => quote!(), - }, - None => match param.expr { - Some(ref expr) => quote! { - if #expr { - #effect_quote - } - }, - None => quote!(), - }, - }; - - match quote.is_empty() { - true => quote!(), - false => match param.exprpath { - Some(ref path) => quote!(#path{#quote}), - None => quote, - }, + .map(|param| match param.expr { + Some(ref expr) => { + let q = quote! { + if #expr { + #effect_quote + } + }; + match param.exprpath { + Some(ref path) => quote!(#path{#q}), + None => q, + } } + None => quote!(), }) .collect() }; @@ -1196,34 +1038,22 @@ pub fn leptos_fluent( initial_language_from_url_param .iter() - .map(|param| { - let quote = match param.lit { - Some(ref lit) => match lit.value { - true => parse_language_quote.clone(), - false => quote!(), - }, - None => match param.expr { - Some(ref expr) => { - match parse_language_quote.is_empty() { - true => quote!(), - false => quote! { - if #expr { - #parse_language_quote - } - }, + .map(|param| match param.expr { + Some(ref expr) => match parse_language_quote.is_empty() { + true => quote!(), + false => { + let q = quote! { + if #expr { + #parse_language_quote } + }; + match param.exprpath { + Some(ref path) => quote!(#path{#q}), + None => q, } - None => quote!(), - }, - }; - - match quote.is_empty() { - true => quote!(), - false => match param.exprpath { - Some(ref path) => quote!(#path{#quote}), - None => quote, - }, - } + } + }, + None => quote!(), }) .collect() }; @@ -1240,28 +1070,19 @@ pub fn leptos_fluent( let initial_language_from_localstorage_to_cookie_quote: proc_macro2::TokenStream = initial_language_from_localstorage_to_cookie.iter().map(|param| { - let quote = match param.lit { - Some(ref lit) => match lit.value { - true => set_cookie_quote.clone(), - false => quote!(), - }, - None => match param.expr - { - Some(ref expr) => quote! { + match param.expr { + Some(ref expr) => { + let q = quote! { if #expr { #set_cookie_quote } - }, - None => quote!(), + }; + match param.exprpath { + Some(ref path) => quote!(#path{#q}), + None => q, + } }, - }; - - match quote.is_empty() { - true => quote!(), - false => match param.exprpath { - Some(ref path) => quote!(#path{#quote}), - None => quote, - } + None => quote!(), } }).collect(); @@ -1296,33 +1117,19 @@ pub fn leptos_fluent( initial_language_from_localstorage .iter() - .map(|param| { - let quote = match param.lit { - Some(ref lit) => match lit.value { - true => quote! { - if lang.is_none() { - #localstorage_get_quote - } - }, - false => quote!(), - }, - None => match param.expr { - Some(ref expr) => quote! { - if #expr && lang.is_none() { - #localstorage_get_quote - } - }, - None => quote!(), - }, - }; - - match quote.is_empty() { - true => quote!(), - false => match param.exprpath { - Some(ref path) => quote!(#path{#quote}), - None => quote, - }, + .map(|param| match param.expr { + Some(ref expr) => { + let q = quote! { + if #expr && lang.is_none() { + #localstorage_get_quote + } + }; + match param.exprpath { + Some(ref path) => quote!(#path{#q}), + None => q, + } } + None => quote!(), }) .collect() }; @@ -1346,29 +1153,19 @@ pub fn leptos_fluent( set_language_to_url_param .iter() - .map(|param| { - let quote = match param.lit { - Some(ref lit) => match lit.value { - true => effect_quote.clone(), - false => quote!(), - }, - None => match param.expr { - Some(ref expr) => quote! { - if #expr { - #effect_quote - } - }, - None => quote!(), - }, - }; - - match quote.is_empty() { - true => quote!(), - false => match param.exprpath { - Some(ref path) => quote!(#path{#quote}), - None => quote, - }, + .map(|param| match param.expr { + Some(ref expr) => { + let q = quote! { + if #expr { + #effect_quote + } + }; + match param.exprpath { + Some(ref path) => quote!(#path{#q}), + None => q, + } } + None => quote!(), }) .collect() }; @@ -1384,29 +1181,19 @@ pub fn leptos_fluent( }; initial_language_from_navigator_to_localstorage.iter().map(|param| { - let quote = match param.lit { - Some(ref lit) => match lit.value { - true => effect_quote.clone(), - false => quote!(), - }, - None => { - match param.expr { - Some(ref expr) => quote! { - if #expr { - #effect_quote - } - }, - None => quote!(), + match param.expr { + Some(ref expr) => { + let q = quote! { + if #expr { + #effect_quote + } + }; + match param.exprpath { + Some(ref path) => quote!(#path{#q}), + None => q, } - } - }; - - match quote.is_empty() { - true => quote!(), - false => match param.exprpath { - Some(ref path) => quote!(#path{#quote}), - None => quote, }, + None => quote!(), } }).collect() }; @@ -1421,29 +1208,19 @@ pub fn leptos_fluent( }; initial_language_from_navigator_to_cookie.iter().map(|param| { - let quote = match param.lit { - Some(ref lit) => match lit.value { - true => effect_quote.clone(), - false => quote!(), - }, - None => { - match param.expr { - Some(ref expr) => quote! { - if #expr { - #effect_quote - } - }, - None => quote!(), + match param.expr { + Some(ref expr) => { + let q = quote! { + if #expr { + #effect_quote + } + }; + match param.exprpath { + Some(ref path) => quote!(#path{#q}), + None => q, } - } - }; - - match quote.is_empty() { - true => quote!(), - false => match param.exprpath { - Some(ref path) => quote!(#path{#quote}), - None => quote, }, + None => quote!(), } }).collect() }; @@ -1485,33 +1262,19 @@ pub fn leptos_fluent( initial_language_from_navigator .iter() - .map(|param| { - let quote = match param.lit { - Some(ref lit) => match lit.value { - true => quote! { - if lang.is_none() { - #window_navigator_languages_quote - } - }, - false => quote!(), - }, - None => match param.expr { - Some(ref expr) => quote! { - if #expr && lang.is_none() { - #window_navigator_languages_quote - } - }, - None => quote!(), - }, - }; - - match quote.is_empty() { - true => quote!(), - false => match param.exprpath { - Some(ref path) => quote!(#path{#quote}), - None => quote, - }, + .map(|param| match param.expr { + Some(ref expr) => { + let q = quote! { + if #expr && lang.is_none() { + #window_navigator_languages_quote + } + }; + match param.exprpath { + Some(ref path) => quote!(#path{#q}), + None => q, + } } + None => quote!(), }) .collect() }; @@ -1558,29 +1321,19 @@ pub fn leptos_fluent( set_language_from_navigator .iter() - .map(|param| { - let quote = match param.lit { - Some(ref lit) => match lit.value { - true => effect_quote.clone(), - false => quote!(), - }, - None => match param.expr { - Some(ref expr) => quote! { - if #expr { - #effect_quote - } - }, - None => quote!(), - }, - }; - - match quote.is_empty() { - true => quote!(), - false => match param.exprpath { - Some(ref path) => quote!(#path{#quote}), - None => quote, - }, + .map(|param| match param.expr { + Some(ref expr) => { + let q = quote! { + if #expr { + #effect_quote + } + }; + match param.exprpath { + Some(ref path) => quote!(#path{#q}), + None => q, + } } + None => quote!(), }) .collect() } @@ -1616,31 +1369,19 @@ pub fn leptos_fluent( }; initial_language_from_accept_language_header.iter().map(|param| { - let quote = match param.lit { - Some(ref lit) => match lit.value { - true => quote! { - if lang.is_none() { - #effect_quote - } - }, - false => quote!(), - }, - None => match param.expr { - Some(ref expr) => quote! { + match param.expr { + Some(ref expr) => { + let q = quote! { if #expr && lang.is_none() { #effect_quote } - }, - None => quote!(), - }, - }; - - match quote.is_empty() { - true => quote!(), - false => match param.exprpath { - Some(ref path) => quote!(#path{#quote}), - None => quote, + }; + match param.exprpath { + Some(ref path) => quote!(#path{#q}), + None => q, + } }, + None => quote!(), } }).collect() }; @@ -1668,31 +1409,19 @@ pub fn leptos_fluent( }; initial_language_from_accept_language_header.iter().map(|param| { - let quote = match param.lit { - Some(ref lit) => match lit.value { - true => quote! { - if lang.is_none() { - #effect_quote - } - }, - false => quote!(), - }, - None => match param.expr { - Some(ref expr) => quote! { + match param.expr { + Some(ref expr) => { + let q = quote! { if #expr && lang.is_none() { #effect_quote } - }, - None => quote!(), - }, - }; - - match quote.is_empty() { - true => quote!(), - false => match param.exprpath { - Some(ref path) => quote!(#path{#quote}), - None => quote, + }; + match param.exprpath { + Some(ref path) => quote!(#path{#q}), + None => q, + } }, + None => quote!(), } }).collect() }; @@ -1737,27 +1466,19 @@ pub fn leptos_fluent( }; initial_language_from_cookie_to_localstorage.iter().map(|param| { - let quote = match param.lit { - Some(ref lit) => match lit.value { - true => effect_quote.clone(), - false => quote!(), - }, - None => match param.expr { - Some(ref expr) => quote! { + match param.expr { + Some(ref expr) => { + let q = quote! { if #expr { #effect_quote } - }, - None => quote!(), - }, - }; - - match quote.is_empty() { - true => quote!(), - false => match param.exprpath { - Some(ref path) => quote!(#path{#quote}), - None => quote, + }; + match param.exprpath { + Some(ref path) => quote!(#path{#q}), + None => q, + } }, + None => quote!(), } }).collect() }; @@ -1774,33 +1495,19 @@ pub fn leptos_fluent( initial_language_from_cookie .iter() - .map(|param| { - let quote = match param.lit { - Some(ref lit) => match lit.value { - true => quote! { - if lang.is_none() { - #parse_client_cookie_quote - } - }, - false => quote!(), - }, - None => match param.expr { - Some(ref expr) => quote! { - if #expr && lang.is_none() { - #parse_client_cookie_quote - } - }, - None => quote!(), - }, - }; - - match quote.is_empty() { - true => quote!(), - false => match param.exprpath { - Some(ref path) => quote!(#path{#quote}), - None => quote, - }, + .map(|param| match param.expr { + Some(ref expr) => { + let q = quote! { + if #expr && lang.is_none() { + #parse_client_cookie_quote + } + }; + match param.exprpath { + Some(ref path) => quote!(#path{#q}), + None => q, + } } + None => quote!(), }) .collect() }; @@ -1819,29 +1526,19 @@ pub fn leptos_fluent( set_language_to_cookie .iter() - .map(|param| { - let quote = match param.lit { - Some(ref lit) => match lit.value { - true => effect_quote.clone(), - false => quote!(), - }, - None => match param.expr { - Some(ref expr) => quote! { - if #expr { - #effect_quote - } - }, - None => quote!(), - }, - }; - - match quote.is_empty() { - true => quote!(), - false => match param.exprpath { - Some(ref path) => quote!(#path{#quote}), - None => quote, - }, + .map(|param| match param.expr { + Some(ref expr) => { + let q = quote! { + if #expr { + #effect_quote + } + }; + match param.exprpath { + Some(ref path) => quote!(#path{#q}), + None => q, + } } + None => quote!(), }) .collect() }; @@ -1874,33 +1571,19 @@ pub fn leptos_fluent( initial_language_from_cookie .iter() - .map(|param| { - let quote = match param.lit { - Some(ref lit) => match lit.value { - true => quote! { - if lang.is_none() { - #effect_quote - } - }, - false => quote!(), - }, - None => match param.expr { - Some(ref expr) => quote! { - if #expr && lang.is_none() { - #effect_quote - } - }, - None => quote!(), - }, - }; - - match quote.is_empty() { - true => quote!(), - false => match param.exprpath { - Some(ref path) => quote!(#path{#quote}), - None => quote, - }, + .map(|param| match param.expr { + Some(ref expr) => { + let q = quote! { + if #expr && lang.is_none() { + #effect_quote + } + }; + match param.exprpath { + Some(ref path) => quote!(#path{#q}), + None => q, + } } + None => quote!(), }) .collect() }; @@ -1934,33 +1617,19 @@ pub fn leptos_fluent( initial_language_from_cookie .iter() - .map(|param| { - let quote = match param.lit { - Some(ref lit) => match lit.value { - true => quote! { - if lang.is_none() { - #effect_quote - } - }, - false => quote!(), - }, - None => match param.expr { - Some(ref expr) => quote! { - if #expr && lang.is_none() { - #effect_quote - } - }, - None => quote!(), - }, - }; - - match quote.is_empty() { - true => quote!(), - false => match param.exprpath { - Some(ref path) => quote!(#path{#quote}), - None => quote, - }, + .map(|param| match param.expr { + Some(ref expr) => { + let q = quote! { + if #expr && lang.is_none() { + #effect_quote + } + }; + match param.exprpath { + Some(ref path) => quote!(#path{#q}), + None => q, + } } + None => quote!(), }) .collect() }; @@ -2041,17 +1710,13 @@ pub fn leptos_fluent( }; let leptos_fluent_provide_meta_context_quote: proc_macro2::TokenStream = { - let bool_param = |boolean: &Option, - expr: &Option| - -> proc_macro2::TokenStream { - match boolean { - Some(ref lit) => quote! { #lit }, - None => match expr { + let bool_param = + |expr: &Option| -> proc_macro2::TokenStream { + match expr { Some(ref expr) => quote! { #expr }, None => quote! { false }, - }, - } - }; + } + }; let lit_bool_exprs = |params: &[LitBoolExpr]| -> proc_macro2::TokenStream { @@ -2062,7 +1727,7 @@ pub fn leptos_fluent( params .iter() .map(|param| { - let quote = bool_param(¶m.lit, ¶m.expr); + let quote = bool_param(¶m.expr); match quote.is_empty() { true => quote!(), false => match param.exprpath { diff --git a/leptos-fluent-macros/src/loader.rs b/leptos-fluent-macros/src/loader.rs index 1e57a7da..2217cdff 100644 --- a/leptos-fluent-macros/src/loader.rs +++ b/leptos-fluent-macros/src/loader.rs @@ -112,13 +112,15 @@ macro_rules! parse_litstr_or_expr_param_with_maybe_comptime_exprpath { fn parse_litbool_or_expr_param( input: ParseStream, - litbool: &mut Option, expr: &mut Option, param_name: &'static str, ) -> Result<()> { match input.parse::() { Ok(lit) => { - *litbool = Some(lit); + *expr = Some(syn::Expr::Lit(syn::ExprLit { + attrs: Vec::new(), + lit: syn::Lit::Bool(lit.clone()), + })); Ok(()) } Err(_) => match input.parse::() { @@ -322,7 +324,6 @@ macro_rules! struct_field_init_shorthand_not_supported { #[derive(Default)] pub(crate) struct LitBoolExpr { - pub lit: Option, pub expr: Option, pub exprpath: Option, } @@ -647,7 +648,6 @@ impl Parse for I18nLoader { ); parse_litbool_or_expr_param( input, - &mut param.lit, &mut param.expr, "sync_html_tag_lang", )?; @@ -663,7 +663,6 @@ impl Parse for I18nLoader { ); parse_litbool_or_expr_param( input, - &mut param.lit, &mut param.expr, "sync_html_tag_dir", )?; @@ -692,7 +691,6 @@ impl Parse for I18nLoader { ); parse_litbool_or_expr_param( input, - &mut param.lit, &mut param.expr, "initial_language_from_url_param", )?; @@ -708,7 +706,6 @@ impl Parse for I18nLoader { ); parse_litbool_or_expr_param( input, - &mut param.lit, &mut param.expr, "initial_language_from_url_param_to_localstorage", )?; @@ -724,7 +721,6 @@ impl Parse for I18nLoader { ); parse_litbool_or_expr_param( input, - &mut param.lit, &mut param.expr, "initial_language_from_url_param_to_cookie", )?; @@ -750,7 +746,6 @@ impl Parse for I18nLoader { ); parse_litbool_or_expr_param( input, - &mut param.lit, &mut param.expr, "set_language_to_url_param", )?; @@ -779,7 +774,6 @@ impl Parse for I18nLoader { ); parse_litbool_or_expr_param( input, - &mut param.lit, &mut param.expr, "initial_language_from_localstorage", )?; @@ -795,7 +789,6 @@ impl Parse for I18nLoader { ); parse_litbool_or_expr_param( input, - &mut param.lit, &mut param.expr, "initial_language_from_localstorage_to_cookie", )?; @@ -823,7 +816,6 @@ impl Parse for I18nLoader { ); parse_litbool_or_expr_param( input, - &mut param.lit, &mut param.expr, "set_language_to_localstorage", )?; @@ -839,7 +831,6 @@ impl Parse for I18nLoader { ); parse_litbool_or_expr_param( input, - &mut param.lit, &mut param.expr, "initial_language_from_navigator", )?; @@ -855,7 +846,6 @@ impl Parse for I18nLoader { ); parse_litbool_or_expr_param( input, - &mut param.lit, &mut param.expr, "initial_language_from_navigator_to_localstorage", )?; @@ -871,7 +861,6 @@ impl Parse for I18nLoader { ); parse_litbool_or_expr_param( input, - &mut param.lit, &mut param.expr, "initial_language_from_navigator_to_cookie", )?; @@ -897,7 +886,6 @@ impl Parse for I18nLoader { ); parse_litbool_or_expr_param( input, - &mut param.lit, &mut param.expr, "initial_language_from_accept_language_header", )?; @@ -913,7 +901,6 @@ impl Parse for I18nLoader { ); parse_litbool_or_expr_param( input, - &mut param.lit, &mut param.expr, "set_language_from_navigator", )?; @@ -955,7 +942,6 @@ impl Parse for I18nLoader { ); parse_litbool_or_expr_param( input, - &mut param.lit, &mut param.expr, "initial_language_from_cookie", )?; @@ -971,7 +957,6 @@ impl Parse for I18nLoader { ); parse_litbool_or_expr_param( input, - &mut param.lit, &mut param.expr, "initial_language_from_cookie_to_localstorage", )?; @@ -996,7 +981,6 @@ impl Parse for I18nLoader { ); parse_litbool_or_expr_param( input, - &mut param.lit, &mut param.expr, "set_language_to_cookie", )?; @@ -1021,7 +1005,6 @@ impl Parse for I18nLoader { ); parse_litbool_or_expr_param( input, - &mut param.lit, &mut param.expr, "initial_language_from_server_function_to_cookie", )?; @@ -1039,7 +1022,6 @@ impl Parse for I18nLoader { ); parse_litbool_or_expr_param( input, - &mut param.lit, &mut param.expr, "initial_language_from_server_function_to_localstorage", )?; @@ -1085,7 +1067,6 @@ impl Parse for I18nLoader { ); parse_litbool_or_expr_param( input, - &mut param.lit, &mut param.expr, "initial_language_from_url_path", )?; @@ -1101,7 +1082,6 @@ impl Parse for I18nLoader { ); parse_litbool_or_expr_param( input, - &mut param.lit, &mut param.expr, "initial_language_from_url_path_to_cookie", )?; @@ -1117,7 +1097,6 @@ impl Parse for I18nLoader { ); parse_litbool_or_expr_param( input, - &mut param.lit, &mut param.expr, "initial_language_from_url_path_to_localstorage", )?; @@ -1144,7 +1123,6 @@ impl Parse for I18nLoader { ); parse_litbool_or_expr_param( input, - &mut param.lit, &mut param.expr, "initial_language_from_system", )?; @@ -1175,7 +1153,6 @@ impl Parse for I18nLoader { ); parse_litbool_or_expr_param( input, - &mut param.lit, &mut param.expr, "initial_language_from_data_file", )?; @@ -1206,7 +1183,6 @@ impl Parse for I18nLoader { ); parse_litbool_or_expr_param( input, - &mut param.lit, &mut param.expr, "initial_language_from_system_to_data_file", )?; @@ -1237,7 +1213,6 @@ impl Parse for I18nLoader { ); parse_litbool_or_expr_param( input, - &mut param.lit, &mut param.expr, "set_language_to_data_file", )?; diff --git a/leptos-fluent/Cargo.toml b/leptos-fluent/Cargo.toml index 723078c4..8044722c 100644 --- a/leptos-fluent/Cargo.toml +++ b/leptos-fluent/Cargo.toml @@ -2,7 +2,7 @@ name = "leptos-fluent" description = "Fluent framework for internationalization of Leptos applications" edition.workspace = true -version = "0.1.25" +version = "0.1.26" license = "MIT" documentation.workspace = true repository.workspace = true diff --git a/leptos-fluent/README.md b/leptos-fluent/README.md index f51082ad..81bb4140 100644 --- a/leptos-fluent/README.md +++ b/leptos-fluent/README.md @@ -22,7 +22,7 @@ Add the following to your `Cargo.toml` file: ```toml [dependencies] leptos-fluent = "0.1" -fluent-templates = "0.10" +fluent-templates = "0.11" [features] hydrate = [ diff --git a/leptos-fluent/src/lib.rs b/leptos-fluent/src/lib.rs index 5e4f98c3..c24c0756 100644 --- a/leptos-fluent/src/lib.rs +++ b/leptos-fluent/src/lib.rs @@ -20,7 +20,7 @@ //! ```toml //! [dependencies] //! leptos-fluent = "0.1" -//! fluent-templates = "0.10" +//! fluent-templates = "0.11" //! //! [features] //! hydrate = [