diff options
| author | Norbert Preining <norbert@preining.info> | 2021-10-11 03:02:08 +0000 |
|---|---|---|
| committer | Norbert Preining <norbert@preining.info> | 2021-10-11 03:02:08 +0000 |
| commit | aac7fdc4c391b318efbdee17381ac83783b2fbbb (patch) | |
| tree | a9e0357ea02c4fa81e0c8c6edb2e9343b79fff35 /support | |
| parent | e55f5510950cf773d024770b0a0d66b13e37dae0 (diff) | |
CTAN sync 202110110302
Diffstat (limited to 'support')
21 files changed, 671 insertions, 1313 deletions
diff --git a/support/TeX4ht/source/ChangeLog b/support/TeX4ht/source/ChangeLog index b229ff27f8..8496e08918 100644 --- a/support/TeX4ht/source/ChangeLog +++ b/support/TeX4ht/source/ChangeLog @@ -1,3 +1,13 @@ +2021-10-10 Michal Hoftich <michal.h21@gmail.com> + + * tex4ht-fonts-noncjk.tex ( + ./tex4ht.dir/texmf/tex4ht/ht-fonts/unicode/stmaryrd/stmary.htf + ): fixes for some Unicode characters. + * tex4ht-4ht.tex ( + scrartcl.4ht, scrbook.4ht, scrreprt.4ht + ): fix for \tt font undefined error. + https://puszcza.gnu.org.ua/bugs/?529 + 2021-10-04 Michal Hoftich <michal.h21@gmail.com> * tex4ht-4ht.tex (graphicx.4ht): added support for the \includegraphics alt diff --git a/support/TeX4ht/source/tex4ht-fonts-noncjk.tex b/support/TeX4ht/source/tex4ht-fonts-noncjk.tex index 081b7a8002..29467f4d72 100644 --- a/support/TeX4ht/source/tex4ht-fonts-noncjk.tex +++ b/support/TeX4ht/source/tex4ht-fonts-noncjk.tex @@ -1,4 +1,4 @@ -% $Id: tex4ht-fonts-noncjk.tex 956 2021-06-20 21:30:02Z michal_h21 $ +% $Id: tex4ht-fonts-noncjk.tex 990 2021-10-10 10:01:43Z michal_h21 $ % tex tex4ht-fonts-noncjk % or ht tex tex4ht-fonts-noncjk % @@ -41356,15 +41356,15 @@ stmary 0 127 '→' '' 1 `%shortrightarrow`% % stmary.htf `version % '↑' '' 2 `%shortuparrow`% % Copyright `CopyYear.2006. Eitan M. Gurari % '↓' '' 3 `%shortdownarrow`% `<version 2`> -'???' '1' 4 `%Yup`% `<version 3`> +'𝈛' '' 4 `%Yup`% `<version 3`> '???' '1' 5 `%Ydown`% `<version 4`> -'⤚' '' 6 `%Yleft`% `<version 5`> -'⤙' '' 7 `%Yright`% `<version 6`> +'𝈄' '' 6 `%Yleft`% `<version 5`> +'𝈠' '' 7 `%Yright`% `<version 6`> '⋎' '' 8 `%varcurlyvee`% `<version 7`> '⋏' '' 9 `%varcurlywedge`% `<version 8`> '⊖' '' 10 `%minuso`% `<version 9`> '⌽' '' 11 `%baro`% `<version 10`> -'⫽//' '' 12 `%sslash`% `<version 11`> +'⫽' '' 12 `%sslash`% `<version 11`> '⑊' '' 13 `%bbslash`% `<version 12`> '???' '1' 14 `%moo`% `<version 13`> '⊗' '' 15 `%varotimes`% `<version 14`> diff --git a/support/texlab/CHANGELOG.md b/support/texlab/CHANGELOG.md index 9be07281cd..22934a08fe 100644 --- a/support/texlab/CHANGELOG.md +++ b/support/texlab/CHANGELOG.md @@ -5,6 +5,22 @@ All notable changes to this project will be documented in this file. The format is based on [Keep a Changelog](https://keepachangelog.com/en/1.0.0/), and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0.html). +## [3.3.0] - 10.10.2021 + +### Added + +- Enable incremental text synchronization to reduce serialization overhead ([#460](https://github.com/latex-lsp/texlab/issues/460)) + +### Changed + +- Reduce size of executable by compressing the completion database + +### Fixed + +- Fix completion of commands near delimiters ([#449](https://github.com/latex-lsp/texlab/issues/449)) +- Prevent `texlab` from hanging because of unanswered configuration requests sent to Emacs ([#456](https://github.com/latex-lsp/texlab/issues/456)) +- Re-analyze the workspace if the initial configuration has been received late + ## [3.2.0] - 12.06.2021 ### Added diff --git a/support/texlab/Cargo.lock b/support/texlab/Cargo.lock index 1a6f08988f..45a9114cc4 100644 --- a/support/texlab/Cargo.lock +++ b/support/texlab/Cargo.lock @@ -1,5 +1,13 @@ # This file is automatically @generated by Cargo. # It is not intended for manual editing. +version = 3 + +[[package]] +name = "adler" +version = "1.0.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "f26201604c87b1e01bd3d98f8d5d9a8fcbb815e8cedb41ffccbeb4bf593a35fe" + [[package]] name = "ahash" version = "0.4.7" @@ -7,6 +15,17 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "739f4a8db6605981345c5654f3a85b056ce52f37a39d34da03f25bf2151ea16e" [[package]] +name = "ahash" +version = "0.7.4" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "43bb833f0bf979d8475d38fbf09ed3b8a55e1885fe93ad3f93239fc6a4f17b98" +dependencies = [ + "getrandom 0.2.3", + "once_cell", + "version_check 0.9.3", +] + +[[package]] name = "aho-corasick" version = "0.7.18" source = "registry+https://github.com/rust-lang/crates.io-index" @@ -25,31 +44,16 @@ dependencies = [ ] [[package]] -name = "anyhow" -version = "1.0.40" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "28b2cd92db5cbd74e8e5028f7e27dd7aa3090e89e4f2a197cc7c8dfb69c7063b" - -[[package]] -name = "arrayref" -version = "0.3.6" +name = "any_ascii" +version = "0.1.7" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a4c527152e37cf757a3f78aae5a06fbeefdb07ccc535c980a3208ee3060dd544" +checksum = "70033777eb8b5124a81a1889416543dddef2de240019b674c81285a2635a7e1e" [[package]] -name = "arrayvec" -version = "0.5.2" +name = "anyhow" +version = "1.0.44" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "23b62fc65de8e4e7f52534fb52b0f3ed04746ae267519eef2a83941e8085068b" - -[[package]] -name = "ascii-canvas" -version = "2.0.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ff8eb72df928aafb99fe5d37b383f2fe25bd2a765e3e5f7c365916b6f2463a29" -dependencies = [ - "term", -] +checksum = "61604a8f862e1d5c3229fdd78f8b02c68dcf73a4c4b05fd636d12240aaa242c1" [[package]] name = "atty" @@ -64,23 +68,11 @@ dependencies = [ [[package]] name = "autocfg" -version = "0.1.7" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "1d49d90015b3c36167a20fe2810c5cd875ad504b39cff3d4eae7977e6b7c1cb2" - -[[package]] -name = "autocfg" version = "1.0.1" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "cdb031dd78e28731d87d56cc8ffef4a8f36ca26c38fe2de700543e627f8a464a" [[package]] -name = "base64" -version = "0.13.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "904dfeac50f3cdaba28fc6f57fdcddb75f49ed61346676a78c4ffe55877802fd" - -[[package]] name = "beef" version = "0.5.0" source = "registry+https://github.com/rust-lang/crates.io-index" @@ -96,35 +88,30 @@ dependencies = [ ] [[package]] -name = "bit-set" -version = "0.5.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "6e11e16035ea35e4e5997b393eacbf6f63983188f7a2ad25bfb13465f5ad59de" -dependencies = [ - "bit-vec", -] - -[[package]] -name = "bit-vec" -version = "0.6.3" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "349f9b6a179ed607305526ca489b34ad0a41aed5f7980fa90eb03160b69598fb" - -[[package]] name = "bitflags" version = "1.2.1" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "cf1de2fe8c75bc145a2f577add951f8134889b4795d47466a54a5c846d691693" [[package]] -name = "blake2b_simd" -version = "0.5.11" +name = "bitvec" +version = "0.19.5" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "8942c8d352ae1838c9dda0b0ca2ab657696ef2232a20147cf1b30ae1a9cb4321" +dependencies = [ + "funty", + "radium", + "tap", + "wyz", +] + +[[package]] +name = "buf-min" +version = "0.1.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "afa748e348ad3be8263be728124b24a24f268266f6f5d58af9d75f6a40b5c587" +checksum = "b6ae7069aad07c7cdefe6a22a671f00650728bd2331a4cc62e1e5d0becdf9ca4" dependencies = [ - "arrayref", - "arrayvec", - "constant_time_eq", + "bytes 0.5.6", ] [[package]] @@ -135,6 +122,12 @@ checksum = "14c189c53d098945499cdfa7ecc63567cf3886b3332b312a5b4585d8d3a6a610" [[package]] name = "bytes" +version = "0.5.6" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "0e4cec68f03f32e44924783795810fa50a7035d8c8ebe78580ad7e6c703fba38" + +[[package]] +name = "bytes" version = "1.0.1" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "b700ce4376041dcd0a327fd0097c41095743c4c8af8887265942faf1100bd040" @@ -147,9 +140,18 @@ checksum = "f7a879c84c21f354f13535f87ad119ac3be22ebb9097b552a0af6a78f86628c4" [[package]] name = "cc" -version = "1.0.67" +version = "1.0.68" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e3c69b077ad434294d3ce9f1f6143a2a4b89a8a2d54ef813d85003a4fd1137fd" +checksum = "4a72c244c1ff497a746a7e1fb3d14bd08420ecda70c8f25c7112f2781652d787" + +[[package]] +name = "cervine" +version = "0.0.6" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "9f0db89834ef04fc63d2f136327b42d532b45def0345213d28690a3446c7bdb5" +dependencies = [ + "serde", +] [[package]] name = "cesu8" @@ -180,9 +182,23 @@ dependencies = [ ] [[package]] +name = "chrono" +version = "0.4.19" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "670ad68c9088c2a963aaa298cb369688cf3f9465ce5e2d4ca10e6e0098a1ce73" +dependencies = [ + "libc", + "num-integer", + "num-traits", + "serde", + "time", + "winapi", +] + +[[package]] name = "citeproc" version = "0.0.1" -source = "git+https://github.com/cormacrelf/citeproc-rs?rev=68c7a7c16088b5d7751641ab37299ad064cdb221#68c7a7c16088b5d7751641ab37299ad064cdb221" +source = "git+https://github.com/cormacrelf/citeproc-rs?rev=5252fbd8d2046a5a7d5cdcee6c6cb39bd0f1a7f3#5252fbd8d2046a5a7d5cdcee6c6cb39bd0f1a7f3" dependencies = [ "cfg-if 0.1.10", "citeproc-db", @@ -190,52 +206,66 @@ dependencies = [ "citeproc-proc", "csl", "fnv", + "indexmap", "log", + "parking_lot 0.11.1", + "rand 0.7.3", "rayon", "salsa", "serde", "serde_derive", + "string-interner", "thiserror", ] [[package]] name = "citeproc-db" version = "0.1.0" -source = "git+https://github.com/cormacrelf/citeproc-rs?rev=68c7a7c16088b5d7751641ab37299ad064cdb221#68c7a7c16088b5d7751641ab37299ad064cdb221" +source = "git+https://github.com/cormacrelf/citeproc-rs?rev=5252fbd8d2046a5a7d5cdcee6c6cb39bd0f1a7f3#5252fbd8d2046a5a7d5cdcee6c6cb39bd0f1a7f3" dependencies = [ "cfg-if 0.1.10", "citeproc-io", "csl", "fnv", + "indexmap", "log", "salsa", + "serde", + "serde_derive", + "string-interner", ] [[package]] name = "citeproc-io" version = "0.1.0" -source = "git+https://github.com/cormacrelf/citeproc-rs?rev=68c7a7c16088b5d7751641ab37299ad064cdb221#68c7a7c16088b5d7751641ab37299ad064cdb221" +source = "git+https://github.com/cormacrelf/citeproc-rs?rev=5252fbd8d2046a5a7d5cdcee6c6cb39bd0f1a7f3#5252fbd8d2046a5a7d5cdcee6c6cb39bd0f1a7f3" dependencies = [ + "cervine", "csl", "fnv", - "html5ever 0.24.1", - "itertools 0.8.2", + "html5ever", + "itertools 0.9.0", + "lazy-transform-str", "log", - "nom 5.1.2", + "markup5ever_rcdom", + "nom 6.1.2", "once_cell", - "phf 0.8.0", + "phf", "regex", "serde", "serde_derive", + "smartstring", "stringreader", + "ucd-trie", "unic-segment", + "unic-ucd-category", "v_htmlescape", ] [[package]] name = "citeproc-proc" version = "0.1.0" -source = "git+https://github.com/cormacrelf/citeproc-rs?rev=68c7a7c16088b5d7751641ab37299ad064cdb221#68c7a7c16088b5d7751641ab37299ad064cdb221" +source = "git+https://github.com/cormacrelf/citeproc-rs?rev=5252fbd8d2046a5a7d5cdcee6c6cb39bd0f1a7f3#5252fbd8d2046a5a7d5cdcee6c6cb39bd0f1a7f3" dependencies = [ "bitflags", "cfg-if 0.1.10", @@ -243,19 +273,22 @@ dependencies = [ "citeproc-io", "csl", "fnv", - "generational-arena", - "itertools 0.8.2", + "indextree", + "itertools 0.9.0", "lazy_static", + "lexical-sort", "log", - "nom 5.1.2", - "parking_lot 0.9.0", - "petgraph 0.4.13", + "nom 6.1.2", + "petgraph 0.5.1", + "rayon", "salsa", "serde", "serde_derive", - "smallvec 0.6.14", + "smallvec 1.6.1", + "string-interner", "strum", - "ucd-trie", + "unic-segment", + "unic-ucd-category", ] [[package]] @@ -274,21 +307,12 @@ dependencies = [ ] [[package]] -name = "cloudabi" -version = "0.0.3" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ddfc5b9aa5d4507acaf872de71051dfd0e309860e88966e1051e462a077aac4f" -dependencies = [ - "bitflags", -] - -[[package]] name = "combine" -version = "4.5.2" +version = "4.6.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "cc4369b5e4c0cddf64ad8981c0111e7df4f7078f4d6ba98fb31f2e17c4c57b7e" +checksum = "a2d47c1b11006b87e492b53b313bb699ce60e16613c4dddaa91f8f7c220ab2fa" dependencies = [ - "bytes", + "bytes 1.0.1", "memchr", ] @@ -306,39 +330,18 @@ dependencies = [ ] [[package]] -name = "constant_time_eq" -version = "0.1.5" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "245097e9a4535ee1e3e3931fcfcd55a796a44c643e8596ff6566d68f09b87bbc" - -[[package]] name = "convert_case" version = "0.4.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "6245d59a3e82a7fc217c5828a6692dbc6dfb63a0c8c90495621f7b9d79704a0e" [[package]] -name = "crossbeam" -version = "0.7.3" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "69323bff1fb41c635347b8ead484a5ca6c3f11914d784170b158d8449ab07f8e" -dependencies = [ - "cfg-if 0.1.10", - "crossbeam-channel 0.4.4", - "crossbeam-deque 0.7.3", - "crossbeam-epoch 0.8.2", - "crossbeam-queue", - "crossbeam-utils 0.7.2", -] - -[[package]] -name = "crossbeam-channel" -version = "0.4.4" +name = "crc32fast" +version = "1.2.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b153fe7cbef478c567df0f972e02e6d736db11affe43dfc9c56a9374d1adfb87" +checksum = "81156fece84ab6a9f2afdb109ce3ae577e42b1228441eded99bd77f627953b1a" dependencies = [ - "crossbeam-utils 0.7.2", - "maybe-uninit", + "cfg-if 1.0.0", ] [[package]] @@ -353,74 +356,36 @@ dependencies = [ [[package]] name = "crossbeam-deque" -version = "0.7.3" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "9f02af974daeee82218205558e51ec8768b48cf524bd01d550abe5573a608285" -dependencies = [ - "crossbeam-epoch 0.8.2", - "crossbeam-utils 0.7.2", - "maybe-uninit", -] - -[[package]] -name = "crossbeam-deque" version = "0.8.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "94af6efb46fef72616855b036a624cf27ba656ffc9be1b9a3c931cfc7749a9a9" dependencies = [ "cfg-if 1.0.0", - "crossbeam-epoch 0.9.3", + "crossbeam-epoch", "crossbeam-utils 0.8.5", ] [[package]] name = "crossbeam-epoch" -version = "0.8.2" +version = "0.9.5" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "058ed274caafc1f60c4997b5fc07bf7dc7cca454af7c6e81edffe5f33f70dace" -dependencies = [ - "autocfg 1.0.1", - "cfg-if 0.1.10", - "crossbeam-utils 0.7.2", - "lazy_static", - "maybe-uninit", - "memoffset 0.5.6", - "scopeguard", -] - -[[package]] -name = "crossbeam-epoch" -version = "0.9.3" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "2584f639eb95fea8c798496315b297cf81b9b58b6d30ab066a75455333cf4b12" +checksum = "4ec02e091aa634e2c3ada4a392989e7c3116673ef0ac5b72232439094d73b7fd" dependencies = [ "cfg-if 1.0.0", "crossbeam-utils 0.8.5", "lazy_static", - "memoffset 0.6.3", + "memoffset", "scopeguard", ] [[package]] -name = "crossbeam-queue" -version = "0.2.3" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "774ba60a54c213d409d5353bda12d49cd68d14e45036a285234c8d6f91f92570" -dependencies = [ - "cfg-if 0.1.10", - "crossbeam-utils 0.7.2", - "maybe-uninit", -] - -[[package]] name = "crossbeam-utils" version = "0.7.2" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "c3c7c73a2d1e9fc0886a08b93e98eb643461230d5f1925e4036204d5f2e261a8" dependencies = [ - "autocfg 1.0.1", + "autocfg", "cfg-if 0.1.10", - "lazy_static", ] [[package]] @@ -434,33 +399,30 @@ dependencies = [ ] [[package]] -name = "crunchy" -version = "0.2.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "7a81dae078cea95a014a339291cec439d2f232ebe854a9d672b796c6afafa9b7" - -[[package]] name = "csl" version = "0.0.1" -source = "git+https://github.com/cormacrelf/citeproc-rs?rev=68c7a7c16088b5d7751641ab37299ad064cdb221#68c7a7c16088b5d7751641ab37299ad064cdb221" +source = "git+https://github.com/cormacrelf/citeproc-rs?rev=5252fbd8d2046a5a7d5cdcee6c6cb39bd0f1a7f3#5252fbd8d2046a5a7d5cdcee6c6cb39bd0f1a7f3" dependencies = [ + "chrono", "fnv", "log", - "nom 5.1.2", + "nom 6.1.2", "roxmltree", "semver", "serde", - "serde_derive", - "string_cache 0.7.5", + "smartstring", + "string_cache", "strum", "strum_macros", + "thiserror", + "url", ] [[package]] name = "cstree" -version = "0.5.0" +version = "0.6.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "88c3cc8aae0153c915c6752c6a8ab5ea741930f32011b1fe453bdf5c57e9c1ed" +checksum = "032b71bfa953cd1eb921ac105edb854a94ac038ee1d3da8948a70f22eca40ac1" dependencies = [ "fxhash", "lasso", @@ -470,50 +432,23 @@ dependencies = [ ] [[package]] -name = "derive-new" -version = "0.5.9" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "3418329ca0ad70234b9735dc4ceed10af4df60eff9c8e7b06cb5e520d92c3535" -dependencies = [ - "proc-macro2 1.0.24", - "quote 1.0.9", - "syn 1.0.65", -] - -[[package]] name = "derive_more" -version = "0.99.14" +version = "0.99.16" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "5cc7b9cef1e351660e5443924e4f43ab25fbbed3e9a5f052df3677deb4d6b320" +checksum = "40eebddd2156ce1bb37b20bbe5151340a31828b1f2d22ba4141f3531710e38df" dependencies = [ "convert_case", - "proc-macro2 1.0.24", - "quote 1.0.9", - "syn 1.0.65", -] - -[[package]] -name = "diff" -version = "0.1.12" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "0e25ea47919b1560c4e3b7fe0aaab9becf5b84a10325ddf7db0f0ba5e1026499" - -[[package]] -name = "dirs" -version = "1.0.5" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "3fd78930633bd1c6e35c4b42b1df7b0cbc6bc191146e512bb3bedf243fcc3901" -dependencies = [ - "libc", - "redox_users", - "winapi", + "proc-macro2", + "quote", + "rustc_version", + "syn", ] [[package]] name = "dtoa" -version = "0.4.7" +version = "0.4.8" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "88d7ed2934d741c6b37e33e3832298e8850b53fd2d2bea03873375596c7cea4e" +checksum = "56899898ce76aaf4a0f24d914c97ea6ed976d42fec6ad33fcbb0a1103e07b2b0" [[package]] name = "either" @@ -522,15 +457,6 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "e78d4f1cc4ae33bbfc157ed5d5a5ef3bc29227303d595861deb238fcec4e9457" [[package]] -name = "ena" -version = "0.14.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d7402b94a93c24e742487327a7cd839dc9d36fec9de9fb25b09f2dae459f36c3" -dependencies = [ - "log", -] - -[[package]] name = "encode_unicode" version = "0.3.6" source = "registry+https://github.com/rust-lang/crates.io-index" @@ -571,21 +497,33 @@ checksum = "1d34cfa13a63ae058bfa601fe9e313bbdb3746427c1459185464ce0fcf62e1e8" dependencies = [ "cfg-if 1.0.0", "libc", - "redox_syscall 0.2.5", + "redox_syscall", "winapi", ] [[package]] name = "fixedbitset" -version = "0.1.9" +version = "0.2.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "86d4de0081402f5e88cdac65c8dcdcc73118c1a7a465e2a05f0da05843a8ea33" +checksum = "37ab347416e802de484e4d03c7316c48f1ecb56574dfd4a46a80f173ce1de04d" [[package]] name = "fixedbitset" -version = "0.2.0" +version = "0.4.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "37ab347416e802de484e4d03c7316c48f1ecb56574dfd4a46a80f173ce1de04d" +checksum = "398ea4fabe40b9b0d885340a2a991a44c8a645624075ad966d21f88688e2b69e" + +[[package]] +name = "flate2" +version = "1.0.22" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "1e6988e897c1c9c485f43b47a529cef42fde0547f9d8d41a7062518f1d8fc53f" +dependencies = [ + "cfg-if 1.0.0", + "crc32fast", + "libc", + "miniz_oxide", +] [[package]] name = "fnv" @@ -619,6 +557,12 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "a06f77d526c1a601b7c4cdd98f54b5eaabffc14d5f2f0296febdc7f357c6d3ba" [[package]] +name = "funty" +version = "1.1.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "fed34cd105917e91daa4da6b3728c47b068749d6a62c59811f06ed2ac71d9da7" + +[[package]] name = "futf" version = "0.1.4" source = "registry+https://github.com/rust-lang/crates.io-index" @@ -647,15 +591,6 @@ dependencies = [ ] [[package]] -name = "generational-arena" -version = "0.2.8" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "8e1d3b771574f62d0548cee0ad9057857e9fc25d7a3335f140c84f6acd0bf601" -dependencies = [ - "cfg-if 0.1.10", -] - -[[package]] name = "getrandom" version = "0.1.16" source = "registry+https://github.com/rust-lang/crates.io-index" @@ -668,29 +603,44 @@ dependencies = [ [[package]] name = "getrandom" -version = "0.2.2" +version = "0.2.3" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c9495705279e7140bf035dde1f6e750c162df8b625267cd52cc44e0b156732c8" +checksum = "7fcd999463524c52659517fe2cea98493cfe485d10565e7b0fb07dbba7ad2753" dependencies = [ "cfg-if 1.0.0", "libc", - "wasi 0.10.2+wasi-snapshot-preview1", + "wasi 0.10.0+wasi-snapshot-preview1", ] [[package]] +name = "gnaw" +version = "0.0.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "a79786fca5da31058bdc23d4a09a3b6ef0e1a77f6982cdcf6151bcbe41290d8b" + +[[package]] name = "hashbrown" version = "0.9.1" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "d7afe4a420e3fe79967a00898cc1f4db7c8a49a9333a29f8a4bd76a253d5cd04" dependencies = [ - "ahash", + "ahash 0.4.7", +] + +[[package]] +name = "hashbrown" +version = "0.11.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "ab5ef0d4909ef3724cc8cce6ccc8572c5c817592e9285f5464f8e86f8bd3726e" +dependencies = [ + "ahash 0.7.4", ] [[package]] name = "heck" -version = "0.3.2" +version = "0.3.3" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "87cbf45460356b7deeb5e3415b5563308c0a9b057c85e12b06ad551f98d0a6ac" +checksum = "6d621efb26863f0e9924c6ac577e8275e5e6b77455db64ffa6c65c904e9e132c" dependencies = [ "unicode-segmentation", ] @@ -706,11 +656,11 @@ dependencies = [ [[package]] name = "html2md" -version = "0.2.11" +version = "0.2.13" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "65122619e0f12bd9c4d061415265d5835bc36499d3ae24a83b5451ea8ba28444" +checksum = "61f6bf799d9770725ec13d66f4af9344e96285dc14d8e71e0fe02d272690667f" dependencies = [ - "html5ever 0.25.1", + "html5ever", "jni", "lazy_static", "markup5ever_rcdom", @@ -720,37 +670,23 @@ dependencies = [ [[package]] name = "html5ever" -version = "0.24.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "025483b0a1e4577bb28578318c886ee5f817dda6eb62473269349044406644cb" -dependencies = [ - "log", - "mac", - "markup5ever 0.9.0", - "proc-macro2 1.0.24", - "quote 1.0.9", - "syn 1.0.65", -] - -[[package]] -name = "html5ever" version = "0.25.1" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "aafcf38a1a36118242d29b92e1b08ef84e67e4a5ed06e0a80be20e6a32bfed6b" dependencies = [ "log", "mac", - "markup5ever 0.10.1", - "proc-macro2 1.0.24", - "quote 1.0.9", - "syn 1.0.65", + "markup5ever", + "proc-macro2", + "quote", + "syn", ] [[package]] name = "idna" -version = "0.2.2" +version = "0.2.3" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "89829a5d69c23d348314a7ac337fe39173b61149a9864deabd260983aed48c21" +checksum = "418a0a6fab821475f634efe3ccc45c013f742efe03d853e8d3355d5cb850ecf8" dependencies = [ "matches", "unicode-bidi", @@ -763,11 +699,17 @@ version = "1.6.2" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "824845a0bf897a9042383849b02c1bc219c2383772efcd5c6f9766fa4b81aef3" dependencies = [ - "autocfg 1.0.1", - "hashbrown", + "autocfg", + "hashbrown 0.9.1", ] [[package]] +name = "indextree" +version = "4.3.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "990980c3d268c9b99df35e813eca2b8d1ee08606f6d2bb325edbd0b0c68f9ffe" + +[[package]] name = "indoc" version = "1.0.3" source = "registry+https://github.com/rust-lang/crates.io-index" @@ -778,9 +720,9 @@ dependencies = [ [[package]] name = "inotify" -version = "0.9.2" +version = "0.9.3" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d19f57db1baad9d09e43a3cd76dcf82ebdafd37d75c9498b87762dba77c93f15" +checksum = "b031475cb1b103ee221afb806a23d35e0570bf7271d7588762ceba8127ed43b3" dependencies = [ "bitflags", "inotify-sys", @@ -798,9 +740,9 @@ dependencies = [ [[package]] name = "insta" -version = "1.7.1" +version = "1.8.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c4a1b21a2971cea49ca4613c0e9fe8225ecaf5de64090fddc6002284726e9244" +checksum = "15226a375927344c78d39dc6b49e2d5562a5b0705e26a589093c6792e52eed8e" dependencies = [ "console", "lazy_static", @@ -822,18 +764,18 @@ dependencies = [ [[package]] name = "itertools" -version = "0.8.2" +version = "0.9.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f56a2d0bc861f9165be4eb3442afd3c236d8a98afd426f65d92324ae1091a484" +checksum = "284f18f85651fe11e8a991b2adb42cb078325c996ed026d994719efcfca1d54b" dependencies = [ "either", ] [[package]] name = "itertools" -version = "0.10.0" +version = "0.10.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "37d572918e350e82412fe766d24b15e6682fb2ed2bbe018280caa810397cb319" +checksum = "69ddb889f9d0d08a67338271fa9b62996bc788c7796a5c18cf057420aaed5eaf" dependencies = [ "either", ] @@ -865,44 +807,23 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "8eaf4bc02d17cbdd7ff4c7438cafcdf7fb9a4613313ad11b4f8fefe7d3fa0130" [[package]] -name = "lalrpop" -version = "0.19.5" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "46962a8c71b91c3524b117dfdd70844d4265a173c4c9109f98171aebdcf1195f" -dependencies = [ - "ascii-canvas", - "atty", - "bit-set", - "diff", - "ena", - "itertools 0.10.0", - "lalrpop-util", - "petgraph 0.5.1", - "pico-args", - "regex", - "regex-syntax", - "string_cache 0.8.1", - "term", - "tiny-keccak", - "unicode-xid 0.2.1", -] - -[[package]] -name = "lalrpop-util" -version = "0.19.5" +name = "lasso" +version = "0.5.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "7a708007b751af124d09e9c5d97515257902bc6b486a56b40bcafd939e8ff467" +checksum = "e8647c8a01e5f7878eacb2c323c4c949fdb63773110f0686c7810769874b7e0a" dependencies = [ - "regex", + "hashbrown 0.11.2", ] [[package]] -name = "lasso" -version = "0.5.0" +name = "lazy-transform-str" +version = "0.0.6" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "4efb7b456e95cc1ae2de7b18b1e4d791467b46f0a3d02464e5a16ea502091640" +checksum = "d3f2f08de5da0353709e66c6302747c07d60186e70d19b172dbdcc51a1de357e" dependencies = [ - "hashbrown", + "cervine", + "gnaw", + "smartstring", ] [[package]] @@ -912,10 +833,19 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "e2abad23fbc42b3700f2f279844dc832adb2b2eb069b2df918f455c4e18cc646" [[package]] +name = "lexical-sort" +version = "0.3.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "c09e4591611e231daf4d4c685a66cb0410cc1e502027a20ae55f2bb9e997207a" +dependencies = [ + "any_ascii", +] + +[[package]] name = "libc" -version = "0.2.91" +version = "0.2.97" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "8916b1f6ca17130ec6568feccee27c156ad12037880833a3b842a823236502e7" +checksum = "12b8adadd720df158f4d70dfe7ccc6adb0472d7c55ca83445f6a5ab3e36f8fb6" [[package]] name = "linked-hash-map" @@ -925,18 +855,9 @@ checksum = "7fb9b38af92608140b86b693604b9ffcc5824240a484d1ecd4795bacb2fe88f3" [[package]] name = "lock_api" -version = "0.3.4" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c4da24a77a3d8a6d4862d95f72e6fdb9c09a643ecdb402d754004a557f2bec75" -dependencies = [ - "scopeguard", -] - -[[package]] -name = "lock_api" -version = "0.4.2" +version = "0.4.4" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "dd96ffd135b2fd7b973ac026d28085defbe8983df057ced3eb4f2130b0831312" +checksum = "0382880606dff6d15c9476c416d18690b72742aa7b605bb6dd6ec9030fbf07eb" dependencies = [ "scopeguard", ] @@ -967,20 +888,20 @@ checksum = "56a7d287fd2ac3f75b11f19a1c8a874a7d55744bd91f7a1b3e7cf87d4343c36d" dependencies = [ "beef", "fnv", - "proc-macro2 1.0.24", - "quote 1.0.9", + "proc-macro2", + "quote", "regex-syntax", - "syn 1.0.65", + "syn", "utf8-ranges", ] [[package]] name = "lsp-server" -version = "0.5.1" +version = "0.5.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "6825d7042d5ca1825a366c40c9446928ec7b30e2be97243a13b164aee6583992" +checksum = "c351c75989da23b355226dc188dc2b52538a7f4f218d70fd7393c6b62b110444" dependencies = [ - "crossbeam-channel 0.5.1", + "crossbeam-channel", "log", "serde", "serde_json", @@ -988,9 +909,9 @@ dependencies = [ [[package]] name = "lsp-types" -version = "0.89.1" +version = "0.90.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "48b8a871b0a450bcec0e26d74a59583c8173cb9fb7d7f98889e18abb84838e0f" +checksum = "a7404037aab080771c90b0a499836d9d8a10336ecd07badf969567b65c6d51a1" dependencies = [ "bitflags", "serde", @@ -1007,32 +928,15 @@ checksum = "c41e0c4fef86961ac6d6f8a82609f55f31b05e4fce149ac5710e439df7619ba4" [[package]] name = "markup5ever" -version = "0.9.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "65381d9d47506b8592b97c4efd936afcf673b09b059f2bef39c7211ee78b9d03" -dependencies = [ - "log", - "phf 0.7.24", - "phf_codegen 0.7.24", - "serde", - "serde_derive", - "serde_json", - "string_cache 0.7.5", - "string_cache_codegen 0.4.4", - "tendril", -] - -[[package]] -name = "markup5ever" version = "0.10.1" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "a24f40fb03852d1cdd84330cddcaf98e9ec08a7b7768e952fad3b4cf048ec8fd" dependencies = [ "log", - "phf 0.8.0", - "phf_codegen 0.8.0", - "string_cache 0.8.1", - "string_cache_codegen 0.5.1", + "phf", + "phf_codegen", + "string_cache", + "string_cache_codegen", "tendril", ] @@ -1042,8 +946,8 @@ version = "0.1.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "f015da43bcd8d4f144559a3423f4591d69b8ce0652c905374da7205df336ae2b" dependencies = [ - "html5ever 0.25.1", - "markup5ever 0.10.1", + "html5ever", + "markup5ever", "tendril", "xml5ever", ] @@ -1068,27 +972,28 @@ checksum = "b16bd47d9e329435e309c58469fe0791c2d0d1ba96ec0954152a5ae2b04387dc" [[package]] name = "memoffset" -version = "0.5.6" +version = "0.6.4" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "043175f069eda7b85febe4a74abbaeff828d9f8b448515d3151a14a3542811aa" +checksum = "59accc507f1338036a0477ef61afdae33cde60840f4dfe481319ce3ad116ddf9" dependencies = [ - "autocfg 1.0.1", + "autocfg", ] [[package]] -name = "memoffset" -version = "0.6.3" +name = "miniz_oxide" +version = "0.4.4" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f83fb6581e8ed1f85fd45c116db8405483899489e38406156c25eb743554361d" +checksum = "a92518e98c078586bc6c934028adcca4c92a53d6a958196de835170a01d84e4b" dependencies = [ - "autocfg 1.0.1", + "adler", + "autocfg", ] [[package]] name = "mio" -version = "0.7.11" +version = "0.7.13" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "cf80d3e903b34e0bd7282b218398aec54e082c840d9baf8339e0080a0c542956" +checksum = "8c2bdb6314ec10835cd3293dd268473a835c02b7b352e788be788b3c6ca6bb16" dependencies = [ "libc", "log", @@ -1133,22 +1038,24 @@ dependencies = [ [[package]] name = "nom" -version = "5.1.2" +version = "6.1.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ffb4262d26ed83a1c0a33a38fe2bb15797329c85770da05e6b828ddb782627af" +checksum = "e7413f999671bd4745a7b624bd370a569fb6bc574b23c83a3c5ed2e453f3d5e2" dependencies = [ + "bitvec", + "funty", "memchr", "version_check 0.9.3", ] [[package]] name = "notify" -version = "5.0.0-pre.9" +version = "5.0.0-pre.10" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b89869d77edd64db917d7903abeadc166f93686b342c56cc0ca51acb68441d09" +checksum = "51f18203a26893ca1d3526cf58084025d5639f91c44f8b70ab3b724f60e819a0" dependencies = [ "bitflags", - "crossbeam-channel 0.5.1", + "crossbeam-channel", "filetime", "fsevent-sys", "inotify", @@ -1168,6 +1075,25 @@ dependencies = [ ] [[package]] +name = "num-integer" +version = "0.1.44" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "d2cc698a63b549a70bc047073d2949cce27cd1c7b0a4a862d08a8031bc2801db" +dependencies = [ + "autocfg", + "num-traits", +] + +[[package]] +name = "num-traits" +version = "0.2.14" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "9a64b1ec5cda2586e284722486d802acf1f7dbdc623e2bfc57e65ca1cd099290" +dependencies = [ + "autocfg", +] + +[[package]] name = "num_cpus" version = "1.13.0" source = "registry+https://github.com/rust-lang/crates.io-index" @@ -1179,15 +1105,15 @@ dependencies = [ [[package]] name = "once_cell" -version = "1.7.2" +version = "1.8.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "af8b08b04175473088b46763e51ee54da5f9a164bc162f615b91bc179dbf15a3" +checksum = "692fcb63b64b1758029e0a96ee63e049ce8c5948587f2f7208df04625e5f6b56" [[package]] -name = "ordermap" -version = "0.3.5" +name = "oorandom" +version = "11.1.3" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a86ed3f5f244b372d6b1a00b72ef7f8876d0bc6a78a4c9985c53614041512063" +checksum = "0ab1bc2a289d34bd04a330323ac98a1b4bc82c9d9fcb1e66b63caa84da26b575" [[package]] name = "owning_ref" @@ -1210,23 +1136,12 @@ dependencies = [ [[package]] name = "parking_lot" -version = "0.9.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f842b1982eb6c2fe34036a4fbfb06dd185a3f5c8edfaacdf7d1ea10b07de6252" -dependencies = [ - "lock_api 0.3.4", - "parking_lot_core 0.6.2", - "rustc_version", -] - -[[package]] -name = "parking_lot" version = "0.11.1" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "6d7744ac029df22dca6284efe4e898991d28e3085c706c972bcd7da4a27a15eb" dependencies = [ "instant", - "lock_api 0.4.2", + "lock_api", "parking_lot_core 0.8.3", ] @@ -1244,21 +1159,6 @@ dependencies = [ [[package]] name = "parking_lot_core" -version = "0.6.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b876b1b9e7ac6e1a74a6da34d25c42e17e8862aa409cbbbdcfc8d86c6f3bc62b" -dependencies = [ - "cfg-if 0.1.10", - "cloudabi", - "libc", - "redox_syscall 0.1.57", - "rustc_version", - "smallvec 0.6.14", - "winapi", -] - -[[package]] -name = "parking_lot_core" version = "0.8.3" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "fa7a782938e745763fe6907fc6ba86946d72f49fe7e21de074e08128a99fb018" @@ -1266,7 +1166,7 @@ dependencies = [ "cfg-if 1.0.0", "instant", "libc", - "redox_syscall 0.2.5", + "redox_syscall", "smallvec 1.6.1", "winapi", ] @@ -1278,13 +1178,12 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "d4fd5641d01c8f18a23da7b6fe29298ff4b55afcccdf78973b24cf3175fee32e" [[package]] -name = "petgraph" -version = "0.4.13" +name = "pest" +version = "2.1.3" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "9c3659d1ee90221741f65dd128d9998311b0e40c5d3c23a62445938214abce4f" +checksum = "10f4872ae94d7b90ae48754df22fd42ad52ce740b8f370b03da4835417403e53" dependencies = [ - "fixedbitset 0.1.9", - "ordermap", + "ucd-trie", ] [[package]] @@ -1298,12 +1197,13 @@ dependencies = [ ] [[package]] -name = "phf" -version = "0.7.24" +name = "petgraph" +version = "0.6.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b3da44b85f8e8dfaec21adae67f95d93244b2ecf6ad2a692320598dcc8e6dd18" +checksum = "4a13a2fa9d0b63e5f22328828741e523766fff0ee9e779316902290dff3f824f" dependencies = [ - "phf_shared 0.7.24", + "fixedbitset 0.4.0", + "indexmap", ] [[package]] @@ -1313,38 +1213,18 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "3dfb61232e34fcb633f43d12c58f83c1df82962dcdfa565a4e866ffc17dafe12" dependencies = [ "phf_macros", - "phf_shared 0.8.0", + "phf_shared", "proc-macro-hack", ] [[package]] name = "phf_codegen" -version = "0.7.24" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b03e85129e324ad4166b06b2c7491ae27fe3ec353af72e72cd1654c7225d517e" -dependencies = [ - "phf_generator 0.7.24", - "phf_shared 0.7.24", -] - -[[package]] -name = "phf_codegen" version = "0.8.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "cbffee61585b0411840d3ece935cce9cb6321f01c45477d30066498cd5e1a815" dependencies = [ - "phf_generator 0.8.0", - "phf_shared 0.8.0", -] - -[[package]] -name = "phf_generator" -version = "0.7.24" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "09364cc93c159b8b06b1f4dd8a4398984503483891b0c26b867cf431fb132662" -dependencies = [ - "phf_shared 0.7.24", - "rand 0.6.5", + "phf_generator", + "phf_shared", ] [[package]] @@ -1353,7 +1233,7 @@ version = "0.8.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "17367f0cc86f2d25802b2c26ee58a7b23faeccf78a396094c13dced0d0182526" dependencies = [ - "phf_shared 0.8.0", + "phf_shared", "rand 0.7.3", ] @@ -1363,21 +1243,12 @@ version = "0.8.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "7f6fde18ff429ffc8fe78e2bf7f8b7a5a5a6e2a8b58bc5a9ac69198bbda9189c" dependencies = [ - "phf_generator 0.8.0", - "phf_shared 0.8.0", + "phf_generator", + "phf_shared", "proc-macro-hack", - "proc-macro2 1.0.24", - "quote 1.0.9", - "syn 1.0.65", -] - -[[package]] -name = "phf_shared" -version = "0.7.24" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "234f71a15de2288bcb7e3b6515828d22af7ec8598ee6d24c3b526fa0a80b67a0" -dependencies = [ - "siphasher 0.2.3", + "proc-macro2", + "quote", + "syn", ] [[package]] @@ -1386,16 +1257,10 @@ version = "0.8.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "c00cf8b9eafe68dde5e9eaa2cef8ee84a9336a47d566ec55ca16589633b65af7" dependencies = [ - "siphasher 0.3.5", + "siphasher", ] [[package]] -name = "pico-args" -version = "0.4.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "7d7afeb98c5a10e0bffcc7fc16e105b04d06729fac5fd6384aebf7ff5cb5a67d" - -[[package]] name = "ppv-lite86" version = "0.2.10" source = "registry+https://github.com/rust-lang/crates.io-index" @@ -1414,9 +1279,9 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "da25490ff9892aab3fcf7c36f08cfb902dd3e71ca0f9f9517bea02a73a5ce38c" dependencies = [ "proc-macro-error-attr", - "proc-macro2 1.0.24", - "quote 1.0.9", - "syn 1.0.65", + "proc-macro2", + "quote", + "syn", "version_check 0.9.3", ] @@ -1426,8 +1291,8 @@ version = "1.0.4" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "a1be40180e52ecc98ad80b184934baf3d0d29f979574e439af5a55274b35f869" dependencies = [ - "proc-macro2 1.0.24", - "quote 1.0.9", + "proc-macro2", + "quote", "version_check 0.9.3", ] @@ -1439,39 +1304,27 @@ checksum = "dbf0c48bc1d91375ae5c3cd81e3722dff1abcf81a30960240640d223f59fe0e5" [[package]] name = "proc-macro2" -version = "0.4.30" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "cf3d2011ab5c909338f7887f4fc896d35932e29146c12c8d01da6b22a80ba759" -dependencies = [ - "unicode-xid 0.1.0", -] - -[[package]] -name = "proc-macro2" -version = "1.0.24" +version = "1.0.27" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "1e0704ee1a7e00d7bb417d0770ea303c1bccbabf0ef1667dae92b5967f5f8a71" +checksum = "f0d8caf72986c1a598726adc988bb5984792ef84f5ee5aa50209145ee8077038" dependencies = [ - "unicode-xid 0.2.1", + "unicode-xid", ] [[package]] name = "quote" -version = "0.6.13" +version = "1.0.9" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "6ce23b6b870e8f94f81fb0a363d65d86675884b34a09043c81e5562f11c1f8e1" +checksum = "c3d0b9745dc2debf507c8422de05d7226cc1f0644216dfdfead988f9b1ab32a7" dependencies = [ - "proc-macro2 0.4.30", + "proc-macro2", ] [[package]] -name = "quote" -version = "1.0.9" +name = "radium" +version = "0.5.3" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c3d0b9745dc2debf507c8422de05d7226cc1f0644216dfdfead988f9b1ab32a7" -dependencies = [ - "proc-macro2 1.0.24", -] +checksum = "941ba9d78d8e2f7ce474c015eea4d9c6d25b6a3327f9832ee29a4de27f91bbb8" [[package]] name = "rand" @@ -1488,25 +1341,6 @@ dependencies = [ [[package]] name = "rand" -version = "0.6.5" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "6d71dacdc3c88c1fde3885a3be3fbab9f35724e6ce99467f7d9c5026132184ca" -dependencies = [ - "autocfg 0.1.7", - "libc", - "rand_chacha 0.1.1", - "rand_core 0.4.2", - "rand_hc 0.1.0", - "rand_isaac", - "rand_jitter", - "rand_os", - "rand_pcg 0.1.2", - "rand_xorshift", - "winapi", -] - -[[package]] -name = "rand" version = "0.7.3" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "6a6b1679d49b24bbfe0c803429aa1874472f50d9b363131f0e89fc356b544d03" @@ -1516,29 +1350,19 @@ dependencies = [ "rand_chacha 0.2.2", "rand_core 0.5.1", "rand_hc 0.2.0", - "rand_pcg 0.2.1", + "rand_pcg", ] [[package]] name = "rand" -version = "0.8.3" +version = "0.8.4" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "0ef9e7e66b4468674bfcb0c81af8b7fa0bb154fa9f28eb840da5c447baeb8d7e" +checksum = "2e7573632e6454cf6b99d7aac4ccca54be06da05aca2ef7423d22d27d4d4bcd8" dependencies = [ "libc", - "rand_chacha 0.3.0", - "rand_core 0.6.2", - "rand_hc 0.3.0", -] - -[[package]] -name = "rand_chacha" -version = "0.1.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "556d3a1ca6600bfcbab7c7c91ccb085ac7fbbcd70e008a98742e7847f4f7bcef" -dependencies = [ - "autocfg 0.1.7", - "rand_core 0.3.1", + "rand_chacha 0.3.1", + "rand_core 0.6.3", + "rand_hc 0.3.1", ] [[package]] @@ -1553,12 +1377,12 @@ dependencies = [ [[package]] name = "rand_chacha" -version = "0.3.0" +version = "0.3.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e12735cf05c9e10bf21534da50a147b924d555dc7a547c42e6bb2d5b6017ae0d" +checksum = "e6c10a63a0fa32252be49d21e7709d4d4baf8d231c2dbce1eaa8141b9b127d88" dependencies = [ "ppv-lite86", - "rand_core 0.6.2", + "rand_core 0.6.3", ] [[package]] @@ -1587,20 +1411,11 @@ dependencies = [ [[package]] name = "rand_core" -version = "0.6.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "34cf66eb183df1c5876e2dcf6b13d57340741e8dc255b48e40a26de954d06ae7" -dependencies = [ - "getrandom 0.2.2", -] - -[[package]] -name = "rand_hc" -version = "0.1.0" +version = "0.6.3" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "7b40677c7be09ae76218dc623efbf7b18e34bced3f38883af07bb75630a21bc4" +checksum = "d34f1408f55294453790c48b2f1ebbb1c5b4b7563eb1f418bcfcfdbb06ebb4e7" dependencies = [ - "rand_core 0.3.1", + "getrandom 0.2.3", ] [[package]] @@ -1614,55 +1429,11 @@ dependencies = [ [[package]] name = "rand_hc" -version = "0.3.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "3190ef7066a446f2e7f42e239d161e905420ccab01eb967c9eb27d21b2322a73" -dependencies = [ - "rand_core 0.6.2", -] - -[[package]] -name = "rand_isaac" -version = "0.1.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ded997c9d5f13925be2a6fd7e66bf1872597f759fd9dd93513dd7e92e5a5ee08" -dependencies = [ - "rand_core 0.3.1", -] - -[[package]] -name = "rand_jitter" -version = "0.1.4" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "1166d5c91dc97b88d1decc3285bb0a99ed84b05cfd0bc2341bdf2d43fc41e39b" -dependencies = [ - "libc", - "rand_core 0.4.2", - "winapi", -] - -[[package]] -name = "rand_os" -version = "0.1.3" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "7b75f676a1e053fc562eafbb47838d67c84801e38fc1ba459e8f180deabd5071" -dependencies = [ - "cloudabi", - "fuchsia-cprng", - "libc", - "rand_core 0.4.2", - "rdrand", - "winapi", -] - -[[package]] -name = "rand_pcg" -version = "0.1.2" +version = "0.3.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "abf9b09b01790cfe0364f52bf32995ea3c39f4d2dd011eac241d2914146d0b44" +checksum = "d51e9f596de227fda2ea6c84607f5558e196eeaf43c986b724ba4fb8fdf497e7" dependencies = [ - "autocfg 0.1.7", - "rand_core 0.4.2", + "rand_core 0.6.3", ] [[package]] @@ -1675,22 +1446,13 @@ dependencies = [ ] [[package]] -name = "rand_xorshift" -version = "0.1.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "cbf7e9e623549b0e21f6e97cf8ecf247c1a8fd2e8a992ae265314300b2455d5c" -dependencies = [ - "rand_core 0.3.1", -] - -[[package]] name = "rayon" version = "1.5.1" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "c06aca804d41dbc8ba42dfd964f0d01334eceb64314b9ecf7c5fad5188a06d90" dependencies = [ - "autocfg 1.0.1", - "crossbeam-deque 0.8.0", + "autocfg", + "crossbeam-deque", "either", "rayon-core", ] @@ -1701,8 +1463,8 @@ version = "1.9.1" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "d78120e2c850279833f1dd3582f730c4ab53ed95aeaaaa862a2a5c71b1656d8e" dependencies = [ - "crossbeam-channel 0.5.1", - "crossbeam-deque 0.8.0", + "crossbeam-channel", + "crossbeam-deque", "crossbeam-utils 0.8.5", "lazy_static", "num_cpus", @@ -1719,31 +1481,14 @@ dependencies = [ [[package]] name = "redox_syscall" -version = "0.1.57" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "41cc0f7e4d5d4544e8861606a285bb08d3e70712ccc7d2b84d7c0ccfaf4b05ce" - -[[package]] -name = "redox_syscall" -version = "0.2.5" +version = "0.2.9" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "94341e4e44e24f6b591b59e47a8a027df12e008d73fd5672dbea9cc22f4507d9" +checksum = "5ab49abadf3f9e1c4bc499e8845e152ad87d2ad2d30371841171169e9d75feee" dependencies = [ "bitflags", ] [[package]] -name = "redox_users" -version = "0.3.5" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "de0737333e7a9502c789a36d7c7fa6092a49895d4faa31ca5df163857ded2e9d" -dependencies = [ - "getrandom 0.1.16", - "redox_syscall 0.1.57", - "rust-argon2", -] - -[[package]] name = "regex" version = "1.5.4" source = "registry+https://github.com/rust-lang/crates.io-index" @@ -1771,26 +1516,14 @@ dependencies = [ [[package]] name = "roxmltree" -version = "0.7.3" +version = "0.13.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "0852407257c1b696a0c66b9db3ffe7769c2744a2fa725c8050e6f3e5a823c02b" +checksum = "dbf7d7b1ea646d380d0e8153158063a6da7efe30ddbf3184042848e3f8a6f671" dependencies = [ "xmlparser", ] [[package]] -name = "rust-argon2" -version = "0.8.3" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "4b18820d944b33caa75a71378964ac46f58517c92b6ae5f762636247c09e78fb" -dependencies = [ - "base64", - "blake2b_simd", - "constant_time_eq", - "crossbeam-utils 0.8.5", -] - -[[package]] name = "rustc-hash" version = "1.1.0" source = "registry+https://github.com/rust-lang/crates.io-index" @@ -1798,9 +1531,9 @@ checksum = "08d43f7aa6b08d49f382cde6a7982047c3426db949b1424bc4b7ec9ae12c6ce2" [[package]] name = "rustc_version" -version = "0.2.3" +version = "0.3.3" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "138e3e0acb6c9fb258b19b67cb8abd63c00679d2851805ea151465464fe9030a" +checksum = "f0dfe2087c51c460008730de8b57e6a320782fbfb312e1f4d520e6c6fae155ee" dependencies = [ "semver", ] @@ -1813,31 +1546,31 @@ checksum = "71d301d4193d031abdd79ff7e3dd721168a9572ef3fe51a1517aba235bd8f86e" [[package]] name = "salsa" -version = "0.13.2" +version = "0.15.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ec0865bdd9d8e614686a0cbb76979c735810131d287eb1683e91e4e64a58c387" +checksum = "9ab29056d4fb4048a5f0d169c9b6e5526160c9ec37aded5a6879c2c9c445a8e4" dependencies = [ - "crossbeam", - "derive-new", + "crossbeam-utils 0.7.2", "indexmap", + "lock_api", "log", - "parking_lot 0.9.0", - "rand 0.7.3", + "oorandom", + "parking_lot 0.11.1", "rustc-hash", "salsa-macros", - "smallvec 0.6.14", + "smallvec 1.6.1", ] [[package]] name = "salsa-macros" -version = "0.13.2" +version = "0.15.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "cac182212d3a1db75ddc42399ff1461b258a694b8318ee7e0baf6c976e39efee" +checksum = "a1c3aec007c63c4ed4cd7a018529fb0b5575c4562575fc6a40d6cd2ae0b792ef" dependencies = [ "heck", - "proc-macro2 1.0.24", - "quote 1.0.9", - "syn 1.0.65", + "proc-macro2", + "quote", + "syn", ] [[package]] @@ -1857,44 +1590,48 @@ checksum = "d29ab0c6d3fc0ee92fe66e2d99f700eab17a8d57d1c1d3b748380fb20baa78cd" [[package]] name = "semver" -version = "0.9.0" +version = "0.11.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "1d7eb9ef2c18661902cc47e535f9bc51b78acd254da71d375c2f6720d9a40403" +checksum = "f301af10236f6df4160f7c3f04eec6dbc70ace82d23326abad5edee88801c6b6" dependencies = [ "semver-parser", + "serde", ] [[package]] name = "semver-parser" -version = "0.7.0" +version = "0.10.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "388a1df253eca08550bef6c72392cfe7c30914bf41df5269b68cbd6ff8f570a3" +checksum = "00b0bef5b7f9e0df16536d3961cfb6e84331c065b4066afb39768d0e319411f7" +dependencies = [ + "pest", +] [[package]] name = "serde" -version = "1.0.126" +version = "1.0.130" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ec7505abeacaec74ae4778d9d9328fe5a5d04253220a85c4ee022239fc996d03" +checksum = "f12d06de37cf59146fbdecab66aa99f9fe4f78722e3607577a5375d66bd0c913" dependencies = [ "serde_derive", ] [[package]] name = "serde_derive" -version = "1.0.126" +version = "1.0.130" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "963a7dbc9895aeac7ac90e74f34a5d5261828f79df35cbed41e10189d3804d43" +checksum = "d7bc1a1ab1961464eae040d96713baa5a724a8152c1222492465b54322ec508b" dependencies = [ - "proc-macro2 1.0.24", - "quote 1.0.9", - "syn 1.0.65", + "proc-macro2", + "quote", + "syn", ] [[package]] name = "serde_json" -version = "1.0.64" +version = "1.0.68" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "799e97dc9fdae36a5c8b8f2cae9ce2ee9fdce2058c57a93e6099d919fd982f79" +checksum = "0f690853975602e1bfe1ccbf50504d67174e3bcf340f23b5ea9992e0587a52d8" dependencies = [ "itoa", "ryu", @@ -1907,9 +1644,9 @@ version = "0.1.7" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "98d0516900518c29efa217c298fa1f4e6c6ffc85ae29fd7f4ee48f176e1a9ed5" dependencies = [ - "proc-macro2 1.0.24", - "quote 1.0.9", - "syn 1.0.65", + "proc-macro2", + "quote", + "syn", ] [[package]] @@ -1932,12 +1669,6 @@ checksum = "1ad1d488a557b235fc46dae55512ffbfc429d2482b08b4d9435ab07384ca8aec" [[package]] name = "siphasher" -version = "0.2.3" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "0b8de496cf83d4ed58b6be86c3a275b8602f6ffe98d3024a869e124147a9a3ac" - -[[package]] -name = "siphasher" version = "0.3.5" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "cbce6d4507c7e4a3962091436e56e95290cb71fa302d0d270e32130b75fbff27" @@ -1958,10 +1689,20 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "fe0f37c9e8f3c5a4a66ad655a93c74daac4ad00c441533bf5c6e7990bb42604e" [[package]] +name = "smartstring" +version = "0.2.6" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "1ada87540bf8ef4cf8a1789deb175626829bb59b1fefd816cf7f7f55efcdbae9" +dependencies = [ + "serde", + "static_assertions", +] + +[[package]] name = "smol_str" -version = "0.1.17" +version = "0.1.18" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "6ca0f7ce3a29234210f0f4f0b56f8be2e722488b95cb522077943212da3b32eb" +checksum = "b203e79e90905594272c1c97c7af701533d42adaab0beb3859018e477d54a3b0" dependencies = [ "serde", ] @@ -1973,18 +1714,20 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "a8f112729512f8e442d81f95a8a7ddf2b7c6b8a1a6f509a95864142b30cab2d3" [[package]] -name = "string_cache" -version = "0.7.5" +name = "static_assertions" +version = "1.1.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "a2eb9349b6444b326872e140eb1cf5e7c522154d69e7a0ffb0fb81c06b37543f" + +[[package]] +name = "string-interner" +version = "0.12.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "89c058a82f9fd69b1becf8c274f412281038877c553182f1d02eb027045a2d67" +checksum = "383196d1876517ee6f9f0864d1fc1070331b803335d3c6daaa04bbcccd823c08" dependencies = [ - "lazy_static", - "new_debug_unreachable", - "phf_shared 0.7.24", - "precomputed-hash", + "cfg-if 1.0.0", + "hashbrown 0.9.1", "serde", - "string_cache_codegen 0.4.4", - "string_cache_shared", ] [[package]] @@ -1995,43 +1738,24 @@ checksum = "8ddb1139b5353f96e429e1a5e19fbaf663bddedaa06d1dbd49f82e352601209a" dependencies = [ "lazy_static", "new_debug_unreachable", - "phf_shared 0.8.0", + "phf_shared", "precomputed-hash", "serde", ] [[package]] name = "string_cache_codegen" -version = "0.4.4" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f0f45ed1b65bf9a4bf2f7b7dc59212d1926e9eaf00fa998988e420fd124467c6" -dependencies = [ - "phf_generator 0.7.24", - "phf_shared 0.7.24", - "proc-macro2 1.0.24", - "quote 1.0.9", - "string_cache_shared", -] - -[[package]] -name = "string_cache_codegen" version = "0.5.1" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "f24c8e5e19d22a726626f1a5e16fe15b132dcf21d10177fa5a45ce7962996b97" dependencies = [ - "phf_generator 0.8.0", - "phf_shared 0.8.0", - "proc-macro2 1.0.24", - "quote 1.0.9", + "phf_generator", + "phf_shared", + "proc-macro2", + "quote", ] [[package]] -name = "string_cache_shared" -version = "0.3.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b1884d1bc09741d466d9b14e6d37ac89d6909cbcac41dd9ae982d4d063bbedfc" - -[[package]] name = "stringreader" version = "0.1.1" source = "registry+https://github.com/rust-lang/crates.io-index" @@ -2045,9 +1769,9 @@ checksum = "8ea5119cdb4c55b55d432abb513a0429384878c15dde60cc77b1c99de1a95a6a" [[package]] name = "structopt" -version = "0.3.21" +version = "0.3.23" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "5277acd7ee46e63e5168a80734c9f6ee81b1367a7d8772a2d765df2a3705d28c" +checksum = "bf9d950ef167e25e0bdb073cf1d68e9ad2795ac826f2f3f59647817cf23c0bfa" dependencies = [ "clap", "lazy_static", @@ -2056,56 +1780,51 @@ dependencies = [ [[package]] name = "structopt-derive" -version = "0.4.14" +version = "0.4.16" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "5ba9cdfda491b814720b6b06e0cac513d922fc407582032e8706e9f137976f90" +checksum = "134d838a2c9943ac3125cf6df165eda53493451b719f3255b2a26b85f772d0ba" dependencies = [ "heck", "proc-macro-error", - "proc-macro2 1.0.24", - "quote 1.0.9", - "syn 1.0.65", + "proc-macro2", + "quote", + "syn", ] [[package]] name = "strum" -version = "0.15.0" +version = "0.19.5" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e5d1c33039533f051704951680f1adfd468fd37ac46816ded0d9ee068e60f05f" +checksum = "b89a286a7e3b5720b9a477b23253bc50debac207c8d21505f8e70b36792f11b5" [[package]] name = "strum_macros" -version = "0.15.0" +version = "0.19.4" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "47cd23f5c7dee395a00fa20135e2ec0fffcdfa151c56182966d7a3261343432e" +checksum = "e61bb0be289045cb80bfce000512e32d09f8337e54c186725da381377ad1f8d5" dependencies = [ "heck", - "proc-macro2 0.4.30", - "quote 0.6.13", - "syn 0.15.44", + "proc-macro2", + "quote", + "syn", ] [[package]] name = "syn" -version = "0.15.44" +version = "1.0.73" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "9ca4b3b69a77cbe1ffc9e198781b7acb0c7365a883670e8f1c1bc66fba79a5c5" +checksum = "f71489ff30030d2ae598524f61326b902466f72a0fb1a8564c001cc63425bcc7" dependencies = [ - "proc-macro2 0.4.30", - "quote 0.6.13", - "unicode-xid 0.1.0", + "proc-macro2", + "quote", + "unicode-xid", ] [[package]] -name = "syn" -version = "1.0.65" +name = "tap" +version = "1.0.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f3a1d708c221c5a612956ef9f75b37e454e88d1f7b899fbd3a18d4252012d663" -dependencies = [ - "proc-macro2 1.0.24", - "quote 1.0.9", - "unicode-xid 0.2.1", -] +checksum = "55937e1799185b12863d447f42597ed69d9928686b8d88a1df17376a097d8369" [[package]] name = "tempfile" @@ -2115,8 +1834,8 @@ checksum = "dac1c663cfc93810f88aed9b8941d48cabf856a1b111c29a40439018d870eb22" dependencies = [ "cfg-if 1.0.0", "libc", - "rand 0.8.3", - "redox_syscall 0.2.5", + "rand 0.8.4", + "redox_syscall", "remove_dir_all", "winapi", ] @@ -2133,21 +1852,10 @@ dependencies = [ ] [[package]] -name = "term" -version = "0.5.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "edd106a334b7657c10b7c540a0106114feadeb4dc314513e97df481d5d966f42" -dependencies = [ - "byteorder", - "dirs", - "winapi", -] - -[[package]] name = "terminal_size" -version = "0.1.16" +version = "0.1.17" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "86ca8ced750734db02076f44132d802af0b33b09942331f4459dde8636fd2406" +checksum = "633c1a546cee861a1a6d0dc69ebeca693bf4296661ba7852b9d21d159e0506df" dependencies = [ "libc", "winapi", @@ -2155,7 +1863,7 @@ dependencies = [ [[package]] name = "texlab" -version = "3.2.0" +version = "3.3.0" dependencies = [ "anyhow", "bibutils-sys", @@ -2166,21 +1874,20 @@ dependencies = [ "citeproc", "citeproc-db", "citeproc-io", - "crossbeam-channel 0.5.1", + "crossbeam-channel", "csl", "cstree", "derive_more", "encoding_rs", "encoding_rs_io", "fern", + "flate2", "fnv", "fuzzy-matcher", "html2md", "indoc", "insta", - "itertools 0.10.0", - "lalrpop", - "lalrpop-util", + "itertools 0.10.1", "log", "logos", "lsp-server", @@ -2188,7 +1895,7 @@ dependencies = [ "multimap", "notify", "once_cell", - "petgraph 0.5.1", + "petgraph 0.6.0", "rayon", "regex", "rustc-hash", @@ -2223,22 +1930,22 @@ dependencies = [ [[package]] name = "thiserror" -version = "1.0.24" +version = "1.0.25" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e0f4a65597094d4483ddaed134f409b2cb7c1beccf25201a9f73c719254fa98e" +checksum = "fa6f76457f59514c7eeb4e59d891395fab0b2fd1d40723ae737d64153392e9c6" dependencies = [ "thiserror-impl", ] [[package]] name = "thiserror-impl" -version = "1.0.24" +version = "1.0.25" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "7765189610d8241a44529806d6fd1f2e0a08734313a35d5b3a556f92b381f3c0" +checksum = "8a36768c0fbf1bb15eca10defa29526bda730a2376c2ab4393ccfa16fb1a318d" dependencies = [ - "proc-macro2 1.0.24", - "quote 1.0.9", - "syn 1.0.65", + "proc-macro2", + "quote", + "syn", ] [[package]] @@ -2261,28 +1968,20 @@ dependencies = [ [[package]] name = "time" -version = "0.1.43" +version = "0.1.44" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ca8a50ef2360fbd1eeb0ecd46795a87a19024eb4b53c5dc916ca1fd95fe62438" +checksum = "6db9e6914ab8b1ae1c260a4ae7a49b6c5611b40328a735b21862567685e73255" dependencies = [ "libc", + "wasi 0.10.0+wasi-snapshot-preview1", "winapi", ] [[package]] -name = "tiny-keccak" -version = "2.0.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "2c9d3793400a45f954c52e73d068316d76b6f4e36977e3fcebb13a2721e80237" -dependencies = [ - "crunchy", -] - -[[package]] name = "tinyvec" -version = "1.1.1" +version = "1.2.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "317cca572a0e89c3ce0ca1f1bdc9369547fe318a683418e42ac8f59d14701023" +checksum = "5b5220f05bb7de7f3f53c7c065e1199b3172696fe2db9f9c4d8ad9b4ee74c342" dependencies = [ "tinyvec_macros", ] @@ -2305,24 +2004,24 @@ dependencies = [ [[package]] name = "triomphe" -version = "0.1.2" +version = "0.1.3" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "6e9d872053cf9e5a833d8c1dd772cdc38ab66a908129d6f73c049c986161d07c" +checksum = "46bddb80ec09585c58022a2c55e6e7c11e713d9bb26895f1b56cd945c4040c54" dependencies = [ - "memoffset 0.5.6", + "memoffset", "serde", "stable_deref_trait", ] [[package]] name = "typed-builder" -version = "0.9.0" +version = "0.9.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "345426c7406aa355b60c5007c79a2d1f5b605540072795222f17f6443e6a9c6f" +checksum = "a46ee5bd706ff79131be9c94e7edcb82b703c487766a114434e5790361cf08c5" dependencies = [ - "proc-macro2 1.0.24", - "quote 1.0.9", - "syn 1.0.65", + "proc-macro2", + "quote", + "syn", ] [[package]] @@ -2362,6 +2061,18 @@ dependencies = [ ] [[package]] +name = "unic-ucd-category" +version = "0.9.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "1b8d4591f5fcfe1bd4453baaf803c40e1b1e69ff8455c47620440b46efef91c0" +dependencies = [ + "matches", + "unic-char-property", + "unic-char-range", + "unic-ucd-version", +] + +[[package]] name = "unic-ucd-segment" version = "0.9.0" source = "registry+https://github.com/rust-lang/crates.io-index" @@ -2383,18 +2094,18 @@ dependencies = [ [[package]] name = "unicode-bidi" -version = "0.3.4" +version = "0.3.5" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "49f2bd0c6468a8230e1db229cff8029217cf623c767ea5d60bfbd42729ea54d5" +checksum = "eeb8be209bb1c96b7c177c7420d26e04eccacb0eeae6b980e35fcb74678107e0" dependencies = [ "matches", ] [[package]] name = "unicode-normalization" -version = "0.1.17" +version = "0.1.19" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "07fbfce1c8a97d547e8b5334978438d9d6ec8c20e38f56d4a4374d181493eaef" +checksum = "d54590932941a9e9266f0832deed84ebe1bf2e4c9e4a3554d393d18f5e854bf9" dependencies = [ "tinyvec", ] @@ -2413,15 +2124,9 @@ checksum = "9337591893a19b88d8d87f2cec1e73fad5cdfd10e5a6f349f498ad6ea2ffb1e3" [[package]] name = "unicode-xid" -version = "0.1.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "fc72304796d0818e357ead4e000d19c9c174ab23dc11093ac919054d20a6a7fc" - -[[package]] -name = "unicode-xid" -version = "0.2.1" +version = "0.2.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f7fe0bb3479651439c9112f72b6c505038574c9fbb575ed1bf3b797fa39dd564" +checksum = "8ccb82d61f80a663efe1f787a51b16b5a51e3314d6ac365b08639f52387b33f3" [[package]] name = "unindent" @@ -2460,37 +2165,38 @@ version = "0.8.2" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "bc5cf98d8186244414c848017f0e2676b3fcb46807f6668a97dfe67359a3c4b7" dependencies = [ - "getrandom 0.2.2", + "getrandom 0.2.3", ] [[package]] name = "v_escape" -version = "0.7.4" +version = "0.13.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "660b101c07b5d0863deb9e7fb3138777e858d6d2a79f9e6049a27d1cc77c6da6" +checksum = "039a44473286eb84e4e74f90165feff67c802dbeced7ee4c5b00d719b0d0475e" dependencies = [ + "buf-min", "v_escape_derive", ] [[package]] name = "v_escape_derive" -version = "0.5.6" +version = "0.8.4" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c2ca2a14bc3fc5b64d188b087a7d3a927df87b152e941ccfbc66672e20c467ae" +checksum = "c860ad1273f4eee7006cee05db20c9e60e5d24cba024a32e1094aa8e574f3668" dependencies = [ "nom 4.2.3", - "proc-macro2 1.0.24", - "quote 1.0.9", - "syn 1.0.65", + "proc-macro2", + "quote", + "syn", ] [[package]] name = "v_htmlescape" -version = "0.4.5" +version = "0.10.4" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e33e939c0d8cf047514fb6ba7d5aac78bc56677a6938b2ee67000b91f2e97e41" +checksum = "11d7c2a33ed7cf0dc1b42bcf39e01b6512f9df08f09e1cd8a49d9dc49a6a9482" dependencies = [ - "cfg-if 0.1.10", + "cfg-if 1.0.0", "v_escape", ] @@ -2531,9 +2237,9 @@ checksum = "cccddf32554fecc6acb585f82a32a72e28b48f8c4c1883ddfeeeaa96f7d8e519" [[package]] name = "wasi" -version = "0.10.2+wasi-snapshot-preview1" +version = "0.10.0+wasi-snapshot-preview1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "fd6fbd9a79829dd1ad0cc20627bf1ed606756a7f77edff7b66b7064f9cb327c6" +checksum = "1a143597ca7c7793eff794def352d41792a93c481eb1042423ff7ff72ba2c31f" [[package]] name = "winapi" @@ -2567,6 +2273,12 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "712e227841d057c1ee1cd2fb22fa7e5a5461ae8e48fa2ca79ec42cfc1931183f" [[package]] +name = "wyz" +version = "0.2.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "85e60b0d1b5f99db2556934e21937020776a5d31520bf169e851ac44e6420214" + +[[package]] name = "xml5ever" version = "0.16.1" source = "registry+https://github.com/rust-lang/crates.io-index" @@ -2574,15 +2286,15 @@ checksum = "0b1b52e6e8614d4a58b8e70cf51ec0cc21b256ad8206708bcff8139b5bbd6a59" dependencies = [ "log", "mac", - "markup5ever 0.10.1", + "markup5ever", "time", ] [[package]] name = "xmlparser" -version = "0.10.0" +version = "0.13.3" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "8110496c5bcc0d966b0b2da38d5a791aa139eeb0b80e7840a7463c2b806921eb" +checksum = "114ba2b24d2167ef6d67d7d04c8cc86522b87f490025f39f0303b7db5bf5e3d8" [[package]] name = "yaml-rust" diff --git a/support/texlab/Cargo.toml b/support/texlab/Cargo.toml index 790c5d8fe0..13a27a8bd0 100644 --- a/support/texlab/Cargo.toml +++ b/support/texlab/Cargo.toml @@ -1,7 +1,7 @@ [package] name = "texlab" description = "LaTeX Language Server" -version = "3.2.0" +version = "3.3.0" license = "GPL-3.0" readme = "README.md" authors = [ @@ -25,63 +25,60 @@ citation = [ "csl", "fnv", "html2md", - "lalrpop-util", - "lalrpop", ] semantic = [] [dependencies] -anyhow = "1.0.40" -bibutils-sys = { version = "0.1.1", optional = true } +anyhow = "1.0.44" +bibutils-sys = { version="0.1.1", optional=true } byteorder = "1.4.3" cancellation = "0.1" cfg-if = "1.0.0" chashmap = "2.2.2" -citeproc = { git = "https://github.com/cormacrelf/citeproc-rs", rev = "68c7a7c16088b5d7751641ab37299ad064cdb221", optional = true } -citeproc-db = { git = "https://github.com/cormacrelf/citeproc-rs", rev = "68c7a7c16088b5d7751641ab37299ad064cdb221", optional = true } -citeproc-io = { git = "https://github.com/cormacrelf/citeproc-rs", rev = "68c7a7c16088b5d7751641ab37299ad064cdb221", optional = true } -csl = { git = "https://github.com/cormacrelf/citeproc-rs", rev = "68c7a7c16088b5d7751641ab37299ad064cdb221", optional = true } +citeproc = { git="https://github.com/cormacrelf/citeproc-rs", rev="5252fbd8d2046a5a7d5cdcee6c6cb39bd0f1a7f3", optional=true } +citeproc-db = { git="https://github.com/cormacrelf/citeproc-rs", rev="5252fbd8d2046a5a7d5cdcee6c6cb39bd0f1a7f3", optional=true } +citeproc-io = { git="https://github.com/cormacrelf/citeproc-rs", rev="5252fbd8d2046a5a7d5cdcee6c6cb39bd0f1a7f3", optional=true } +csl = { git="https://github.com/cormacrelf/citeproc-rs", rev="5252fbd8d2046a5a7d5cdcee6c6cb39bd0f1a7f3", optional=true } crossbeam-channel = "0.5.1" -cstree = "0.5.0" -derive_more = "0.99.14" +cstree = "0.6.1" +derive_more = "0.99.16" encoding_rs = "0.8.28" encoding_rs_io = "0.1.7" +flate2 = "1.0.22" fern = "0.6" -fnv = { version = "1.0", optional = true } -fuzzy-matcher = { version = "0.3.7", optional = true } -html2md = { version = "0.2.11", optional = true } -itertools = "0.10.0" -lalrpop-util = { version = "0.19.5", optional = true } +fnv = { version="1.0", optional=true } +fuzzy-matcher = { version="0.3.7", optional=true } +html2md = { version="0.2.13", optional=true } +itertools = "0.10.1" log = "0.4.14" logos = "0.12.0" lsp-server = "0.5" -lsp-types = "0.89.1" +lsp-types = "0.90.0" multimap = "0.8.3" -notify = "5.0.0-pre.9" -once_cell = "1.7.2" -petgraph = "0.5.1" +notify = "5.0.0-pre.10" +once_cell = "1.8.0" +petgraph = "0.6.0" rayon = "1.5.1" regex = "1.5.4" rustc-hash = "1.1.0" -serde = "1.0.126" -serde_json = "1.0.64" +serde = "1.0.130" +serde_json = "1.0.68" serde_repr = "0.1.7" -smol_str = { version = "0.1.17", features = ["serde"] } +smol_str = { version="0.1.18", features=["serde"] } structopt = "0.3" tempfile = "3.2.0" threadpool = "1.8.1" titlecase = "1.1.0" url = "2.2.2" -uuid = { version = "0.8.2", features = ["v4"] } +uuid = { version="0.8.2", features=["v4"] } [dev-dependencies] indoc = "1.0.3" -insta = "1.7.1" -typed-builder = "0.9.0" +insta = "1.8.0" +typed-builder = "0.9.1" unindent = "0.1.7" [build-dependencies] -lalrpop = { version = "0.19.5", features = ["lexer"], optional = true } [profile.release] lto = true diff --git a/support/texlab/build.rs b/support/texlab/build.rs deleted file mode 100644 index e14ac6747e..0000000000 --- a/support/texlab/build.rs +++ /dev/null @@ -1,6 +0,0 @@ -fn main() { - println!("cargo:rerun-if-changed=src/citation/name/parser.lalrpop"); - - #[cfg(feature = "citation")] - lalrpop::process_root().unwrap(); -} diff --git a/support/texlab/data/components.json b/support/texlab/data/components.json deleted file mode 100644 index 74a6aefea6..0000000000 --- a/support/texlab/data/components.json +++ /dev/null @@ -1 +0,0 @@ -{"components": [{"commands": [{"glyph": null, "image": null, "name": "!", "parameters": []}, {"glyph": null, "image": "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", "name": "'", "parameters": [[]]}, {"glyph": null, "image": null, "name": "#", "parameters": []}, {"glyph": "$", "image": "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", "name": "$", "parameters": []}, {"glyph": null, "image": null, "name": "%", "parameters": []}, {"glyph": null, "image": null, "name": "&", "parameters": []}, {"glyph": null, "image": "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", "name": "\"", "parameters": [[]]}, {"glyph": null, "image": null, "name": "*", "parameters": []}, {"glyph": null, "image": null, "name": "+", "parameters": []}, {"glyph": null, "image": null, "name": ",", "parameters": []}, {"glyph": null, "image": null, "name": "-", "parameters": []}, {"glyph": null, "image": "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", "name": ".", "parameters": [[]]}, {"glyph": null, "image": null, "name": "/", "parameters": []}, {"glyph": null, "image": null, "name": ":", "parameters": []}, {"glyph": null, "image": null, "name": "<", "parameters": []}, {"glyph": null, "image": "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", "name": "=", "parameters": [[]]}, {"glyph": null, "image": null, "name": "> |