Improvements as per code review

Co-authored-by: katrinafyi <39479354+katrinafyi@users.noreply.github.com>

Author: thomas-zahner

lychee-bin/src/formatters/response/emoji.rs

@@ -70,7 +70,7 @@ mod emoji_tests {
         let body = mock_response_body!(Status::Excluded, "https://example.com/not-checked");
         assert_eq!(
             formatter.format_response(&body),
-            "👻 https://example.com/not-checked | This is due to your 'exclude' and 'include' values"
+            "👻 https://example.com/not-checked | This is due to your 'exclude' values"
         );
     }
 

lychee-bin/src/formatters/response/plain.rs

@@ -55,7 +55,7 @@ mod plain_tests {
         let body = mock_response_body!(Status::Excluded, "https://example.com/not-checked");
         assert_eq!(
             formatter.format_response(&body),
-            "[EXCLUDED] https://example.com/not-checked | This is due to your 'exclude' and 'include' values"
+            "[EXCLUDED] https://example.com/not-checked | This is due to your 'exclude' values"
         );
     }
 

lychee-bin/src/formatters/response/task.rs

@@ -45,7 +45,7 @@ mod task_tests {
         let body = mock_response_body!(Status::Excluded, "https://example.com/not-checked");
         assert_eq!(
             formatter.format_response(&body),
-            "- [ ] [EXCLUDED] https://example.com/not-checked | This is due to your 'exclude' and 'include' values"
+            "- [ ] [EXCLUDED] https://example.com/not-checked | This is due to your 'exclude' values"
         );
     }
 

lychee-bin/src/formatters/stats/junit.rs

@@ -117,8 +117,8 @@ mod tests {
             <system-out>https://github.com/mre/idiomatic-rust-doesnt-exist-man (at 1:1) | 404 Not Found</system-out>
         </testcase>
         <testcase name="Excluded https://excluded.org/" time="0.042" file="https://example.com/">
-            <skipped message="https://excluded.org/ | This is due to your &apos;exclude&apos; and &apos;include&apos; values"/>
-            <system-out>https://excluded.org/ | This is due to your &apos;exclude&apos; and &apos;include&apos; values</system-out>
+            <skipped message="https://excluded.org/ | This is due to your &apos;exclude&apos; values"/>
+            <system-out>https://excluded.org/ | This is due to your &apos;exclude&apos; values</system-out>
         </testcase>
         <testcase name="Successful https://success.org/" time="1.000" file="https://example.com/">
             <system-out>https://success.org/</system-out>

lychee-bin/tests/cli.rs

@@ -1561,7 +1561,7 @@ The config file should contain every possible key for documentation purposes."
                 "[IGNORED] {unsupported_url} (at 1:1) | Unsupported: Failed to create HTTP request client: builder error for url (slack://user)"
             )))
             .stderr(contains(format!(
-                "[EXCLUDED] {excluded_url} (at 2:1) | This is due to your 'exclude' and 'include' values\n"
+                "[EXCLUDED] {excluded_url} (at 2:1) | This is due to your 'exclude' values\n"
             )));
 
         // The cache file should be empty, because the only checked URL is

lychee-lib/src/client.rs

@@ -533,40 +533,31 @@ impl Client {
         ErrorKind: From<E>,
     {
         let Request {
-            ref mut uri,
+            mut uri,
             credentials,
             source,
             span,
             ..
         } = request.try_into()?;
 
-        let remapping = self.remap(uri)?;
-
-        if self.is_excluded(uri) {
-            return Ok(Response::new(
-                uri.clone(),
-                Status::Excluded,
-                source.into(),
-                span,
-                None,
-            ));
-        }
-
         let start = std::time::Instant::now(); // Measure check time
+        let remapping = self.remap(&mut uri)?;
 
-        let mut status = match uri.scheme() {
+        let status = match uri.scheme() {
+            _ if self.is_excluded(&uri) => Status::Excluded,
             _ if uri.is_tel() => Status::Excluded, // We don't check tel: URIs
-            _ if uri.is_file() => self.check_file(uri).await,
-            _ if uri.is_mail() => self.check_mail(uri).await,
-            _ => self.check_website(uri, credentials).await?,
+            _ if uri.is_file() => self.check_file(&uri).await,
+            _ if uri.is_mail() => self.check_mail(&uri).await,
+            _ => self.check_website(&uri, credentials).await?,
         };
 
-        if let Some(remapping) = remapping {
-            status = Status::Remapped(Box::new(status), remapping);
-        }
+        let status = match remapping {
+            Some(remapping) => Status::Remapped(Box::new(status), remapping),
+            None => status,
+        };
 
         Ok(Response::new(
-            uri.clone(),
+            uri,
             status,
             source.into(),
             span,

lychee-lib/src/types/status.rs

@@ -161,7 +161,7 @@ impl Status {
             Status::RequestError(e) => e.error().details(),
             Status::UnknownMailStatus(reason) => reason.clone(),
             Status::Timeout(_) => "Request timed out".into(),
-            Status::Excluded => "This is due to your 'exclude' and 'include' values".into(),
+            Status::Excluded => "This is due to your 'exclude' values".into(),
             Status::Unsupported(_) | Status::Cached(_) | Status::UnknownStatusCode(_) => {
                 self.to_string()
             }