From 1d42d6674c5bbeca2be1ca9a35dccd71b9346228 Mon Sep 17 00:00:00 2001 From: Alex Saveau Date: Wed, 26 Apr 2023 02:22:43 -0700 Subject: [PATCH] Upgrade a bunch of deps and remove two unused ones (#968) --- Cargo.lock | 126 ++++++++++++++++++++++++--------------------- Cargo.toml | 5 +- cli/Cargo.toml | 14 ++--- library/Cargo.toml | 4 +- macros/Cargo.toml | 1 - src/font/book.rs | 1 + tests/Cargo.toml | 8 +-- 7 files changed, 82 insertions(+), 77 deletions(-) diff --git a/Cargo.lock b/Cargo.lock index c47d08a80..efe42339d 100644 --- a/Cargo.lock +++ b/Cargo.lock @@ -22,9 +22,9 @@ dependencies = [ [[package]] name = "aho-corasick" -version = "0.7.20" +version = "1.0.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "cc936419f96fa211c1b9166887b38e5e40b19958e5b895be7c1f93adec7071ac" +checksum = "67fc08ce920c31afb70f013dcce1bfc3a3195de6a228474e45e1f145b36f8d04" dependencies = [ "memchr", ] @@ -40,9 +40,9 @@ dependencies = [ [[package]] name = "anstream" -version = "0.3.0" +version = "0.3.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "9e579a7752471abc2a8268df8b20005e3eadd975f585398f17efcfd8d4927371" +checksum = "6342bd4f5a1205d7f41e94a41a901f5647c938cdfa96036338e8533c9d6c2450" dependencies = [ "anstyle", "anstyle-parse", @@ -79,9 +79,9 @@ dependencies = [ [[package]] name = "anstyle-wincon" -version = "1.0.0" +version = "1.0.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "4bcd8291a340dd8ac70e18878bc4501dd7b4ff970cfa21c207d36ece51ea88fd" +checksum = "180abfa45703aebe0093f79badacc01b8fd4ea2e35118747e5811127f926e188" dependencies = [ "anstyle", "windows-sys 0.48.0", @@ -172,6 +172,15 @@ version = "1.3.2" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "bef38d45163c2f1dde094a7dfd33ccf595c92905c8f8f4fdc18d06fb1037718a" +[[package]] +name = "bitflags" +version = "2.2.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "24a6904aef64d73cf10ab17ebace7befb918b82164785cb89907993be7f83813" +dependencies = [ + "serde", +] + [[package]] name = "bitvec" version = "1.0.1" @@ -186,9 +195,9 @@ dependencies = [ [[package]] name = "bumpalo" -version = "3.12.0" +version = "3.12.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "0d261e256854913907f67ed06efbc3338dfe6179796deefc1ff763fc1aee5535" +checksum = "9b1ce199063694f33ffb7dd4e0ee620741495c32833cde5aa08f02a0bf96f0c8" [[package]] name = "bytemuck" @@ -216,9 +225,9 @@ checksum = "baf1de4339761588bc0619e3cbc0120ee582ebb74b53b4efbf79117bd2da40fd" [[package]] name = "chinese-number" -version = "0.7.1" +version = "0.7.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "9f9a8cffacecd7f477f8395021158af07c8a3f74523e9b90e4e4bb0105deaa74" +checksum = "bb8659add27dbba7575c058a3265d81cc078dc2693848445bf3788a883ec82c8" dependencies = [ "chinese-variant", "enum-ordinalize", @@ -246,12 +255,12 @@ dependencies = [ [[package]] name = "clap" -version = "3.2.23" +version = "3.2.24" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "71655c45cb9845d3270c9d6df84ebe72b4dad3c2ba3f7023ad47c144e4e473a5" +checksum = "eef2b3ded6a26dfaec672a742c93c8cf6b689220324da509ec5caa20de55dc83" dependencies = [ "atty", - "bitflags", + "bitflags 1.3.2", "clap_lex 0.2.4", "indexmap", "strsim", @@ -278,16 +287,16 @@ checksum = "84080e799e54cff944f4b4a4b0e71630b0e0443b25b985175c7dddc1a859b749" dependencies = [ "anstream", "anstyle", - "bitflags", + "bitflags 1.3.2", "clap_lex 0.4.1", "strsim", ] [[package]] name = "clap_complete" -version = "4.2.0" +version = "4.2.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "01c22dcfb410883764b29953103d9ef7bb8fe21b3fa1158bc99986c2067294bd" +checksum = "1a19591b2ab0e3c04b588a0e04ddde7b9eaa423646d1b4a8092879216bf47473" dependencies = [ "clap 4.2.4", ] @@ -519,22 +528,22 @@ dependencies = [ [[package]] name = "dirs" -version = "4.0.0" +version = "5.0.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ca3aa72a6f96ea37bbc5aa912f6788242832f75369bdfdadcb0e38423f100059" +checksum = "dece029acd3353e3a58ac2e3eb3c8d6c35827a892edc6cc4138ef9c33df46ecd" dependencies = [ "dirs-sys", ] [[package]] name = "dirs-sys" -version = "0.3.7" +version = "0.4.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "1b1d1d91c932ef41c0f2663aa8b0ca0342d444d842c06914aa0a7e352d0bada6" +checksum = "04414300db88f70d74c5ff54e50f9e1d1737d9a5b90f53fcf2e95ca2a9ab554b" dependencies = [ "libc", "redox_users", - "winapi", + "windows-sys 0.45.0", ] [[package]] @@ -942,7 +951,7 @@ version = "0.9.6" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "f8069d3ec154eb856955c1c0fbffefbf5f3c40a104ec912d4797314c1801abff" dependencies = [ - "bitflags", + "bitflags 1.3.2", "inotify-sys", "libc", ] @@ -1068,7 +1077,7 @@ version = "1.0.3" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "8367585489f01bc55dd27404dcf56b95e6da061a256a666ab23be9ba96a2e587" dependencies = [ - "bitflags", + "bitflags 1.3.2", "libc", ] @@ -1128,9 +1137,9 @@ checksum = "0717cef1bc8b636c6e1c1bbdefc09e6322da8a9321966e8928ef80d20f7f770f" [[package]] name = "linux-raw-sys" -version = "0.3.3" +version = "0.3.4" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "9b085a4f2cde5781fc4b1717f2e86c62f5cda49de7ba99a7c2eae02b61c9064c" +checksum = "36eb31c1778188ae1e64398743890d0877fef36d11521ac60406b42016e8c2cf" [[package]] name = "lipsum" @@ -1237,7 +1246,7 @@ version = "5.1.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "58ea850aa68a06e48fdb069c0ec44d0d64c8dbffa49bf3b6f7f0a901fdea1ba9" dependencies = [ - "bitflags", + "bitflags 1.3.2", "crossbeam-channel", "filetime", "fsevent-sys", @@ -1361,7 +1370,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "630638e107fb436644c300e781d3f17e1b04656138ba0d40564be4be3b06db32" dependencies = [ "bitvec", - "clap 3.2.23", + "clap 3.2.24", "crossbeam-channel", "filetime", "image", @@ -1409,7 +1418,7 @@ version = "0.6.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "249f9b33a3192626f2cd9f4b0cd66c1ec32d65968d58cf4d8239977feddddead" dependencies = [ - "bitflags", + "bitflags 1.3.2", "itoa", "ryu", ] @@ -1465,7 +1474,7 @@ version = "0.17.8" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "aaeebc51f9e7d2c150d3f3bfeb667f2aa985db5ef1e3d212847bdedb488beeaa" dependencies = [ - "bitflags", + "bitflags 1.3.2", "crc32fast", "fdeflate", "flate2", @@ -1502,7 +1511,7 @@ version = "0.9.2" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "2d9cc634bc78768157b5cbfe988ffcd1dcba95cd2b2f03a88316c08c6d00ed63" dependencies = [ - "bitflags", + "bitflags 1.3.2", "getopts", "memchr", "unicase", @@ -1591,7 +1600,7 @@ version = "0.2.16" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "fb5a58c1855b4b6819d59012155603f0b22ad30cad752600aadfcb695265519a" dependencies = [ - "bitflags", + "bitflags 1.3.2", ] [[package]] @@ -1600,7 +1609,7 @@ version = "0.3.5" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "567664f262709473930a4bf9e51bf2ebf3348f2e748ccc50dea20646858f8f29" dependencies = [ - "bitflags", + "bitflags 1.3.2", ] [[package]] @@ -1616,13 +1625,13 @@ dependencies = [ [[package]] name = "regex" -version = "1.7.3" +version = "1.8.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "8b1f693b24f6ac912f4893ef08244d70b6067480d2f1a46e950c9691e6749d1d" +checksum = "af83e617f331cc6ae2da5443c602dfa5af81e517212d9d611a5b3ba1777b5370" dependencies = [ "aho-corasick", "memchr", - "regex-syntax", + "regex-syntax 0.7.1", ] [[package]] @@ -1631,6 +1640,12 @@ version = "0.6.29" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "f162c6dd7b008981e4d40210aca20b4bd0f9b60ca9271061b07f78537722f2e1" +[[package]] +name = "regex-syntax" +version = "0.7.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "a5996294f19bd3aae0453a862ad728f60e6600695733dd5df01da90c54363a3c" + [[package]] name = "resvg" version = "0.22.0" @@ -1704,11 +1719,11 @@ dependencies = [ [[package]] name = "rustix" -version = "0.37.13" +version = "0.37.14" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f79bef90eb6d984c72722595b5b1348ab39275a5e5123faca6863bf07d75a4e0" +checksum = "d9b864d3c18a5785a05953adeed93e2dca37ed30f18e69bba9f30079d51f363f" dependencies = [ - "bitflags", + "bitflags 1.3.2", "errno", "io-lifetimes", "libc", @@ -1740,7 +1755,7 @@ version = "0.5.1" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "a617c811f5c9a7060fe511d35d13bf5b9f0463ce36d63ce666d05779df2b4eba" dependencies = [ - "bitflags", + "bitflags 1.3.2", "bytemuck", "smallvec", "ttf-parser 0.15.2", @@ -2008,13 +2023,13 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "c6c454c27d9d7d9a84c7803aaa3c50cd088d2906fe3c6e42da3209aa623576a8" dependencies = [ "bincode", - "bitflags", + "bitflags 1.3.2", "fancy-regex", "flate2", "fnv", "lazy_static", "once_cell", - "regex-syntax", + "regex-syntax 0.6.29", "serde", "serde_derive", "serde_json", @@ -2056,12 +2071,6 @@ version = "0.16.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "222a222a5bfe1bba4a77b45ec488a741b3cb8872e5e499451fd7d0129c9c7c3d" -[[package]] -name = "thin-vec" -version = "0.2.12" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "aac81b6fd6beb5884b0cf3321b8117e6e5d47ecb6fc89f414cfdcca8b2fe2dd8" - [[package]] name = "thiserror" version = "1.0.40" @@ -2132,11 +2141,10 @@ checksum = "1f3ccbac311fea05f86f61904b462b55fb3df8837a366dfc601a0161d0532f20" [[package]] name = "tracing" -version = "0.1.37" +version = "0.1.38" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "8ce8c33a8d48bd45d624a6e523445fd21ec13d3653cd51f681abf67418f54eb8" +checksum = "cf9cf6a813d3f40c88b0b6b6f29a5c95c6cdbf97c1f9cc53fb820200f5ad814d" dependencies = [ - "cfg-if", "pin-project-lite", "tracing-attributes", "tracing-core", @@ -2144,13 +2152,13 @@ dependencies = [ [[package]] name = "tracing-attributes" -version = "0.1.23" +version = "0.1.24" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "4017f8f45139870ca7e672686113917c71c7a6e02d4924eda67186083c03081a" +checksum = "0f57e3ca2a01450b1a921183a9c9cbfda207fd822cef4ccb00a65402cbba7a74" dependencies = [ "proc-macro2", "quote", - "syn 1.0.109", + "syn 2.0.15", ] [[package]] @@ -2197,9 +2205,9 @@ dependencies = [ [[package]] name = "tracing-subscriber" -version = "0.3.16" +version = "0.3.17" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a6176eae26dd70d0c919749377897b54a9276bd7061339665dd68777926b5a70" +checksum = "30a651bc37f915e81f087d86e62a18eec5f79550c7faff886f7090b4ea757c77" dependencies = [ "nu-ansi-term", "sharded-slab", @@ -2237,7 +2245,7 @@ checksum = "6af6ae20167a9ece4bcb41af5b80f8a1f1df981f6391189ce00fd257af04126a" name = "typst" version = "0.2.0" dependencies = [ - "bitflags", + "bitflags 2.2.1", "bytemuck", "comemo", "ecow", @@ -2247,7 +2255,7 @@ dependencies = [ "image", "indexmap", "log", - "miniz_oxide 0.5.4", + "miniz_oxide 0.7.1", "once_cell", "pdf-writer", "pixglyph", @@ -2260,7 +2268,6 @@ dependencies = [ "stacker", "subsetter", "svg2pdf", - "thin-vec", "tiny-skia", "tracing", "ttf-parser 0.18.1", @@ -2360,7 +2367,6 @@ dependencies = [ "proc-macro2", "quote", "syn 1.0.109", - "unscanny", ] [[package]] @@ -2375,7 +2381,7 @@ dependencies = [ "oxipng", "rayon", "tiny-skia", - "ttf-parser 0.17.1", + "ttf-parser 0.18.1", "typst", "typst-library", "unscanny", diff --git a/Cargo.toml b/Cargo.toml index 3c991c092..cab4f3a5b 100644 --- a/Cargo.toml +++ b/Cargo.toml @@ -21,7 +21,7 @@ bench = false [dependencies] typst-macros = { path = "macros" } -bitflags = "1" +bitflags = { version = "2", features = ["serde"] } bytemuck = "1" comemo = "0.2.2" ecow = "0.1" @@ -30,7 +30,7 @@ fontdb = "0.9" if_chain = "1" image = { version = "0.24", default-features = false, features = ["png", "jpeg", "gif"] } log = "0.4" -miniz_oxide = "0.5" +miniz_oxide = "0.7" once_cell = "1" pdf-writer = "0.6" pixglyph = "0.1" @@ -42,7 +42,6 @@ serde = { version = "1", features = ["derive"] } siphasher = "0.3" subsetter = "0.1.1" svg2pdf = "0.4" -thin-vec = "0.2" tiny-skia = "0.6.6" ttf-parser = "0.18.1" unicode-math-class = "0.1" diff --git a/cli/Cargo.toml b/cli/Cargo.toml index 7719874d4..8557281f7 100644 --- a/cli/Cargo.toml +++ b/cli/Cargo.toml @@ -24,26 +24,26 @@ typst-library = { path = "../library" } chrono = { version = "0.4", default-features = false, features = ["clock", "std"] } codespan-reporting = "0.11" comemo = "0.2.2" -dirs = "4" -elsa = "1.7" +dirs = "5" +elsa = "1.8" memmap2 = "0.5" notify = "5" once_cell = "1" same-file = "1" siphasher = "0.3" walkdir = "2" -clap = { version = "4.2.1", features = ["derive", "env"] } -open = "4.0.1" +clap = { version = "4.2.4", features = ["derive", "env"] } +open = "4.0.2" tracing = "0.1.37" -tracing-subscriber = "0.3.16" +tracing-subscriber = "0.3.17" tracing-flame = "0.2.0" tracing-error = "0.2" inferno = "0.11.15" tempfile = "3.5.0" [build-dependencies] -clap = { version = "4.2.1", features = ["derive", "string"] } -clap_complete = "4.2.0" +clap = { version = "4.2.4", features = ["derive", "string"] } +clap_complete = "4.2.1" clap_mangen = "0.2.10" [features] diff --git a/library/Cargo.toml b/library/Cargo.toml index d23a2f414..889ea70de 100644 --- a/library/Cargo.toml +++ b/library/Cargo.toml @@ -33,10 +33,10 @@ smallvec = "1.10" syntect = { version = "5", default-features = false, features = ["default-syntaxes", "regex-fancy"] } ttf-parser = "0.18.1" typed-arena = "2" -unicode-bidi = "0.3.5" +unicode-bidi = "0.3.13" unicode-math-class = "0.1" unicode-script = "0.5" unicode-segmentation = "1" xi-unicode = "0.3" -chinese-number = { version = "0.7.1", default-features = false, features = ["number-to-chinese"] } +chinese-number = { version = "0.7.2", default-features = false, features = ["number-to-chinese"] } tracing = "0.1.37" diff --git a/macros/Cargo.toml b/macros/Cargo.toml index 4b04c7316..337c03a6b 100644 --- a/macros/Cargo.toml +++ b/macros/Cargo.toml @@ -19,5 +19,4 @@ bench = false proc-macro2 = "1" quote = "1" syn = { version = "1", features = ["full", "extra-traits"] } -unscanny = "0.1" heck = "0.4" diff --git a/src/font/book.rs b/src/font/book.rs index 5af2ccb2e..2b7742bf8 100644 --- a/src/font/book.rs +++ b/src/font/book.rs @@ -174,6 +174,7 @@ pub struct FontInfo { bitflags::bitflags! { /// Bitflags describing characteristics of a font. + #[derive(Copy, Clone, Eq, PartialEq, Hash, Debug)] #[derive(Serialize, Deserialize)] #[serde(transparent)] pub struct FontFlags: u32 { diff --git a/tests/Cargo.toml b/tests/Cargo.toml index 78df5edfd..a1eb0da8c 100644 --- a/tests/Cargo.toml +++ b/tests/Cargo.toml @@ -9,16 +9,16 @@ publish = false typst = { path = ".." } typst-library = { path = "../library" } comemo = "0.2.2" -elsa = "1.7" +elsa = "1.8" iai = { git = "https://github.com/reknih/iai" } once_cell = "1" oxipng = "8.0.0" rayon = "1.7.0" -tiny-skia = "0.6.2" -ttf-parser = "0.17" +tiny-skia = "0.6.6" +ttf-parser = "0.18.1" unscanny = "0.1" walkdir = "2" -clap = { version = "4.2.1", features = ["derive"] } +clap = { version = "4.2.4", features = ["derive"] } [[test]] name = "tests"