Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Bump the dependencies group with 35 updates #1407

Merged
merged 4 commits into from
Apr 25, 2024
Merged

Bump the dependencies group with 35 updates #1407

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
b753f7f
Bump the dependencies group with 35 updates
dependabot[bot] Apr 22, 2024
d561e20
Adapt to breaking changes & revert to pulldown-cmark 0.9
thomas-zahner Apr 24, 2024
6aa3cc3
Disable lint with false positive
thomas-zahner Apr 24, 2024
dead7ca
Fix typo
thomas-zahner Apr 25, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
977 changes: 439 additions & 538 deletions Cargo.lock
View file
Open in desktop

Large diffs are not rendered by default.

8 changes: 4 additions & 4 deletions examples/builder/Cargo.toml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -9,10 +9,10 @@ path = "builder.rs"

[dependencies]
lychee-lib = { path = "../../lychee-lib", default-features = false }
tokio = { version = "1.35.1", features = ["full"] }
regex = "1.10.2"
http = "0.2.10"
reqwest = { version = "0.11.23", default-features = false, features = ["gzip"] }
tokio = { version = "1.37.0", features = ["full"] }
regex = "1.10.4"
http = "1.0.0"
reqwest = { version = "0.12.4", default-features = false, features = ["gzip"] }

[features]
email-check = ["lychee-lib/email-check"]
Expand Down
4 changes: 2 additions & 2 deletions examples/client_pool/Cargo.toml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -9,9 +9,9 @@ path = "client_pool.rs"

[dependencies]
futures = "0.3.30"
tokio-stream = "0.1.14"
tokio-stream = "0.1.15"
lychee-lib = { path = "../../lychee-lib", default-features = false }
tokio = { version = "1.35.1", features = ["full"] }
tokio = { version = "1.37.0", features = ["full"] }

[features]
email-check = ["lychee-lib/email-check"]
Expand Down
10 changes: 5 additions & 5 deletions examples/collect_links/Cargo.toml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -9,11 +9,11 @@ path = "collect_links.rs"

[dependencies]
lychee-lib = { path = "../../lychee-lib", default-features = false }
tokio = { version = "1.35.1", features = ["full"] }
regex = "1.10.2"
http = "0.2.10"
tokio-stream = "0.1.14"
reqwest = { version = "0.11.23", default-features = false, features = ["gzip"] }
tokio = { version = "1.37.0", features = ["full"] }
regex = "1.10.4"
http = "1.0.0"
tokio-stream = "0.1.15"
reqwest = { version = "0.12.4", default-features = false, features = ["gzip"] }

[features]
email-check = ["lychee-lib/email-check"]
Expand Down
2 changes: 1 addition & 1 deletion examples/extract/Cargo.toml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,7 @@ path = "extract.rs"

[dependencies]
lychee-lib = { path = "../../lychee-lib", default-features = false }
tokio = { version = "1.35.1", features = ["full"] }
tokio = { version = "1.37.0", features = ["full"] }

[features]
email-check = ["lychee-lib/email-check"]
Expand Down
2 changes: 1 addition & 1 deletion examples/simple/Cargo.toml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,7 @@ path = "simple.rs"

[dependencies]
lychee-lib = { path = "../../lychee-lib", default-features = false }
tokio = { version = "1.35.1", features = ["full"] }
tokio = { version = "1.37.0", features = ["full"] }

[features]
email-check = ["lychee-lib/email-check"]
Expand Down
50 changes: 25 additions & 25 deletions lychee-bin/Cargo.toml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -16,57 +16,57 @@ version.workspace = true
# requires all dependencies to have a version number.
lychee-lib = { path = "../lychee-lib", version = "0.14.3", default-features = false }

