helpers -> utils

lychee-lib/src/collector.rs

@@ -1,5 +1,5 @@
 use crate::{
-    extract::Extractor, helpers::request, types::uri::raw::RawUri, Base, Input, Request, Result,
+    extract::Extractor, utils::request, types::uri::raw::RawUri, Base, Input, Request, Result,
 };
 use futures::{
     stream::{self, Stream},

lychee-lib/src/extract/mod.rs

@@ -86,7 +86,7 @@ mod tests {
 
     use super::*;
     use crate::{
-        helpers::url::find_links,
+        utils::url::find_links,
         test_utils::{load_fixture, mail, website},
         types::{FileType, InputContent, InputSource},
         Uri,

lychee-lib/src/extract/plaintext.rs

@@ -1,4 +1,4 @@
-use crate::{helpers::url, types::uri::raw::RawUri};
+use crate::{utils::url, types::uri::raw::RawUri};
 
 /// Extract unparsed URL strings from plaintext
 pub(crate) fn extract_plaintext(input: &str) -> Vec<RawUri> {

lychee-lib/src/lib.rs

@@ -53,7 +53,7 @@ doc_comment::doctest!("../../README.md");
 mod client;
 /// A pool of clients, to handle concurrent checks
 pub mod collector;
-mod helpers;
+mod utils;
 mod quirks;
 mod retry;
 mod types;

lychee-lib/src/types/error.rs

@@ -6,7 +6,7 @@ use thiserror::Error;
 use tokio::task::JoinError;
 
 use super::InputContent;
-use crate::{helpers, Uri};
+use crate::{utils, Uri};
 
 /// Kinds of status errors
 /// Note: The error messages can change over time, so don't match on the output
@@ -148,7 +148,7 @@ impl ErrorKind {
                             .to_string(),
                     )
                 } else {
-                    Some(helpers::reqwest::trim_error_output(e))
+                    Some(utils::reqwest::trim_error_output(e))
                 }
             }
             ErrorKind::GithubRequest(e) => match e {

lychee-lib/src/types/input.rs

@@ -1,5 +1,5 @@
 use crate::types::FileType;
-use crate::{helpers, ErrorKind, Result};
+use crate::{utils, ErrorKind, Result};
 use async_stream::try_stream;
 use futures::stream::Stream;
 use glob::glob_with;
@@ -366,7 +366,7 @@ impl Input {
 /// This is a standalone function to allow for easier testing
 fn is_excluded_path(excluded_paths: &[PathBuf], path: &PathBuf) -> bool {
     for excluded in excluded_paths {
-        if let Ok(true) = helpers::path::contains(excluded, path) {
+        if let Ok(true) = utils::path::contains(excluded, path) {
             return true;
         }
     }

lychee-lib/src/utils/request.rs

@@ -7,7 +7,7 @@ use std::{
 };
 
 use crate::{
-    helpers::{path, url},
+    utils::{path, url},
     types::{uri::raw::RawUri, InputContent, InputSource},
     Base, ErrorKind, Request, Result, Uri,
 };