From c1ab68801d075c84a1f9a00ee39e05509f9bd759 Mon Sep 17 00:00:00 2001 From: Bryan Newbold Date: Tue, 29 Mar 2022 13:53:02 -0700 Subject: cargo: minor dependency updates, and re-lock --- Cargo.lock | 121 +++++++++++--------------------------------------- fatcat-cli/Cargo.toml | 9 ++-- 2 files changed, 29 insertions(+), 101 deletions(-) diff --git a/Cargo.lock b/Cargo.lock index e848f5a..e065f5c 100644 --- a/Cargo.lock +++ b/Cargo.lock @@ -41,20 +41,6 @@ version = "1.0.44" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "61604a8f862e1d5c3229fdd78f8b02c68dcf73a4c4b05fd636d12240aaa242c1" -[[package]] -name = "assert_cmd" -version = "1.0.8" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c98233c6673d8601ab23e77eb38f999c51100d46c5703b17288c57fddf3a1ffe" -dependencies = [ - "bstr", - "doc-comment", - "predicates", - "predicates-core", - "predicates-tree", - "wait-timeout", -] - [[package]] name = "async-trait" version = "0.1.51" @@ -111,17 +97,6 @@ version = "1.3.2" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "bef38d45163c2f1dde094a7dfd33ccf595c92905c8f8f4fdc18d06fb1037718a" -[[package]] -name = "bstr" -version = "0.2.17" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ba3569f383e8f1598449f1a423e72e99569137b47740b1da11ef19af3d5c3223" -dependencies = [ - "lazy_static", - "memchr", - "regex-automata", -] - [[package]] name = "bumpalo" version = "3.7.1" @@ -234,9 +209,7 @@ dependencies = [ "encode_unicode", "libc", "once_cell", - "regex", "terminal_size", - "unicode-width", "winapi 0.3.9", ] @@ -282,18 +255,6 @@ version = "2.3.2" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "3ee2393c4a91429dffb4bedf19f4d6abf27d8a732c8ce4980305d782e5426d57" -[[package]] -name = "difflib" -version = "0.4.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "6184e33543162437515c2e2b48714794e37845ec9851711914eec9d308f6ebe8" - -[[package]] -name = "doc-comment" -version = "0.3.3" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "fea41bba32d969b513997752735605054bc0dfa92b4c56bf1189f2e174be7a10" - [[package]] name = "dtoa" version = "0.4.8" @@ -328,7 +289,20 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "44533bbbb3bb3c1fa17d9f2e4e38bbbaf8396ba82193c4cb1b6445d711445d36" dependencies = [ "atty", - "humantime", + "humantime 1.3.0", + "log 0.4.14", + "regex", + "termcolor", +] + +[[package]] +name = "env_logger" +version = "0.9.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "0b2cf0344971ee6c64c31be0d530793fba457d322dfec2810c453d0ef228f9c3" +dependencies = [ + "atty", + "humantime 2.1.0", "log 0.4.14", "regex", "termcolor", @@ -339,13 +313,12 @@ name = "fatcat-cli" version = "0.1.6" dependencies = [ "anyhow", - "assert_cmd", "atty", "chrono-humanize", "colored_json", "crossbeam-channel", "data-encoding", - "env_logger", + "env_logger 0.9.0", "fatcat-openapi", "hyper", "indicatif", @@ -374,7 +347,7 @@ dependencies = [ "async-trait", "chrono", "clap", - "env_logger", + "env_logger 0.7.1", "frunk", "frunk-enum-core", "frunk-enum-derive", @@ -737,6 +710,12 @@ dependencies = [ "quick-error", ] +[[package]] +name = "humantime" +version = "2.1.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "9a3a5bfb195931eeb336b2a7b4d761daec841b97f947d34394601737a7bba5e4" + [[package]] name = "hyper" version = "0.13.10" @@ -833,9 +812,9 @@ dependencies = [ [[package]] name = "indicatif" -version = "0.15.0" +version = "0.16.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "7baab56125e25686df467fe470785512329883aab42696d661247aca2a2896e4" +checksum = "2d207dc617c7a380ab07ff572a6e52fa202a2a8f355860ac9c38e23f8196be1b" dependencies = [ "console", "lazy_static", @@ -1100,9 +1079,9 @@ dependencies = [ [[package]] name = "number_prefix" -version = "0.3.0" +version = "0.4.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "17b02fc0ff9a9e4b35b3342880f48e896ebf69f2967921fe8646bf5b7125956a" +checksum = "830b246a0e5f20af87141b25c173cd1b609bd7779a4617d6ec582abaf90870f3" [[package]] name = "once_cell" @@ -1205,33 +1184,6 @@ version = "0.2.14" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "c3ca011bd0129ff4ae15cd04c4eef202cadf6c51c21e47aba319b4e0501db741" -[[package]] -name = "predicates" -version = "2.0.3" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "5c6ce811d0b2e103743eec01db1c50612221f173084ce2f7941053e94b6bb474" -dependencies = [ - "difflib", - "itertools", - "predicates-core", -] - -[[package]] -name = "predicates-core" -version = "1.0.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "57e35a3326b75e49aa85f5dc6ec15b41108cf5aee58eabb1f274dd18b73c2451" - -[[package]] -name = "predicates-tree" -version = "1.0.4" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "338c7be2905b732ae3984a2f40032b5e94fd8f52505b186c7d4d68d193445df7" -dependencies = [ - "predicates-core", - "termtree", -] - [[package]] name = "proc-macro-error" version = "1.0.4" @@ -1376,12 +1328,6 @@ dependencies = [ "regex-syntax", ] -[[package]] -name = "regex-automata" -version = "0.1.10" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "6c230d73fb8d8c1b9c0b3135c5142a8acee3a0558fb8db5cf1cb65f8d7862132" - [[package]] name = "regex-syntax" version = "0.6.25" @@ -1755,12 +1701,6 @@ dependencies = [ "winapi 0.3.9", ] -[[package]] -name = "termtree" -version = "0.2.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "78fbf2dd23e79c28ccfa2472d3e6b3b189866ffef1aeb91f17c2d968b6586378" - [[package]] name = "textwrap" version = "0.11.0" @@ -2011,15 +1951,6 @@ version = "0.9.3" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "5fecdca9a5291cc2b8dcf7dc02453fee791a280f3743cb0905f8822ae463b3fe" -[[package]] -name = "wait-timeout" -version = "0.2.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "9f200f5b12eb75f8c1ed65abd4b2db8a6e1b138a20de009dacee265a2498f3f6" -dependencies = [ - "libc", -] - [[package]] name = "want" version = "0.3.0" diff --git a/fatcat-cli/Cargo.toml b/fatcat-cli/Cargo.toml index 161dd58..513d8ad 100644 --- a/fatcat-cli/Cargo.toml +++ b/fatcat-cli/Cargo.toml @@ -29,21 +29,18 @@ tokio = { version = "0.2", features = ["rt-threaded", "macros", "stream"] } serde_json = "1.0" anyhow = "1.0" log = "0.4" -env_logger = "0.7" -regex = { version = "1.3", default-features = false, features = ["perf-literal"] } +env_logger = "0.9" +regex = { version = "1.5", default-features = false, features = ["perf-literal"] } lazy_static = "1" serde = "1.0" reqwest = { version = "0.10", features = ["blocking", "json"] } chrono-humanize = "*" tempfile = "3" -indicatif = "0.15" +indicatif = "0.16" url = "*" sha1 = { version = "*", features = ["std"] } crossbeam-channel = "0.5" -[dev-dependencies] -assert_cmd = "1" - [package.metadata.deb] maintainer = "Bryan Newbold " depends = "$auto" -- cgit v1.2.3