anyhow = "1.0.78"
anyhow = "1.0.82"
assert-json-diff = "2.0.2"
clap = { version = "4.4.12", features = ["env", "derive"] }
console = "0.15.7"
clap = { version = "4.5.4", features = ["env", "derive"] }
console = "0.15.8"
const_format = "0.2.32"
csv = "1.3.0"
dashmap = { version = "5.5.3", features = ["serde"] }
env_logger = "0.10.1"
env_logger = "0.11.1"
futures = "0.3.30"
headers = "0.3.8"
http = "0.2.10"
headers = "0.4.0"
http = "1.0.0"
humantime = "2.1.0"
humantime-serde = "1.1.1"
indicatif = "0.17.7"
log = "0.4.20"
indicatif = "0.17.8"
log = "0.4.21"
once_cell = "1.19.0"
openssl-sys = { version = "0.9.98", optional = true }
openssl-sys = { version = "0.9.102", optional = true }
pad = "0.1.6"
regex = "1.10.2"
reqwest = { version = "0.11.23", default-features = false, features = [
regex = "1.10.4"
reqwest = { version = "0.12.4", default-features = false, features = [
"gzip",
"json",
] }
reqwest_cookie_store = "0.6.0"
reqwest_cookie_store = "0.7.0"
# Make build work on Apple Silicon.
# See https://github.com/briansmith/ring/issues/1163
# This is necessary for the homebrew build
# https://github.com/Homebrew/homebrew-core/pull/70216
ring = "0.17.7"
ring = "0.17.8"
secrecy = { version = "0.8.0", features = ["serde"] }
serde = { version = "1.0.193", features = ["derive"] }
serde_json = "1.0.109"
strum = { version = "0.25.0", features = ["derive"] }
supports-color = "2.1.0"
serde = { version = "1.0.198", features = ["derive"] }
serde_json = "1.0.116"
strum = { version = "0.26.2", features = ["derive"] }
supports-color = "3.0.0"
tabled = "0.15.0"
tokio = { version = "1.35.1", features = ["full"] }
tokio-stream = "0.1.14"
toml = "0.8.8"
tokio = { version = "1.37.0", features = ["full"] }
tokio-stream = "0.1.15"
toml = "0.8.12"

[dev-dependencies]
assert_cmd = "2.0.12"
predicates = "3.0.4"
assert_cmd = "2.0.14"
predicates = "3.1.0"
pretty_assertions = "1.4.0"
tempfile = "3.9.0"
tempfile = "3.10.1"
tracing-subscriber = { version = "0.3.18", default-features = false, features = [
"fmt",
"registry",
"env-filter",
] }
uuid = { version = "1.6.1", features = ["v4"] }
wiremock = "0.5.22"
uuid = { version = "1.8.0", features = ["v4"] }
wiremock = "0.6.0"

# console-subscriber is not yet published to crates.io
# Users have to uncomment this section and the feature below and build lychee
Expand Down
4 changes: 2 additions & 2 deletions lychee-bin/src/archive/mod.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
use reqwest::{Error, Url};
use serde::{Deserialize, Serialize};
use std::fmt::Display;
use strum::{Display, EnumIter, EnumString, EnumVariantNames};
use strum::{Display, EnumIter, EnumString, VariantNames};

use crate::color::{color, GREEN, PINK};

Expand All @@ -23,7 +23,7 @@ impl Display for Suggestion {
}

#[non_exhaustive]
#[derive(Debug, Deserialize, Default, Clone, Display, EnumIter, EnumString, EnumVariantNames)]
#[derive(Debug, Deserialize, Default, Clone, Display, EnumIter, EnumString, VariantNames)]
pub(crate) enum Archive {
#[serde(rename = "wayback")]
#[strum(serialize = "wayback", ascii_case_insensitive)]
Expand Down
3 changes: 3 additions & 0 deletions lychee-bin/src/stats.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,3 +1,6 @@
// Disable lint, clippy thinks that InputSource has inner mutability, but this seems like a false positive
#![allow(clippy::mutable_key_type)]

use std::collections::{HashMap, HashSet};

use crate::archive::Suggestion;
Expand Down
50 changes: 25 additions & 25 deletions lychee-lib/Cargo.toml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -13,49 +13,49 @@ version.workspace = true

[dependencies]
async-stream = "0.3.5"
async-trait = "0.1.78"
cached = "0.46.1"
async-trait = "0.1.80"
cached = "0.49.3"
check-if-email-exists = { version = "0.9.1", optional = true }
email_address = "0.2.4"
futures = "0.3.30"
glob = "0.3.1"
headers = "0.3.8"
html5ever = "0.26.0"
headers = "0.4.0"
html5ever = "0.27.0"
html5gum = "0.5.7"
http = "0.2.10"
hyper = "1.1.0"
http = "1.0.0"
hyper = "1.3.1"
ip_network = "0.4.1"
jwalk = "0.8.1"
linkify = "0.10.0"
log = "0.4.20"
octocrab = "0.32.0"
log = "0.4.21"
octocrab = "0.38.0"
once_cell = "1.19.0"
openssl-sys = { version = "0.9.98", optional = true }
openssl-sys = { version = "0.9.102", optional = true }
path-clean = "1.0.1"
percent-encoding = "2.3.1"
pulldown-cmark = "0.9.3"
regex = "1.10.2"
pulldown-cmark = "0.9.6"
regex = "1.10.4"
# Use trust-dns to avoid lookup failures on high concurrency
# https://github.com/seanmonstar/reqwest/issues/296
reqwest = { version = "0.11.23", default-features = false, features = [
reqwest = { version = "0.12.4", default-features = false, features = [
"gzip",
"trust-dns",
"cookies",
] }
reqwest_cookie_store = "0.6.0"
reqwest_cookie_store = "0.7.0"
# Make build work on Apple Silicon.
# See https://github.com/briansmith/ring/issues/1163
# This is necessary for the homebrew build
# https://github.com/Homebrew/homebrew-core/pull/70216
ring = "0.17.7"
ring = "0.17.8"
secrecy = "0.8.0"
serde = { version = "1.0.193", features = ["derive"] }
serde_with = "3.4.0"
serde = { version = "1.0.198", features = ["derive"] }
serde_with = "3.7.0"
shellexpand = "3.1.0"
thiserror = "1.0.53"
tokio = { version = "1.35.1", features = ["full"] }
toml = "0.8.8"
typed-builder = "0.18.0"
thiserror = "1.0.59"
tokio = { version = "1.37.0", features = ["full"] }
toml = "0.8.12"
typed-builder = "0.18.2"
url = { version = "2.5.0", features = ["serde"] }

[dependencies.par-stream]
Expand All @@ -64,11 +64,11 @@ features = ["runtime-tokio"]

[dev-dependencies]
doc-comment = "0.3.3"
tempfile = "3.9.0"
wiremock = "0.5.22"
serde_json = "1.0.109"
rstest = "0.18.2"
toml = "0.8.8"
tempfile = "3.10.1"
wiremock = "0.6.0"
serde_json = "1.0.116"
rstest = "0.19.0"
toml = "0.8.12"

[features]

Expand Down
10 changes: 5 additions & 5 deletions lychee-lib/src/extract/html/html5ever.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -166,7 +166,7 @@ impl LinkExtractor {

/// Extract unparsed URL strings from an HTML string.
pub(crate) fn extract_html(buf: &str, include_verbatim: bool) -> Vec<RawUri> {
let mut input = BufferQueue::new();
let mut input = BufferQueue::default();
input.push_back(StrTendril::from(buf));

let mut tokenizer = Tokenizer::new(
Expand Down Expand Up @@ -267,9 +267,9 @@ mod tests {
#[test]
fn test_include_nofollow() {
let input = r#"
<a rel="nofollow" href="https://foo.com">do not follow me</a>
<a rel="canonical,nofollow,dns-prefetch" href="https://example.com">do not follow me</a>
<a href="https://example.org">do not follow me</a>
<a rel="nofollow" href="https://foo.com">do not follow me</a>
<a rel="canonical,nofollow,dns-prefetch" href="https://example.com">do not follow me</a>
<a href="https://example.org">do not follow me</a>
"#;
let expected = vec![RawUri {
text: "https://example.org".to_string(),
Expand All @@ -286,7 +286,7 @@ mod tests {
<script>
var foo = "https://example.com";
</script>
<a href="https://example.org">i'm fine</a>
<a href="https://example.org">i'm fine</a>
"#;
let expected = vec![RawUri {
text: "https://example.org".to_string(),
Expand Down
Loading