From 4acc39b23761ff13d367868f8e9dd4518cf09e92 Mon Sep 17 00:00:00 2001 From: Myriad-Dreamin <35292584+Myriad-Dreamin@users.noreply.github.com> Date: Thu, 11 Jul 2024 11:03:55 +0800 Subject: [PATCH] build: rearrange dependencies (#399) --- Cargo.lock | 311 +++++++++--------- Cargo.toml | 126 ++++--- crates/tinymist-query/Cargo.toml | 17 +- crates/tinymist-query/src/adt/interner.rs | 2 +- crates/tinymist-query/src/adt/snapshot_map.rs | 2 +- crates/tinymist-query/src/ty/mod.rs | 11 +- crates/tinymist/Cargo.toml | 17 +- crates/typst-preview/Cargo.toml | 4 +- 8 files changed, 261 insertions(+), 229 deletions(-) diff --git a/Cargo.lock b/Cargo.lock index 80a937cd..e124538c 100644 --- a/Cargo.lock +++ b/Cargo.lock @@ -176,13 +176,13 @@ checksum = "96d30a06541fbafbc7f82ed10c06164cfbd2c401138f6addd8404629c4b16711" [[package]] name = "async-trait" -version = "0.1.80" +version = "0.1.81" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c6fa2087f2753a7da8cc1c0dbfcf89579dd57458e36769de5ac750b4671737ca" +checksum = "6e0c28dcc82d7c8ead5cb13beb15405b57b8546e93215673ff8ca0349a028107" dependencies = [ "proc-macro2", "quote", - "syn 2.0.68", + "syn 2.0.70", ] [[package]] @@ -421,9 +421,9 @@ dependencies = [ [[package]] name = "cc" -version = "1.0.101" +version = "1.1.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ac367972e516d45567c7eafc73d24e1c193dcf200a8d94e9db7b3d38b349572d" +checksum = "eaff6f8ce506b9773fa786672d63fc7a191ffea1be33f72bbd4aeacefca9ffc8" dependencies = [ "jobserver", "libc", @@ -462,11 +462,9 @@ checksum = "a21f936df1771bf62b77f047b726c4625ff2e8aa607c01ec06e5a05bd8463401" dependencies = [ "android-tzdata", "iana-time-zone", - "js-sys", "num-traits", "serde", - "wasm-bindgen", - "windows-targets 0.52.5", + "windows-targets 0.52.6", ] [[package]] @@ -502,15 +500,15 @@ version = "0.3.1" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "d259fe9fd78ffa05a119581d20fddb50bfba428311057b12741ffb9015123d0b" dependencies = [ - "quick-xml", + "quick-xml 0.31.0", "serde", ] [[package]] name = "clap" -version = "4.5.7" +version = "4.5.9" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "5db83dced34638ad474f39f250d7fea9598bdd239eaced1bdf45d597da0f433f" +checksum = "64acc1846d54c1fe936a78dc189c34e28d3f5afc348403f28ecf53660b9b8462" dependencies = [ "clap_builder", "clap_derive", @@ -518,9 +516,9 @@ dependencies = [ [[package]] name = "clap_builder" -version = "4.5.7" +version = "4.5.9" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f7e204572485eb3fbf28f871612191521df159bc3e15a9f5064c66dba3a8c05f" +checksum = "6fb8393d67ba2e7bfaf28a23458e4e2b543cc73a99595511eb207fdb8aede942" dependencies = [ "anstream", "anstyle", @@ -533,9 +531,9 @@ dependencies = [ [[package]] name = "clap_complete" -version = "4.5.6" +version = "4.5.8" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "fbca90c87c2a04da41e95d1856e8bcd22f159bdbfa147314d2ce5218057b0e58" +checksum = "5b4be9c4c4b1f30b78d8a750e0822b6a6102d97e62061c583a6c1dea2dfb33ae" dependencies = [ "clap", ] @@ -552,14 +550,14 @@ dependencies = [ [[package]] name = "clap_derive" -version = "4.5.5" +version = "4.5.8" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c780290ccf4fb26629baa7a1081e68ced113f1d3ec302fa5948f1c381ebf06c6" +checksum = "2bac35c6dafb060fd4d275d9a4ffae97917c13a6327903a8be2153cd964f7085" dependencies = [ "heck 0.5.0", "proc-macro2", "quote", - "syn 2.0.68", + "syn 2.0.70", ] [[package]] @@ -570,9 +568,9 @@ checksum = "4b82cf0babdbd58558212896d1a4272303a57bdb245c2bf1147185fb45640e70" [[package]] name = "clap_mangen" -version = "0.2.21" +version = "0.2.22" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "74b70fc13e60c0e1d490dc50eb73a749be6d81f4ef03783df1d9b7b0c62bc937" +checksum = "f50dde5bc0c853d6248de457e5eb6e5a674a54b93810a34ded88d882ca1fe2de" dependencies = [ "clap", "roff", @@ -647,7 +645,7 @@ checksum = "54af6ac68ada2d161fa9cc1ab52676228e340866d094d6542107e74b82acc095" dependencies = [ "proc-macro2", "quote", - "syn 2.0.68", + "syn 2.0.70", ] [[package]] @@ -658,7 +656,7 @@ checksum = "c8936e42f9b4f5bdfaf23700609ac1f11cb03ad4c1ec128a4ee4fd0903e228db" dependencies = [ "proc-macro2", "quote", - "syn 2.0.68", + "syn 2.0.70", ] [[package]] @@ -808,12 +806,12 @@ dependencies = [ [[package]] name = "darling" -version = "0.20.9" +version = "0.20.10" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "83b2eb4d90d12bdda5ed17de686c2acb4c57914f8f921b8da7e112b5a36f3fe1" +checksum = "6f63b86c8a8826a49b8c21f08a2d07338eec8d900540f8630dc76284be802989" dependencies = [ - "darling_core 0.20.9", - "darling_macro 0.20.9", + "darling_core 0.20.10", + "darling_macro 0.20.10", ] [[package]] @@ -832,16 +830,16 @@ dependencies = [ [[package]] name = "darling_core" -version = "0.20.9" +version = "0.20.10" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "622687fe0bac72a04e5599029151f5796111b90f1baaa9b544d807a5e31cd120" +checksum = "95133861a8032aaea082871032f5815eb9e98cef03fa916ab4500513994df9e5" dependencies = [ "fnv", "ident_case", "proc-macro2", "quote", "strsim 0.11.1", - "syn 2.0.68", + "syn 2.0.70", ] [[package]] @@ -857,13 +855,13 @@ dependencies = [ [[package]] name = "darling_macro" -version = "0.20.9" +version = "0.20.10" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "733cabb43482b1a1b53eee8583c2b9e8684d592215ea83efd305dd31bc2f0178" +checksum = "d336a2a514f6ccccaa3e09b02d41d35330c07ddf03a62165fcec10bb561c7806" dependencies = [ - "darling_core 0.20.9", + "darling_core 0.20.10", "quote", - "syn 2.0.68", + "syn 2.0.70", ] [[package]] @@ -942,7 +940,7 @@ dependencies = [ "lazy_static", "mintex", "parking_lot", - "rustc-hash", + "rustc-hash 1.1.0", "serde", "serde_json", "thousands", @@ -1008,7 +1006,7 @@ checksum = "97369cbbc041bc366949bc74d34658d6cda5621039731c6310521892a3a20ae0" dependencies = [ "proc-macro2", "quote", - "syn 2.0.68", + "syn 2.0.70", ] [[package]] @@ -1103,7 +1101,7 @@ checksum = "0d28318a75d4aead5c4db25382e8ef717932d0346600cacae6357eb5941bc5ff" dependencies = [ "proc-macro2", "quote", - "syn 2.0.68", + "syn 2.0.70", ] [[package]] @@ -1343,7 +1341,7 @@ checksum = "87750cf4b7a4c0625b1529e4c543c2182106e4dedc60a2a6455e00d212c489ac" dependencies = [ "proc-macro2", "quote", - "syn 2.0.68", + "syn 2.0.70", ] [[package]] @@ -1434,9 +1432,9 @@ checksum = "40ecd4077b5ae9fd2e9e169b102c6c330d0605168eb0e8bf79952b256dbefffd" [[package]] name = "git2" -version = "0.18.3" +version = "0.19.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "232e6a7bfe35766bf715e55a88b39a700596c0ccfd88cd3680b4cdb40d66ef70" +checksum = "b903b73e45dc0c6c596f2d37eccece7c1c8bb6e4407b001096387c63d0d93724" dependencies = [ "bitflags 2.6.0", "libc", @@ -1624,9 +1622,9 @@ checksum = "9a3a5bfb195931eeb336b2a7b4d761daec841b97f947d34394601737a7bba5e4" [[package]] name = "hyper" -version = "0.14.29" +version = "0.14.30" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f361cde2f109281a220d4307746cdfd5ee3f410da58a70377762396775634b33" +checksum = "a152ddd61dfaec7273fe8419ab357f33aee0d914c5f4efbf0d96fa749eea5ec9" dependencies = [ "bytes", "futures-channel", @@ -1824,7 +1822,7 @@ checksum = "1ec89e9337638ecdc08744df490b221a7399bf8d164eb52a665454e60e075ad6" dependencies = [ "proc-macro2", "quote", - "syn 2.0.68", + "syn 2.0.70", ] [[package]] @@ -2030,15 +2028,6 @@ dependencies = [ "either", ] -[[package]] -name = "itertools" -version = "0.12.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ba291022dbbd398a455acf126c1e341954079855bc60dfdda641363bd6922569" -dependencies = [ - "either", -] - [[package]] name = "itertools" version = "0.13.0" @@ -2130,9 +2119,9 @@ checksum = "97b3888a4aecf77e811145cadf6eef5901f4782c53886191b2f693f24761847c" [[package]] name = "libgit2-sys" -version = "0.16.2+1.7.2" +version = "0.17.0+1.8.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ee4126d8b4ee5c9d9ea891dd875cfdc1e9d0950437179104b183d7d8a74d24e8" +checksum = "10472326a8a6477c3c20a64547b0059e4b0d086869eee31e6d7da728a8eb7224" dependencies = [ "cc", "libc", @@ -2168,12 +2157,6 @@ dependencies = [ "vcpkg", ] -[[package]] -name = "line-wrap" -version = "0.2.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "dd1bc4d24ad230d21fb898d1116b1801d7adfc449d42026475862ab48b11e70e" - [[package]] name = "linked-hash-map" version = "0.5.6" @@ -2217,9 +2200,9 @@ dependencies = [ [[package]] name = "log" -version = "0.4.21" +version = "0.4.22" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "90ed8c1e510134f979dbc4f070f87d4313098b704861a105fe34231c70a3901c" +checksum = "a7a70ba024b9dc04c27ea2f0c0548feb474ec5c54bba33a7f72f873a39d07b24" [[package]] name = "lsp-server" @@ -2269,9 +2252,9 @@ checksum = "6877bb514081ee2a7ff5ef9de3281f14a4dd4bceac4c09388074a6b5df8a139a" [[package]] name = "mime_guess" -version = "2.0.4" +version = "2.0.5" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "4192263c238a5f0d0c6bfd21f336a313a4ce1c450542449ca191bb657b4642ef" +checksum = "f7c44f8e672c00fe5308fa235f821cb4198414e1c77935c1ab6948d3fd78550e" dependencies = [ "mime", "unicase", @@ -2414,9 +2397,9 @@ checksum = "e25be21376a772d15f97ae789845340a9651d3c4246ff5ebb6a2b35f9c37bd31" [[package]] name = "object" -version = "0.36.0" +version = "0.36.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "576dfe1fc8f9df304abb159d767a29d0476f7750fbf8aa7ad07816004a207434" +checksum = "081b846d1d56ddfc18fdf1a922e4f6e07a11768ea1b92dec44e42b72712ccfce" dependencies = [ "memchr", ] @@ -2429,9 +2412,9 @@ checksum = "3fdb12b2476b595f9358c5161aa467c2438859caa136dec86c26fdd2efe17b92" [[package]] name = "open" -version = "5.1.4" +version = "5.3.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b5ca541f22b1c46d4bb9801014f234758ab4297e7870b904b6a8415b980a7388" +checksum = "61a877bf6abd716642a53ef1b89fb498923a4afca5c754f9050b4d081c05c4b3" dependencies = [ "is-wsl", "libc", @@ -2461,7 +2444,7 @@ checksum = "a948666b637a0f465e8564c73e89d4dde00d72d4d473cc972f390fc3dcee7d9c" dependencies = [ "proc-macro2", "quote", - "syn 2.0.68", + "syn 2.0.70", ] [[package]] @@ -2509,7 +2492,7 @@ dependencies = [ "by_address", "proc-macro2", "quote", - "syn 2.0.68", + "syn 2.0.70", ] [[package]] @@ -2532,7 +2515,7 @@ dependencies = [ "libc", "redox_syscall 0.5.2", "smallvec", - "windows-targets 0.52.5", + "windows-targets 0.52.6", ] [[package]] @@ -2601,7 +2584,7 @@ dependencies = [ "phf_shared", "proc-macro2", "quote", - "syn 2.0.68", + "syn 2.0.70", ] [[package]] @@ -2636,7 +2619,7 @@ checksum = "2f38a4412a78282e09a2cf38d195ea5420d15ba0602cb375210efbc877243965" dependencies = [ "proc-macro2", "quote", - "syn 2.0.68", + "syn 2.0.70", ] [[package]] @@ -2668,14 +2651,13 @@ checksum = "d231b230927b5e4ad203db57bbcbee2802f6bce620b1e4a9024a07d94e2907ec" [[package]] name = "plist" -version = "1.6.1" +version = "1.7.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d9d34169e64b3c7a80c8621a48adaf44e0cf62c78a9b25dd9dd35f1881a17cf9" +checksum = "42cf17e9a1800f5f396bc67d193dc9411b59012a5876445ef450d449881e1016" dependencies = [ - "base64 0.21.7", + "base64 0.22.1", "indexmap 2.2.6", - "line-wrap", - "quick-xml", + "quick-xml 0.32.0", "serde", "time", ] @@ -2801,6 +2783,15 @@ dependencies = [ "serde", ] +[[package]] +name = "quick-xml" +version = "0.32.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "1d3a6e5838b60e0e8fa7a43f22ade549a37d61f8bdbe636d0d7816191de969c2" +dependencies = [ + "memchr", +] + [[package]] name = "quote" version = "1.0.36" @@ -2912,7 +2903,7 @@ dependencies = [ "parking_lot", "path-clean", "rkyv", - "rustc-hash", + "rustc-hash 1.1.0", "serde", "serde_json", "serde_repr", @@ -2935,7 +2926,7 @@ dependencies = [ "parking_lot", "reflexo", "rpds", - "rustc-hash", + "rustc-hash 1.1.0", "typst", ] @@ -2963,7 +2954,7 @@ dependencies = [ "reflexo", "reflexo-vfs", "reqwest", - "rustc-hash", + "rustc-hash 1.1.0", "serde", "serde_json", "sha2", @@ -3076,9 +3067,9 @@ dependencies = [ [[package]] name = "rgb" -version = "0.8.37" +version = "0.8.44" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "05aaa8004b64fd573fc9d002f4e632d51ad4f026c2b5ba95fcb6c2f32c2c47d8" +checksum = "1aee83dc281d5a3200d37b299acd13b81066ea126a7f16f0eae70fc9aed241d9" dependencies = [ "bytemuck", ] @@ -3183,6 +3174,12 @@ version = "1.1.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "08d43f7aa6b08d49f382cde6a7982047c3426db949b1424bc4b7ec9ae12c6ce2" +[[package]] +name = "rustc-hash" +version = "2.0.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "583034fd73374156e66797ed8e5b0d5690409c9226b22d87cb7f19821c05d152" + [[package]] name = "rustc_version" version = "0.4.0" @@ -3338,29 +3335,29 @@ dependencies = [ [[package]] name = "serde" -version = "1.0.203" +version = "1.0.204" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "7253ab4de971e72fb7be983802300c30b5a7f0c2e56fab8abfc6a214307c0094" +checksum = "bc76f558e0cbb2a839d37354c575f1dc3fdc6546b5be373ba43d95f231bf7c12" dependencies = [ "serde_derive", ] [[package]] name = "serde_derive" -version = "1.0.203" +version = "1.0.204" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "500cbc0ebeb6f46627f50f3f5811ccf6bf00643be300b4c3eabc0ef55dc5b5ba" +checksum = "e0cd7e117be63d3c3678776753929474f3b04a43a080c744d6b0ae2a8c28e222" dependencies = [ "proc-macro2", "quote", - "syn 2.0.68", + "syn 2.0.70", ] [[package]] name = "serde_json" -version = "1.0.118" +version = "1.0.120" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d947f6b3163d8857ea16c4fa0dd4840d52f3041039a85decd46867eb1abef2e4" +checksum = "4e0d21c9a8cae1235ad58a00c11cb40d4b1e5c784f1ef2c537876ed6ffd8b7c5" dependencies = [ "itoa", "ryu", @@ -3375,7 +3372,7 @@ checksum = "6c64451ba24fc7a6a2d60fc75dd9c83c90903b19028d4eff35e88fc1e86564e9" dependencies = [ "proc-macro2", "quote", - "syn 2.0.68", + "syn 2.0.70", ] [[package]] @@ -3401,9 +3398,9 @@ dependencies = [ [[package]] name = "serde_with" -version = "3.8.1" +version = "3.8.3" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "0ad483d2ab0149d5a5ebcd9972a3852711e0153d863bf5a5d0391d28883c4a20" +checksum = "e73139bc5ec2d45e6c5fd85be5a46949c1c39a4c18e56915f5eb4c12f975e377" dependencies = [ "base64 0.22.1", "chrono", @@ -3419,14 +3416,14 @@ dependencies = [ [[package]] name = "serde_with_macros" -version = "3.8.1" +version = "3.8.3" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "65569b702f41443e8bc8bbb1c5779bd0450bbe723b56198980e80ec45780bce2" +checksum = "b80d3d6b56b64335c0180e5ffde23b3c5e08c14c585b51a15bd0e95393f46703" dependencies = [ - "darling 0.20.9", + "darling 0.20.10", "proc-macro2", "quote", - "syn 2.0.68", + "syn 2.0.70", ] [[package]] @@ -3626,7 +3623,7 @@ dependencies = [ "proc-macro2", "quote", "rustversion", - "syn 2.0.68", + "syn 2.0.70", ] [[package]] @@ -3639,7 +3636,7 @@ dependencies = [ "proc-macro2", "quote", "rustversion", - "syn 2.0.68", + "syn 2.0.70", ] [[package]] @@ -3686,9 +3683,9 @@ dependencies = [ [[package]] name = "syn" -version = "2.0.68" +version = "2.0.70" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "901fa70d88b9d6c98022e23b4136f9f3e54e4662c3bc1bd1d84a42a9a0f0c1e9" +checksum = "2f0209b68b3613b093e0ec905354eccaedcfe83b8cb37cbdeae64026c3064c16" dependencies = [ "proc-macro2", "quote", @@ -3729,7 +3726,7 @@ checksum = "c8af7666ab7b6390ab78131fb5b0fce11d6b7a6951602017c35fa82800708971" dependencies = [ "proc-macro2", "quote", - "syn 2.0.68", + "syn 2.0.70", ] [[package]] @@ -3863,7 +3860,7 @@ checksum = "46c3384250002a6d5af4d114f2845d37b57521033f30d5c3f46c4d70e1197533" dependencies = [ "proc-macro2", "quote", - "syn 2.0.68", + "syn 2.0.70", ] [[package]] @@ -3940,7 +3937,6 @@ dependencies = [ "await-tree", "base64 0.22.1", "cargo_metadata", - "chrono", "clap", "clap_builder", "clap_complete", @@ -3953,7 +3949,7 @@ dependencies = [ "env_logger", "futures", "hyper", - "itertools 0.12.1", + "itertools 0.13.0", "log", "lsp-server", "lsp-types", @@ -4012,13 +4008,12 @@ dependencies = [ "dashmap", "ecow 0.2.2", "ena", - "fxhash", "hashbrown 0.14.5", "hex", "if_chain", "indexmap 2.2.6", "insta", - "itertools 0.12.1", + "itertools 0.13.0", "log", "lsp-types", "once_cell", @@ -4029,7 +4024,7 @@ dependencies = [ "regex", "rust_iso3166", "rust_iso639", - "rustc-hash", + "rustc-hash 2.0.0", "serde", "serde_json", "serde_yaml", @@ -4072,9 +4067,9 @@ dependencies = [ [[package]] name = "tinyvec" -version = "1.6.1" +version = "1.8.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c55115c6fbe2d2bef26eb09ad74bde02d8255476fc0c7b515ef09fbb35742d82" +checksum = "445e881f4f6d382d5f27c034e25eb92edd7c784ceab92a0937db7f2e9471b938" dependencies = [ "tinyvec_macros", ] @@ -4112,7 +4107,7 @@ checksum = "5f5ae998a069d4b5aba8ee9dad856af7d520c3699e6159b185c2acd48155d39a" dependencies = [ "proc-macro2", "quote", - "syn 2.0.68", + "syn 2.0.70", ] [[package]] @@ -4182,7 +4177,7 @@ dependencies = [ "serde", "serde_spanned", "toml_datetime", - "toml_edit 0.22.14", + "toml_edit 0.22.15", ] [[package]] @@ -4209,9 +4204,9 @@ dependencies = [ [[package]] name = "toml_edit" -version = "0.22.14" +version = "0.22.15" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f21c7aaf97f1bd9ca9d4f9e73b0a6c74bd5afef56f2bc931943a6e1c37e04e38" +checksum = "d59a3a72298453f564e2b111fa896f8d07fabb36f51f06d7e875fc5e0b5a3ef1" dependencies = [ "indexmap 2.2.6", "serde", @@ -4251,7 +4246,7 @@ checksum = "34704c8d6ebcbc939824180af020566b01a7c01f80641264eba0999f6c2b6be7" dependencies = [ "proc-macro2", "quote", - "syn 2.0.68", + "syn 2.0.70", ] [[package]] @@ -4406,7 +4401,7 @@ dependencies = [ "heck 0.4.1", "proc-macro2", "quote", - "syn 2.0.68", + "syn 2.0.70", ] [[package]] @@ -4560,7 +4555,7 @@ dependencies = [ "reflexo", "reflexo-vfs", "reflexo-world", - "rustc-hash", + "rustc-hash 1.1.0", "serde", "serde_json", "tar", @@ -4594,7 +4589,7 @@ dependencies = [ "path-clean", "rayon", "reflexo", - "rustc-hash", + "rustc-hash 1.1.0", "serde", "serde_json", "serde_repr", @@ -4866,9 +4861,9 @@ checksum = "06abde3611657adf66d383f00b093d7faecc7fa57071cce2578660c9f1010821" [[package]] name = "uuid" -version = "1.9.1" +version = "1.10.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "5de17fd2f7da591098415cff336e12965a28061ddace43b59cb3c430179c9439" +checksum = "81dfa00651efa65069b0b6b651f4aaa31ba9e3c3ce0137aaad053604ee7e0314" [[package]] name = "vcpkg" @@ -4878,9 +4873,9 @@ checksum = "accd4ea62f7bb7a82fe23066fb0957d48ef677f6eeb8215f372f52e48bb32426" [[package]] name = "vergen" -version = "8.3.1" +version = "8.3.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e27d6bdd219887a9eadd19e1c34f32e47fa332301184935c6d9bca26f3cca525" +checksum = "2990d9ea5967266ea0ccf413a4aa5c42a93dbcfda9cb49a97de6931726b12566" dependencies = [ "anyhow", "cargo_metadata", @@ -4953,7 +4948,7 @@ dependencies = [ "once_cell", "proc-macro2", "quote", - "syn 2.0.68", + "syn 2.0.70", "wasm-bindgen-shared", ] @@ -4987,7 +4982,7 @@ checksum = "e94f17b526d0a461a191c78ea52bbce64071ed5c04c9ffe424dcb38f74171bb7" dependencies = [ "proc-macro2", "quote", - "syn 2.0.68", + "syn 2.0.70", "wasm-bindgen-backend", "wasm-bindgen-shared", ] @@ -5103,7 +5098,7 @@ version = "0.52.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "33ab640c8d7e35bf8ba19b884ba838ceb4fba93a4e8c65a9059d08afcfc683d9" dependencies = [ - "windows-targets 0.52.5", + "windows-targets 0.52.6", ] [[package]] @@ -5121,7 +5116,7 @@ version = "0.52.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "282be5f36a8ce781fad8c8ae18fa3f9beff57ec1b52cb3de0789201425d9a33d" dependencies = [ - "windows-targets 0.52.5", + "windows-targets 0.52.6", ] [[package]] @@ -5141,18 +5136,18 @@ dependencies = [ [[package]] name = "windows-targets" -version = "0.52.5" +version = "0.52.6" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "6f0713a46559409d202e70e28227288446bf7841d3211583a4b53e3f6d96e7eb" +checksum = "9b724f72796e036ab90c1021d4780d4d3d648aca59e491e6b98e725b84e99973" dependencies = [ - "windows_aarch64_gnullvm 0.52.5", - "windows_aarch64_msvc 0.52.5", - "windows_i686_gnu 0.52.5", + "windows_aarch64_gnullvm 0.52.6", + "windows_aarch64_msvc 0.52.6", + "windows_i686_gnu 0.52.6", "windows_i686_gnullvm", - "windows_i686_msvc 0.52.5", - "windows_x86_64_gnu 0.52.5", - "windows_x86_64_gnullvm 0.52.5", - "windows_x86_64_msvc 0.52.5", + "windows_i686_msvc 0.52.6", + "windows_x86_64_gnu 0.52.6", + "windows_x86_64_gnullvm 0.52.6", + "windows_x86_64_msvc 0.52.6", ] [[package]] @@ -5163,9 +5158,9 @@ checksum = "2b38e32f0abccf9987a4e3079dfb67dcd799fb61361e53e2882c3cbaf0d905d8" [[package]] name = "windows_aarch64_gnullvm" -version = "0.52.5" +version = "0.52.6" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "7088eed71e8b8dda258ecc8bac5fb1153c5cffaf2578fc8ff5d61e23578d3263" +checksum = "32a4622180e7a0ec044bb555404c800bc9fd9ec262ec147edd5989ccd0c02cd3" [[package]] name = "windows_aarch64_msvc" @@ -5175,9 +5170,9 @@ checksum = "dc35310971f3b2dbbf3f0690a219f40e2d9afcf64f9ab7cc1be722937c26b4bc" [[package]] name = "windows_aarch64_msvc" -version = "0.52.5" +version = "0.52.6" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "9985fd1504e250c615ca5f281c3f7a6da76213ebd5ccc9561496568a2752afb6" +checksum = "09ec2a7bb152e2252b53fa7803150007879548bc709c039df7627cabbd05d469" [[package]] name = "windows_i686_gnu" @@ -5187,15 +5182,15 @@ checksum = "a75915e7def60c94dcef72200b9a8e58e5091744960da64ec734a6c6e9b3743e" [[package]] name = "windows_i686_gnu" -version = "0.52.5" +version = "0.52.6" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "88ba073cf16d5372720ec942a8ccbf61626074c6d4dd2e745299726ce8b89670" +checksum = "8e9b5ad5ab802e97eb8e295ac6720e509ee4c243f69d781394014ebfe8bbfa0b" [[package]] name = "windows_i686_gnullvm" -version = "0.52.5" +version = "0.52.6" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "87f4261229030a858f36b459e748ae97545d6f1ec60e5e0d6a3d32e0dc232ee9" +checksum = "0eee52d38c090b3caa76c563b86c3a4bd71ef1a819287c19d586d7334ae8ed66" [[package]] name = "windows_i686_msvc" @@ -5205,9 +5200,9 @@ checksum = "8f55c233f70c4b27f66c523580f78f1004e8b5a8b659e05a4eb49d4166cca406" [[package]] name = "windows_i686_msvc" -version = "0.52.5" +version = "0.52.6" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "db3c2bf3d13d5b658be73463284eaf12830ac9a26a90c717b7f771dfe97487bf" +checksum = "240948bc05c5e7c6dabba28bf89d89ffce3e303022809e73deaefe4f6ec56c66" [[package]] name = "windows_x86_64_gnu" @@ -5217,9 +5212,9 @@ checksum = "53d40abd2583d23e4718fddf1ebec84dbff8381c07cae67ff7768bbf19c6718e" [[package]] name = "windows_x86_64_gnu" -version = "0.52.5" +version = "0.52.6" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "4e4246f76bdeff09eb48875a0fd3e2af6aada79d409d33011886d3e1581517d9" +checksum = "147a5c80aabfbf0c7d901cb5895d1de30ef2907eb21fbbab29ca94c5b08b1a78" [[package]] name = "windows_x86_64_gnullvm" @@ -5229,9 +5224,9 @@ checksum = "0b7b52767868a23d5bab768e390dc5f5c55825b6d30b86c844ff2dc7414044cc" [[package]] name = "windows_x86_64_gnullvm" -version = "0.52.5" +version = "0.52.6" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "852298e482cd67c356ddd9570386e2862b5673c85bd5f88df9ab6802b334c596" +checksum = "24d5b23dc417412679681396f2b49f3de8c1473deb516bd34410872eff51ed0d" [[package]] name = "windows_x86_64_msvc" @@ -5241,9 +5236,9 @@ checksum = "ed94fce61571a4006852b7389a063ab983c02eb1bb37b47f8272ce92d06d9538" [[package]] name = "windows_x86_64_msvc" -version = "0.52.5" +version = "0.52.6" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "bec47e5bfd1bff0eeaf6d8b485cc1074891a197ab4225d504cb7a1ab88b02bf0" +checksum = "589f6da84c646204747d1270a2a5661ea66ed1cced2631d546fdfb155959f9ec" [[package]] name = "winnow" @@ -5357,28 +5352,28 @@ checksum = "28cc31741b18cb6f1d5ff12f5b7523e3d6eb0852bbbad19d73905511d9849b95" dependencies = [ "proc-macro2", "quote", - "syn 2.0.68", + "syn 2.0.70", "synstructure", ] [[package]] name = "zerocopy" -version = "0.7.34" +version = "0.7.35" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ae87e3fcd617500e5d106f0380cf7b77f3c6092aae37191433159dda23cfb087" +checksum = "1b9b4fd18abc82b8136838da5d50bae7bdea537c574d8dc1a34ed098d6c166f0" dependencies = [ "zerocopy-derive", ] [[package]] name = "zerocopy-derive" -version = "0.7.34" +version = "0.7.35" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "15e934569e47891f7d9411f1a451d947a60e000ab3bd24fbb970f000387d1b3b" +checksum = "fa4f8080344d4671fb4e831a13ad1e68092748387dfc4f55e356242fae12ce3e" dependencies = [ "proc-macro2", "quote", - "syn 2.0.68", + "syn 2.0.70", ] [[package]] @@ -5398,7 +5393,7 @@ checksum = "0ea7b4a3637ea8669cedf0f1fd5c286a17f3de97b8dd5a70a6c167a1730e63a5" dependencies = [ "proc-macro2", "quote", - "syn 2.0.68", + "syn 2.0.70", "synstructure", ] @@ -5434,5 +5429,5 @@ checksum = "6eafa6dfb17584ea3e2bd6e76e0cc15ad7af12b09abdd1ca55961bed9b1063c6" dependencies = [ "proc-macro2", "quote", - "syn 2.0.68", + "syn 2.0.70", ] diff --git a/Cargo.toml b/Cargo.toml index 24181d16..9c3d9609 100644 --- a/Cargo.toml +++ b/Cargo.toml @@ -15,33 +15,84 @@ members = ["crates/*", "tests"] [workspace.dependencies] -once_cell = "1" +# Basic Infra anyhow = "1" - -base64 = "0.22.0" -fxhash = "0.2.1" -ecow = "0.2.1" -comemo = "0.4" -ena = "0.14.2" -futures = "0.3" -regex = "1.10.3" -itertools = "0.12.1" -lazy_static = "1.4.0" -env_logger = "0.11.3" -log = "0.4.21" -siphasher = "1" +if_chain = "1" +itertools = "0.13" +once_cell = "1" +paste = "1.0" strum = { version = "0.26.2", features = ["derive"] } +triomphe = { version = "0.1.10", default-features = false, features = ["std"] } + +# Asynchoronous and Multi-threading async-trait = "0.1.77" +await-tree = "0.1.2" +futures = "0.3" +pin-project-lite = "0.2.13" +rayon = "1.10.0" +tokio = { version = "1.36.0", features = [ + "macros", + "rt-multi-thread", + "io-std", +] } +tokio-util = { version = "0.7.10", features = ["compat"] } + +# System +open = { version = "5.1.3" } parking_lot = "0.12.1" walkdir = "2" + +# Networking +hyper = { version = "0.14", features = ["full"] } +tokio-tungstenite = "0.21.0" +tower-layer = "0.3.2" +tower-service = "0.3.2" + +# Algorithms +base64 = "0.22" +regex = "1.10.5" +rustc-hash = { version = "2", features = ["std"] } +siphasher = "1" + +# Data Structures +comemo = "0.4" +# We need to freeze the version of the crate, as the raw-api feature is considered unstable +dashmap = { version = "=5.5.3", features = ["raw-api"] } +ecow = "0.2.2" +ena = "0.14.2" +hashbrown = { version = "0.14", features = [ + "inline-more", +], default-features = false } indexmap = "2.1.0" -paste = "1.0" + +# Data/Text Format and Processing +biblatex = "0.9" +pathdiff = "0.2" +percent-encoding = "2" +rust_iso639 = "0.0.1" +rust_iso3166 = "0.1.4" +serde = { version = "1", features = ["derive"] } +serde_json = "1" +serde_yaml = "0.9" toml = { version = "0.8", default-features = false, features = [ "parse", "display", ] } -codespan-reporting = "0.11" +ttf-parser = "0.20.0" +unicode-script = "0.5" +unscanny = "0.1" +yaml-rust2 = "0.8" +# Logging +codespan-reporting = "0.11" +env_logger = "0.11.3" +log = "0.4" + +# Typst +reflexo = { version = "0.5.0-rc5", default-features = false, features = [ + "flat-vector", +] } +reflexo-world = { version = "0.5.0-rc5", features = ["system"] } typst = "0.11.1" typst-timing = "0.11.1" typst-pdf = "0.11.1" @@ -49,57 +100,38 @@ typst-svg = "0.11.1" typst-render = "0.11.1" typst-assets = "0.11.1" typst-syntax = "0.11.1" -reflexo = { version = "0.5.0-rc5", default-features = false, features = [ - "flat-vector", -] } -reflexo-world = { version = "0.5.0-rc5", features = ["system"] } typst-ts-core = { version = "0.5.0-rc5", default-features = false } typst-ts-compiler = { version = "0.5.0-rc5" } typst-ts-svg-exporter = { version = "0.5.0-rc5" } -typstyle = "0.11.28" typstfmt_lib = { git = "https://github.com/astrale-sharp/typstfmt", tag = "0.2.7" } +typstyle = "0.11.28" +# LSP +crossbeam-channel = "0.5.12" lsp-server = "0.7.6" lsp-types = { version = "=0.95.0", features = ["proposed"] } -crossbeam-channel = "0.5.12" +sync-lsp = { path = "./crates/sync-lsp" } +# CLI clap = { version = "4.5", features = ["derive", "env", "unicode", "wrap_help"] } -clap_builder = { version = "4", features = ["string"] } +clap_builder = { version = "4.5", features = ["string"] } clap_complete = "4.5" clap_complete_fig = "4.5" -clap_mangen = { version = "0.2.15" } -vergen = { version = "8.2.5", features = [ +clap_mangen = { version = "0.2.22" } +vergen = { version = "8.3.1", features = [ "build", "cargo", "git", "gitcl", "rustc", ] } -tokio = { version = "1.36.0", features = [ - "macros", - "rt-multi-thread", - "io-std", -] } -rayon = "1.10.0" -tokio-util = { version = "0.7.10", features = ["compat"] } -serde = { version = "1", features = ["derive"] } -serde_json = "1" -serde_yaml = "0.9" -yaml-rust2 = "0.8" -biblatex = "0.9" -# We need to freeze the version of the crate, as the raw-api feature is considered unstable -dashmap = { version = "=5.5.3", features = ["raw-api"] } -rustc-hash = "1" -triomphe = { version = "0.1.10", default-features = false, features = ["std"] } -hashbrown = { version = "0.14", features = [ - "inline-more", -], default-features = false } +# Testing +dhat = "0.3.3" divan = "0.1.14" -insta = { version = "1.36", features = ["glob"] } - -sync-lsp = { path = "./crates/sync-lsp" } +insta = { version = "1.39", features = ["glob"] } +# Our Own Crates typst-preview = { path = "./crates/typst-preview/" } tinymist-assets = { version = "0.11.14" } tinymist = { path = "./crates/tinymist/" } diff --git a/crates/tinymist-query/Cargo.toml b/crates/tinymist-query/Cargo.toml index 815dc22c..b4801ce5 100644 --- a/crates/tinymist-query/Cargo.toml +++ b/crates/tinymist-query/Cargo.toml @@ -26,7 +26,6 @@ serde_json.workspace = true parking_lot.workspace = true ena.workspace = true once_cell.workspace = true -fxhash.workspace = true toml.workspace = true walkdir.workspace = true indexmap.workspace = true @@ -38,15 +37,13 @@ typst.workspace = true reflexo.workspace = true lsp-types.workspace = true -if_chain = "1" -percent-encoding = "2" -unscanny = "0.1" -pathdiff = "0.2" -ttf-parser = "0.20.0" -rust_iso639 = "0.0.1" -rust_iso3166 = "0.1.4" - -# We need to freeze the version of the crate, as the raw-api feature is considered unstable +if_chain.workspace = true +percent-encoding.workspace = true +unscanny.workspace = true +pathdiff.workspace = true +ttf-parser.workspace = true +rust_iso639.workspace = true +rust_iso3166.workspace = true dashmap.workspace = true rustc-hash.workspace = true hashbrown.workspace = true diff --git a/crates/tinymist-query/src/adt/interner.rs b/crates/tinymist-query/src/adt/interner.rs index f821592f..86b3fb48 100644 --- a/crates/tinymist-query/src/adt/interner.rs +++ b/crates/tinymist-query/src/adt/interner.rs @@ -24,8 +24,8 @@ use std::{ use dashmap::{DashMap, SharedValue}; use ecow::EcoString; -use fxhash::FxHasher; use hashbrown::{hash_map::RawEntryMut, HashMap}; +use rustc_hash::FxHasher; use triomphe::Arc; use typst::{foundations::Str, syntax::ast::Ident}; diff --git a/crates/tinymist-query/src/adt/snapshot_map.rs b/crates/tinymist-query/src/adt/snapshot_map.rs index d71fc6de..ff85eac9 100644 --- a/crates/tinymist-query/src/adt/snapshot_map.rs +++ b/crates/tinymist-query/src/adt/snapshot_map.rs @@ -15,7 +15,7 @@ use std::ops; pub use ena::undo_log::Snapshot; -type FxHashMap = fxhash::FxHashMap; +type FxHashMap = rustc_hash::FxHashMap; pub type SnapshotMapStorage = SnapshotMap, ()>; pub type SnapshotMapRef<'a, K, V, L> = SnapshotMap, &'a mut L>; diff --git a/crates/tinymist-query/src/ty/mod.rs b/crates/tinymist-query/src/ty/mod.rs index 3da0cf57..46e003b5 100644 --- a/crates/tinymist-query/src/ty/mod.rs +++ b/crates/tinymist-query/src/ty/mod.rs @@ -21,8 +21,17 @@ pub(crate) use sig::*; mod tests { use super::*; use crate::adt::interner::Interned; - use fxhash::hash64; use reflexo::vector::ir::DefId; + use rustc_hash::FxHasher; + use std::hash::{Hash, Hasher}; + + /// A convenience function for when you need a quick 64-bit hash. + #[inline] + pub fn hash64(v: &T) -> u64 { + let mut state = FxHasher::default(); + v.hash(&mut state); + state.finish() + } pub fn var_ins(s: &str) -> Ty { Ty::Var(TypeVar::new(s.into(), DefId(hash64(s)))) diff --git a/crates/tinymist/Cargo.toml b/crates/tinymist/Cargo.toml index c81b0e52..e3ecd5fc 100644 --- a/crates/tinymist/Cargo.toml +++ b/crates/tinymist/Cargo.toml @@ -62,15 +62,14 @@ typst-preview = { workspace = true, optional = true } lsp-server.workspace = true crossbeam-channel.workspace = true lsp-types.workspace = true -dhat = { version = "0.3.3", optional = true } -chrono = { version = "0.4" } -unicode-script = "0.5" -await-tree = "0.1.2" -hyper = { version = "0.14", features = ["full"], optional = true } -open = { version = "5.1.3", optional = true } -tower-layer = "0.3.2" -tower-service = "0.3.2" -pin-project-lite = "0.2.13" +dhat = { workspace = true, optional = true } +unicode-script.workspace = true +await-tree.workspace = true +hyper = { workspace = true, optional = true } +open = { workspace = true, optional = true } +tower-layer.workspace = true +tower-service.workspace = true +pin-project-lite.workspace = true base64.workspace = true rayon.workspace = true diff --git a/crates/typst-preview/Cargo.toml b/crates/typst-preview/Cargo.toml index b8e33b42..719dd341 100644 --- a/crates/typst-preview/Cargo.toml +++ b/crates/typst-preview/Cargo.toml @@ -23,14 +23,14 @@ typst-ts-core = { workspace = true, default-features = false, features = [ typst-ts-compiler.workspace = true once_cell.workspace = true tokio.workspace = true -tokio-tungstenite = "0.21.0" +tokio-tungstenite.workspace = true env_logger.workspace = true log.workspace = true serde_json.workspace = true futures.workspace = true indexmap.workspace = true serde.workspace = true -await-tree = "0.1.2" +await-tree.workspace = true clap = { workspace = true, optional = true }