From f8e6720e3ee809e712e8fea00c6ed2d098be650a Mon Sep 17 00:00:00 2001 From: Matthias Endler Date: Mon, 26 Jun 2023 12:59:09 +0200 Subject: [PATCH] Cleanup Cargo.toml files (#1121) --- Cargo.lock | 106 +++++++++++++++++++++++++----------------- lychee-bin/Cargo.toml | 47 +++++++++---------- lychee-lib/Cargo.toml | 34 +++++++------- 3 files changed, 103 insertions(+), 84 deletions(-) diff --git a/Cargo.lock b/Cargo.lock index 81068c4..5eb07ab 100644 --- a/Cargo.lock +++ b/Cargo.lock @@ -259,7 +259,7 @@ checksum = "0e97ce7de6cf12de5d7226c73f5ba9811622f4db3a5b91b55c53e987e5f91cba" dependencies = [ "proc-macro2", "quote", - "syn 2.0.18", + "syn 2.0.22", ] [[package]] @@ -347,7 +347,7 @@ checksum = "16e62a023e7c117e27523144c5d2459f4397fcc3cab0085af8e2224f643a0193" dependencies = [ "proc-macro2", "quote", - "syn 2.0.18", + "syn 2.0.22", ] [[package]] @@ -364,7 +364,7 @@ checksum = "b9ccdd8f2a161be9bd5c023df56f1b2a0bd1d83872ae53b71a84a12c9bf6e842" dependencies = [ "proc-macro2", "quote", - "syn 2.0.18", + "syn 2.0.22", ] [[package]] @@ -621,9 +621,9 @@ dependencies = [ [[package]] name = "clap" -version = "4.3.5" +version = "4.3.8" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "2686c4115cb0810d9a984776e197823d08ec94f176549a89a9efded477c456dc" +checksum = "d9394150f5b4273a1763355bd1c2ec54cc5a2593f790587bcd6b2c947cfa9211" dependencies = [ "clap_builder", "clap_derive", @@ -632,9 +632,9 @@ dependencies = [ [[package]] name = "clap_builder" -version = "4.3.5" +version = "4.3.8" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "2e53afce1efce6ed1f633cf0e57612fe51db54a1ee4fd8f8503d078fe02d69ae" +checksum = "9a78fbdd3cc2914ddf37ba444114bc7765bbdcb55ec9cbe6fa054f0137400717" dependencies = [ "anstream", "anstyle", @@ -652,7 +652,7 @@ dependencies = [ "heck", "proc-macro2", "quote", - "syn 2.0.18", + "syn 2.0.22", ] [[package]] @@ -952,7 +952,7 @@ dependencies = [ "proc-macro2", "quote", "strsim", - "syn 2.0.18", + "syn 2.0.22", ] [[package]] @@ -974,7 +974,7 @@ checksum = "29a358ff9f12ec09c3e61fef9b5a9902623a695a46a917b07f269bff1445611a" dependencies = [ "darling_core 0.20.1", "quote", - "syn 2.0.18", + "syn 2.0.22", ] [[package]] @@ -1143,6 +1143,12 @@ dependencies = [ "termcolor", ] +[[package]] +name = "equivalent" +version = "1.0.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "88bffebc5d80432c9b140ee17875ff173a8ab62faad5b257da912bd2f6c1c0a1" + [[package]] name = "errno" version = "0.3.1" @@ -1352,7 +1358,7 @@ checksum = "89ca545a94061b6365f2c7355b4b32bd20df3ff95f02da9329b34ccc3bd6ee72" dependencies = [ "proc-macro2", "quote", - "syn 2.0.18", + "syn 2.0.22", ] [[package]] @@ -1470,7 +1476,7 @@ dependencies = [ "futures-sink", "futures-util", "http", - "indexmap", + "indexmap 1.9.3", "slab", "tokio", "tokio-util", @@ -1495,6 +1501,12 @@ version = "0.13.2" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "43a3c133739dddd0d2990f9a4bdf8eb4b21ef50e4851ca85ab661199821d510e" +[[package]] +name = "hashbrown" +version = "0.14.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "2c6201b9ff9fd90a5a3bac2e56a830d0caa509576f0e503818ee82c181b3437a" + [[package]] name = "headers" version = "0.3.8" @@ -1783,6 +1795,16 @@ dependencies = [ "serde", ] +[[package]] +name = "indexmap" +version = "2.0.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "d5477fe2230a79769d8dc68e0eabf5437907c0457a5614a9e8dddb67f65eb65d" +dependencies = [ + "equivalent", + "hashbrown 0.14.0", +] + [[package]] name = "indicatif" version = "0.17.5" @@ -1935,9 +1957,9 @@ checksum = "e2abad23fbc42b3700f2f279844dc832adb2b2eb069b2df918f455c4e18cc646" [[package]] name = "libc" -version = "0.2.146" +version = "0.2.147" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f92be4933c13fd498862a9e02a3055f8a8d9c039ce33db97306fd5a6caa7f29b" +checksum = "b4668fb0ea861c1df094127ac5f1da3409a82116a4ba74fca2e58ef927159bb3" [[package]] name = "linked-hash-map" @@ -2358,7 +2380,7 @@ checksum = "a948666b637a0f465e8564c73e89d4dde00d72d4d473cc972f390fc3dcee7d9c" dependencies = [ "proc-macro2", "quote", - "syn 2.0.18", + "syn 2.0.22", ] [[package]] @@ -2548,7 +2570,7 @@ checksum = "39407670928234ebc5e6e580247dd567ad73a3578460c5990f9503df207e8f07" dependencies = [ "proc-macro2", "quote", - "syn 2.0.18", + "syn 2.0.22", ] [[package]] @@ -2700,9 +2722,9 @@ dependencies = [ [[package]] name = "proc-macro2" -version = "1.0.60" +version = "1.0.63" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "dec2b086b7a862cf4de201096214fa870344cf922b2b30c167badb3af3195406" +checksum = "7b368fba921b0dce7e60f5e04ec15e565b3303972b42bcfde1d0713b881959eb" dependencies = [ "unicode-ident", ] @@ -3137,14 +3159,14 @@ checksum = "d9735b638ccc51c28bf6914d90a2e9725b377144fc612c49a611fddd1b631d68" dependencies = [ "proc-macro2", "quote", - "syn 2.0.18", + "syn 2.0.22", ] [[package]] name = "serde_json" -version = "1.0.97" +version = "1.0.99" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "bdf3bf93142acad5821c99197022e170842cdbc1c30482b98750c688c640842a" +checksum = "46266871c240a00b8f503b877622fe33430b3c7d963bdc0f2adc511e54a1eae3" dependencies = [ "itoa", "ryu", @@ -3173,9 +3195,9 @@ dependencies = [ [[package]] name = "serde_spanned" -version = "0.6.2" +version = "0.6.3" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "93107647184f6027e3b7dcb2e11034cf95ffa1e3a682c67951963ac69c1c007d" +checksum = "96426c9936fd7a0124915f9185ea1d20aa9445cc9821142f0a73bc9207a2e186" dependencies = [ "serde", ] @@ -3201,7 +3223,7 @@ dependencies = [ "base64 0.21.2", "chrono", "hex", - "indexmap", + "indexmap 1.9.3", "serde", "serde_json", "serde_with_macros", @@ -3217,7 +3239,7 @@ dependencies = [ "darling 0.20.1", "proc-macro2", "quote", - "syn 2.0.18", + "syn 2.0.22", ] [[package]] @@ -3418,7 +3440,7 @@ dependencies = [ "proc-macro2", "quote", "rustversion", - "syn 2.0.18", + "syn 2.0.22", ] [[package]] @@ -3444,9 +3466,9 @@ dependencies = [ [[package]] name = "syn" -version = "2.0.18" +version = "2.0.22" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "32d41677bcbe24c20c52e7c70b0d8db04134c5d1066bf98662e2871ad200ea3e" +checksum = "2efbeae7acf4eabd6bcdcbd11c92f45231ddda7539edc7806bd1a04a03b24616" dependencies = [ "proc-macro2", "quote", @@ -3534,7 +3556,7 @@ checksum = "f9456a42c5b0d803c8cd86e73dd7cc9edd429499f37a3550d286d5e86720569f" dependencies = [ "proc-macro2", "quote", - "syn 2.0.18", + "syn 2.0.22", ] [[package]] @@ -3636,7 +3658,7 @@ checksum = "630bdcf245f78637c13ec01ffae6187cca34625e8c63150d424b59e55af2675e" dependencies = [ "proc-macro2", "quote", - "syn 2.0.18", + "syn 2.0.22", ] [[package]] @@ -3698,9 +3720,9 @@ dependencies = [ [[package]] name = "toml" -version = "0.7.4" +version = "0.7.5" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d6135d499e69981f9ff0ef2167955a5333c35e36f6937d382974566b3d5b94ec" +checksum = "1ebafdf5ad1220cb59e7d17cf4d2c72015297b75b19a10472f99b89225089240" dependencies = [ "serde", "serde_spanned", @@ -3710,20 +3732,20 @@ dependencies = [ [[package]] name = "toml_datetime" -version = "0.6.2" +version = "0.6.3" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "5a76a9312f5ba4c2dec6b9161fdf25d87ad8a09256ccea5a556fef03c706a10f" +checksum = "7cda73e2f1397b1262d6dfdcef8aafae14d1de7748d66822d3bfeeb6d03e5e4b" dependencies = [ "serde", ] [[package]] name = "toml_edit" -version = "0.19.10" +version = "0.19.11" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "2380d56e8670370eee6566b0bfd4265f65b3f432e8c6d85623f728d4fa31f739" +checksum = "266f016b7f039eec8a1a80dfe6156b633d208b9fccca5e4db1d6775b0c4e34a7" dependencies = [ - "indexmap", + "indexmap 2.0.0", "serde", "serde_spanned", "toml_datetime", @@ -3793,13 +3815,13 @@ dependencies = [ [[package]] name = "tracing-attributes" -version = "0.1.25" +version = "0.1.26" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "8803eee176538f94ae9a14b55b2804eb7e1441f8210b1c31290b3bccdccff73b" +checksum = "5f4f31f56159e98206da9efd823404b79b6ef3143b4a7ab76e67b1751b25a4ab" dependencies = [ "proc-macro2", "quote", - "syn 2.0.18", + "syn 2.0.22", ] [[package]] @@ -4104,7 +4126,7 @@ dependencies = [ "once_cell", "proc-macro2", "quote", - "syn 2.0.18", + "syn 2.0.22", "wasm-bindgen-shared", ] @@ -4138,7 +4160,7 @@ checksum = "54681b18a46765f095758388f2d0cf16eb8d4169b639ab575a8f5693af210c7b" dependencies = [ "proc-macro2", "quote", - "syn 2.0.18", + "syn 2.0.22", "wasm-bindgen-backend", "wasm-bindgen-shared", ] diff --git a/lychee-bin/Cargo.toml b/lychee-bin/Cargo.toml index 3d08e82..963aab1 100644 --- a/lychee-bin/Cargo.toml +++ b/lychee-bin/Cargo.toml @@ -18,12 +18,23 @@ version = "0.13.0" [dependencies] lychee-lib = { path = "../lychee-lib", version = "0.13.0", default-features = false } + anyhow = "1.0.71" +assert-json-diff = "2.0.2" +clap = { version = "4.1.11", features = ["env", "derive"] } console = "0.15.7" const_format = "0.2.31" +csv = "1.2.2" +dashmap = { version = "5.4.0", features = ["serde"] } +env_logger = "0.10.0" +futures = "0.3.27" headers = "0.3.8" http = "0.2.9" +humantime = "2.1.0" +humantime-serde = "1.1.1" indicatif = "0.17.5" +log = "0.4.19" +once_cell = "1.18.0" openssl-sys = { version = "0.9.90", optional = true } pad = "0.1.6" regex = "1.8.4" @@ -33,37 +44,24 @@ reqwest = { version = "0.11.18", default-features = false, features = ["gzip", " # This is necessary for the homebrew build # https://github.com/Homebrew/homebrew-core/pull/70216 ring = "0.16.20" +secrecy = { version = "0.8.0", features = ["serde"] } serde = { version = "1.0.164", features = ["derive"] } serde_json = "1.0.97" -tabled = "0.12.2" -toml = "0.7.4" -tokio = { version = "1.28.2", features = ["full"] } -futures = "0.3.27" -tokio-stream = "0.1.14" -once_cell = "1.18.0" -dashmap = { version = "5.4.0", features = ["serde"] } -csv = "1.2.2" -humantime = "2.1.0" -humantime-serde = "1.1.1" -secrecy = { version = "0.8.0", features = ["serde"] } -supports-color = "2.0.0" -log = "0.4.19" -env_logger = "0.10.0" strum = {version = "0.25.0" , features = ["derive"] } -assert-json-diff = "2.0.2" - -[dependencies.clap] -version = "4.1.11" -features = ["env", "derive"] +supports-color = "2.0.0" +tabled = "0.12.2" +tokio = { version = "1.28.2", features = ["full"] } +tokio-stream = "0.1.14" +toml = "0.7.4" [dev-dependencies] assert_cmd = "2.0.11" -pretty_assertions = "1.3.0" predicates = "3.0.3" +pretty_assertions = "1.3.0" tempfile = "3.6.0" +tracing-subscriber = { version = "0.3.17", default-features = false, features = ["fmt", "registry", "env-filter"] } uuid = { version = "1.3.4", features = ["v4"] } wiremock = "0.5.19" -tracing-subscriber = { version = "0.3.17", default-features = false, features = ["fmt", "registry", "env-filter"] } # console-subscriber is not yet published to crates.io # Users have to uncomment this section and the feature below and build lychee @@ -94,10 +92,9 @@ rustls-tls = ["lychee-lib/rustls-tls", "reqwest/rustls-tls-native-roots"] default = ["native-tls", "email-check"] -# Unfortunately, it's not possible to automatically enable features -# for cargo test. See rust-lang/cargo#2911. -# As a workaround we introduce a new feature to allow example domains -# in integration tests. +# Unfortunately, it's not possible to automatically enable features for cargo +# test. See rust-lang/cargo#2911. As a workaround we introduce a new feature to +# allow example domains in integration tests. [[test]] name = "cli" path = "tests/cli.rs" diff --git a/lychee-lib/Cargo.toml b/lychee-lib/Cargo.toml index e9c80f6..f5b9f15 100644 --- a/lychee-lib/Cargo.toml +++ b/lychee-lib/Cargo.toml @@ -17,13 +17,26 @@ repository = "https://github.com/lycheeverse/lychee" version = "0.13.0" [dependencies] +async-stream = "0.3.5" +cached = "0.44.0" check-if-email-exists = { version = "0.9.0", optional = true } email_address = "0.2.4" +futures = "0.3.27" glob = "0.3.1" headers = "0.3.8" +html5ever = "0.26.0" +html5gum = "0.5.3" http = "0.2.9" +hyper = "0.14.26" +ip_network = "0.4.1" +jwalk = "0.8.1" linkify = "0.9.0" +log = "0.4.19" +octocrab = "0.25.1" +once_cell = "1.18.0" openssl-sys = { version = "0.9.90", optional = true } +path-clean = "1.0.1" +percent-encoding = "2.3.0" pulldown-cmark = "0.9.3" regex = "1.8.4" # Use trust-dns to avoid lookup failures on high concurrency @@ -34,27 +47,14 @@ reqwest = { version = "0.11.18", default-features = false, features = ["gzip", " # This is necessary for the homebrew build # https://github.com/Homebrew/homebrew-core/pull/70216 ring = "0.16.20" +secrecy = "0.8.0" serde = { version = "1.0.164", features = ["derive"] } serde_with = "3.0.0" shellexpand = "3.1.0" -typed-builder = "0.14.0" -tokio = { version = "1.28.2", features = ["full"] } -url = { version = "2.4.0", features = ["serde"] } -log = "0.4.19" -path-clean = "1.0.1" -percent-encoding = "2.3.0" -async-stream = "0.3.5" -jwalk = "0.8.1" -cached = "0.44.0" -once_cell = "1.18.0" thiserror = "1.0.40" -futures = "0.3.27" -html5ever = "0.26.0" -html5gum = "0.5.3" -octocrab = "0.25.1" -ip_network = "0.4.1" -secrecy = "0.8.0" -hyper = "0.14.26" +tokio = { version = "1.28.2", features = ["full"] } +typed-builder = "0.14.0" +url = { version = "2.4.0", features = ["serde"] } [dependencies.par-stream] version = "0.10.2"