Skip to content

Commit

Permalink
fix lints
Browse files Browse the repository at this point in the history
  • Loading branch information
mre committed Oct 13, 2024
1 parent cbc615b commit e786631
Show file tree
Hide file tree
Showing 2 changed files with 10 additions and 12 deletions.
2 changes: 1 addition & 1 deletion lychee-lib/src/collector.rs
Original file line number Diff line number Diff line change
Expand Up @@ -124,7 +124,7 @@ impl Collector {
let content = content?;
let extractor = Extractor::new(self.use_html5ever, self.include_verbatim);
let uris: Vec<RawUri> = extractor.extract(&content);
let requests = request::create(uris, &content, &base, &basic_auth_extractor)?;
let requests = request::create(uris, &content, &base, &basic_auth_extractor);
Result::Ok(stream::iter(requests.into_iter().map(Ok)))
}
})
Expand Down
20 changes: 9 additions & 11 deletions lychee-lib/src/utils/request.rs
Original file line number Diff line number Diff line change
Expand Up @@ -128,13 +128,12 @@ pub(crate) fn create(
input_content: &InputContent,
base: &Option<Base>,
extractor: &Option<BasicAuthExtractor>,
) -> Result<HashSet<Request>> {
) -> HashSet<Request> {
let base = base
.clone()
.or_else(|| Base::from_source(&input_content.source));

let requests: HashSet<Request> = uris
.into_iter()
uris.into_iter()
.filter_map(|raw_uri| {
match create_request(&raw_uri, &input_content.source, &base, extractor) {
Ok(request) => Some(request),
Expand All @@ -144,8 +143,7 @@ pub(crate) fn create(
}
}
})
.collect();
Ok(requests)
.collect()
}

/// Create a URI from a path
Expand Down Expand Up @@ -218,7 +216,7 @@ mod tests {
);

let uris = vec![RawUri::from("relative.html")];
let requests = create(uris, &input, &base, &None).unwrap();
let requests = create(uris, &input, &base, &None);

assert_eq!(requests.len(), 1);
assert!(requests
Expand All @@ -235,7 +233,7 @@ mod tests {
);

let uris = vec![RawUri::from("https://another.com/page")];
let requests = create(uris, &input, &base, &None).unwrap();
let requests = create(uris, &input, &base, &None);

assert_eq!(requests.len(), 1);
assert!(requests
Expand All @@ -252,7 +250,7 @@ mod tests {
);

let uris = vec![RawUri::from("/root-relative")];
let requests = create(uris, &input, &base, &None).unwrap();
let requests = create(uris, &input, &base, &None);

assert_eq!(requests.len(), 1);
assert!(requests
Expand All @@ -269,7 +267,7 @@ mod tests {
);

let uris = vec![RawUri::from("../parent")];
let requests = create(uris, &input, &base, &None).unwrap();
let requests = create(uris, &input, &base, &None);

assert_eq!(requests.len(), 1);
assert!(requests
Expand All @@ -283,7 +281,7 @@ mod tests {
let input = create_input(r##"<a href="#fragment">Fragment Link</a>"##, FileType::Html);

let uris = vec![RawUri::from("#fragment")];
let requests = create(uris, &input, &base, &None).unwrap();
let requests = create(uris, &input, &base, &None);

assert_eq!(requests.len(), 1);
assert!(requests
Expand All @@ -300,7 +298,7 @@ mod tests {
);

let uris = vec![RawUri::from("https://example.com/page")];
let requests = create(uris, &input, &base, &None).unwrap();
let requests = create(uris, &input, &base, &None);

assert_eq!(requests.len(), 1);
assert!(requests
Expand Down

0 comments on commit e786631

Please sign in to comment.