From 0e15adaa6c2cfcd256bc44d7d0515c7119983245 Mon Sep 17 00:00:00 2001 From: Maciej Jur Date: Sun, 23 Jun 2024 22:49:01 +0200 Subject: [PATCH] chore: deps --- Cargo.lock | 134 +++++++++++++++++++++++++++++----------------- Cargo.toml | 59 ++++++++++---------- src/ts/configs.rs | 2 +- 3 files changed, 114 insertions(+), 81 deletions(-) diff --git a/Cargo.lock b/Cargo.lock index 765c4c7..a7d22e2 100644 --- a/Cargo.lock +++ b/Cargo.lock @@ -23,6 +23,12 @@ dependencies = [ "memchr", ] +[[package]] +name = "allocator-api2" +version = "0.2.18" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "5c6cb57a04249c6480766f7f7cef5467412af1490f8d1e243141daddada3264f" + [[package]] name = "android-tzdata" version = "0.1.1" @@ -87,6 +93,12 @@ dependencies = [ "windows-sys 0.52.0", ] +[[package]] +name = "arraydeque" +version = "0.5.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "7d902e3d592a523def97af8f317b08ce16b7ab854c1985a0c671e6f15cebc236" + [[package]] name = "autocfg" version = "1.1.0" @@ -147,9 +159,9 @@ checksum = "514de17de45fdb8dc022b1a7975556c53c86f9f0aa5f534b98977b171857c2c9" [[package]] name = "camino" -version = "1.1.6" +version = "1.1.7" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c59e92b5a388f549b863a7bea62612c09f24c8393560709a54558a9abdfb3b9c" +checksum = "e0ec6b951b160caa93cc0c7b209e5a3bff7aae9062213451ac99493cd844c239" [[package]] name = "cc" @@ -165,9 +177,9 @@ checksum = "baf1de4339761588bc0619e3cbc0120ee582ebb74b53b4efbf79117bd2da40fd" [[package]] name = "chrono" -version = "0.4.35" +version = "0.4.38" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "8eaf5903dcbc0a39312feb77df2ff4c76387d591b9fc7b04a238dcf8bb62639a" +checksum = "a21f936df1771bf62b77f047b726c4625ff2e8aa607c01ec06e5a05bd8463401" dependencies = [ "android-tzdata", "iana-time-zone", @@ -206,9 +218,9 @@ dependencies = [ [[package]] name = "citationberg" -version = "0.3.0" +version = "0.3.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "82108f2b676c954076d2e5044f19a6a03887b24bd42804f322e0650d13035899" +checksum = "d259fe9fd78ffa05a119581d20fddb50bfba428311057b12741ffb9015123d0b" dependencies = [ "quick-xml", "serde", @@ -216,9 +228,9 @@ dependencies = [ [[package]] name = "clap" -version = "4.5.4" +version = "4.5.7" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "90bc066a67923782aa8515dbaea16946c5bcc5addbd668bb80af688e53e548a0" +checksum = "5db83dced34638ad474f39f250d7fea9598bdd239eaced1bdf45d597da0f433f" dependencies = [ "clap_builder", "clap_derive", @@ -226,9 +238,9 @@ dependencies = [ [[package]] name = "clap_builder" -version = "4.5.2" +version = "4.5.7" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ae129e2e766ae0ec03484e609954119f123cc1fe650337e155d03b022f24f7b4" +checksum = "f7e204572485eb3fbf28f871612191521df159bc3e15a9f5064c66dba3a8c05f" dependencies = [ "anstream", "anstyle", @@ -238,9 +250,9 @@ dependencies = [ [[package]] name = "clap_derive" -version = "4.5.4" +version = "4.5.5" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "528131438037fd55894f62d6e9f068b8f45ac57ffa77517819645d10aed04f64" +checksum = "c780290ccf4fb26629baa7a1081e68ced113f1d3ec302fa5948f1c381ebf06c6" dependencies = [ "heck 0.5.0", "proc-macro2", @@ -422,13 +434,22 @@ checksum = "11157ac094ffbdde99aa67b23417ebdd801842852b500e395a45a9c0aac03e4a" [[package]] name = "emojis" -version = "0.6.1" +version = "0.6.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "4ee61eb945bff65ee7d19d157d39c67c33290ff0742907413fd5eefd29edc979" +checksum = "9f619a926616ae7149a0d82610b051134a0d6c4ae2962d990c06c847a445c5d9" dependencies = [ "phf", ] +[[package]] +name = "encoding_rs" +version = "0.8.34" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "b45de904aa0b010bce2ab45264d0631681847fa7b6f2eaa7dab7619943bc4f59" +dependencies = [ + "cfg-if", +] + [[package]] name = "equivalent" version = "1.0.1" @@ -497,8 +518,10 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "190092ea657667030ac6a35e305e62fc4dd69fd98ac98631e5d3a2b1575a12b5" dependencies = [ "cfg-if", + "js-sys", "libc", "wasi", + "wasm-bindgen", ] [[package]] @@ -509,18 +532,19 @@ checksum = "d2fabcfbdc87f4758337ca535fb41a6d701b65693ce38287d856d1674551ec9b" [[package]] name = "grass" -version = "0.13.2" +version = "0.13.3" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b89786a806d5b192cf4e573f9831c847a455a142d000c922bdfc1e5edad14303" +checksum = "a46def7216d331efa51a6aa796ef777bfdfe9605378382827a553344b7e5eefc" dependencies = [ + "getrandom", "grass_compiler", ] [[package]] name = "grass_compiler" -version = "0.13.2" +version = "0.13.3" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "7cf7d155dd7cef20195016d01005033a5521aad307033f0f8e8bf0a02f5f7554" +checksum = "f39216c1843182f78541276fec96f88406861f16aa19cc9f8add70f8e67b7577" dependencies = [ "codemap", "indexmap", @@ -532,13 +556,13 @@ dependencies = [ [[package]] name = "gray_matter" -version = "0.2.6" +version = "0.2.8" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "1cf2fb99fac0b821a4e61c61abff076324bb0e5c3b4a83815bbc3518a38971ad" +checksum = "31ee6a6070bad7c953b0c8be9367e9372181fed69f3e026c4eb5160d8b3c0222" dependencies = [ "serde", "serde_json", - "yaml-rust", + "yaml-rust2", ] [[package]] @@ -565,12 +589,25 @@ name = "hashbrown" version = "0.14.3" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "290f1a1d9242c78d09ce40a5e87e7554ee637af1351968159f4952f028f75604" +dependencies = [ + "ahash", + "allocator-api2", +] + +[[package]] +name = "hashlink" +version = "0.8.4" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "e8094feaf31ff591f651a2664fb9cfd92bba7a60ce3197265e9482ebe753c8f7" +dependencies = [ + "hashbrown 0.14.3", +] [[package]] name = "hayagriva" -version = "0.5.2" +version = "0.5.3" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "cc2e670de5191df083ddd112cd253049f8213277ccf0c15e18a8bf10e6c666cc" +checksum = "1d0d20c98b77b86ce737876b2a1653e2e6abbeee84afbb39d72111091191c97a" dependencies = [ "biblatex", "ciborium", @@ -627,9 +664,9 @@ checksum = "d897f394bad6a705d5f4104762e116a75639e470d80901eed05a860a95cb1904" [[package]] name = "hypertext" -version = "0.5.0" +version = "0.5.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "0fcd5f614cfb5ad8790b824731abb908d4095f38fd8ecc4be22f5882e2384708" +checksum = "6d15403549f1569aed8d0123f6fe060f96e5688e55a2c284959db74930e5c27d" dependencies = [ "html-escape", "hypertext-macros", @@ -815,12 +852,6 @@ dependencies = [ "copy_dir", ] -[[package]] -name = "linked-hash-map" -version = "0.5.6" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "0717cef1bc8b636c6e1c1bbdefc09e6322da8a9321966e8928ef80d20f7f770f" - [[package]] name = "log" version = "0.4.21" @@ -1002,8 +1033,9 @@ dependencies = [ [[package]] name = "pulldown-cmark" -version = "0.10.0" -source = "git+https://github.com/pulldown-cmark/pulldown-cmark.git?branch=branch_0.11#2540d4095d5f94fd972c93b927e9bec83b0c5079" +version = "0.11.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "8746739f11d39ce5ad5c2520a9b75285310dbfe78c541ccf832d38615765aec0" dependencies = [ "bitflags 2.5.0", "getopts", @@ -1014,8 +1046,9 @@ dependencies = [ [[package]] name = "pulldown-cmark-escape" -version = "0.10.0" -source = "git+https://github.com/pulldown-cmark/pulldown-cmark.git?branch=branch_0.11#2540d4095d5f94fd972c93b927e9bec83b0c5079" +version = "0.11.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "007d8adb5ddab6f8e3f491ac63566a7d5002cc7ed73901f72057943fa71ae1ae" [[package]] name = "quick-js" @@ -1087,9 +1120,9 @@ dependencies = [ [[package]] name = "regex" -version = "1.10.4" +version = "1.10.5" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c117dbdfde9c8308975b6a18d71f3f385c89461f7b3fb054288ecf2a2058ba4c" +checksum = "b91213439dad192326a0d7c6ee3955910425f441d7038e0d6933b0aec5c4517f" dependencies = [ "aho-corasick", "memchr", @@ -1151,18 +1184,18 @@ dependencies = [ [[package]] name = "serde" -version = "1.0.197" +version = "1.0.203" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "3fb1c873e1b9b056a4dc4c0c198b24c3ffa059243875552b2bd0933b1aee4ce2" +checksum = "7253ab4de971e72fb7be983802300c30b5a7f0c2e56fab8abfc6a214307c0094" dependencies = [ "serde_derive", ] [[package]] name = "serde_derive" -version = "1.0.197" +version = "1.0.203" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "7eb0b34b42edc17f6b7cac84a52a1c5f0e1bb2227e997ca9011ea3dd34e8610b" +checksum = "500cbc0ebeb6f46627f50f3f5811ccf6bf00643be300b4c3eabc0ef55dc5b5ba" dependencies = [ "proc-macro2", "quote", @@ -1443,8 +1476,8 @@ dependencies = [ [[package]] name = "tree-sitter-query" -version = "0.2.1" -source = "git+https://github.com/tree-sitter-grammars/tree-sitter-query?rev=87b1a3d#87b1a3dc6c5a76c5cedcdfc60efe75805468cb90" +version = "0.4.0" +source = "git+https://github.com/tree-sitter-grammars/tree-sitter-query?rev=f767fb0#f767fb0ac5e711b6d44c5e0c8d1f349687a86ce0" dependencies = [ "cc", "tree-sitter", @@ -1502,9 +1535,9 @@ dependencies = [ [[package]] name = "tungstenite" -version = "0.21.0" +version = "0.23.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "9ef1a641ea34f399a848dea702823bbecfb4c486f911735368f1f137cb8257e1" +checksum = "6e2e2ce1e47ed2994fd43b04c8f618008d4cabdd5ee34027cf14f9d918edd9c8" dependencies = [ "byteorder", "bytes", @@ -1515,7 +1548,6 @@ dependencies = [ "rand", "sha1", "thiserror", - "url", "utf-8", ] @@ -1877,12 +1909,14 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "32b752e52a2da0ddfbdbcc6fceadfeede4c939ed16d13e648833a61dfb611ed8" [[package]] -name = "yaml-rust" -version = "0.4.5" +name = "yaml-rust2" +version = "0.8.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "56c1936c4cc7a1c9ab21a1ebb602eb942ba868cbd44a99cb7cdc5892335e1c85" +checksum = "8902160c4e6f2fb145dbe9d6760a75e3c9522d8bf796ed7047c85919ac7115f8" dependencies = [ - "linked-hash-map", + "arraydeque", + "encoding_rs", + "hashlink", ] [[package]] diff --git a/Cargo.toml b/Cargo.toml index 527922a..5fc7957 100644 --- a/Cargo.toml +++ b/Cargo.toml @@ -4,43 +4,42 @@ version = "0.1.0" edition = "2021" [dependencies] -camino = "1.1.6" -chrono = "0.4.35" -clap = { version = "4.5.4", features = ["derive"] } -emojis = "0.6.1" -glob = "0.3.1" -grass = { version = "0.13.2", default-features = false, features = ["random"] } -gray_matter = { version = "0.2.6", default-features = false, features = ["yaml"] } -hayagriva = "0.5.2" -hypertext = "0.5.0" -katex = "0.4.6" -once_cell = "1.19.0" -regex = "1.10.4" -serde = { version = "1.0.197", features = ["derive"] } +camino = "1.1.7" +chrono = "0.4.38" +clap = { version = "4.5.7", features = ["derive"] } +emojis = "0.6.2" +glob = "0.3.1" +grass = { version = "0.13.3", default-features = false, features = ["random"] } +gray_matter = { version = "0.2.8", default-features = false, features = ["yaml"] } +hayagriva = "0.5.3" +hypertext = "0.5.1" +katex = "0.4.6" +once_cell = "1.19.0" +regex = "1.10.5" +serde = { version = "1.0.203", features = ["derive"] } # Watch -notify = "6.1.1" -notify-debouncer-mini = "0.4.1" -tungstenite = "0.21.0" +notify = "6.1.1" +notify-debouncer-mini = "0.4.1" +tungstenite = "0.23.0" # Markdown -pulldown-cmark = { git = "https://github.com/pulldown-cmark/pulldown-cmark.git", branch = "branch_0.11" } +pulldown-cmark = "0.11.0" # Treesitter -tree-sitter = "0.22" -tree-sitter-highlight = "0.22" +tree-sitter = "0.22" +tree-sitter-highlight = "0.22" # Treesitter languages -# tree-sitter-astro = { git = "https://github.com/virchau13/tree-sitter-astro.git", rev = "e924787e12e8a03194f36a113290ac11d6dc10f3" } -tree-sitter-css = "0.21" -tree-sitter-haskell = "0.21" -tree-sitter-html = "0.20.3" +tree-sitter-css = "0.21" +tree-sitter-haskell = "0.21" +tree-sitter-html = "0.20" tree-sitter-javascript = "0.21" -tree-sitter-md = "0.2" -tree-sitter-python = "0.21" -tree-sitter-regex = "0.21" -tree-sitter-rust = "0.21" -tree-sitter-scss = "1" -tree-sitter-query = { git = "https://github.com/tree-sitter-grammars/tree-sitter-query", rev = "87b1a3d" } -tree-sitter-toml-ng = "0.6" +tree-sitter-md = "0.2" +tree-sitter-python = "0.21" +tree-sitter-regex = "0.21" +tree-sitter-rust = "0.21" +tree-sitter-scss = "1.0" +tree-sitter-query = { git = "https://github.com/tree-sitter-grammars/tree-sitter-query", rev = "f767fb0" } +tree-sitter-toml-ng = "0.6" tree-sitter-typescript = "0.21" diff --git a/src/ts/configs.rs b/src/ts/configs.rs index dcc0e0a..c9f9a30 100644 --- a/src/ts/configs.rs +++ b/src/ts/configs.rs @@ -162,7 +162,7 @@ static CONFIGS: Lazy> = Lazy::new( "query", tree_sitter_query::language(), tree_sitter_query::HIGHLIGHTS_QUERY, - "", + tree_sitter_query::INJECTIONS_QUERY, "", ), language!(