Code review: minor improvements

Author: thomas-zahner

lychee-bin/src/main.rs

@@ -340,10 +340,6 @@ async fn run(opts: &LycheeOptions) -> Result<i32> {
         )
     })?;
 
-    // Build the lychee client first so we can share its HostPool with the
-    // collector. This ensures that fetching remote input documents uses the
-    // same user-agent, TLS settings, cookies, per-host rate limits and custom
-    // headers as regular link checks.
     let client = client::create(&opts.config, cookie_jar.as_deref())?;
 
     let mut collector = Collector::new(opts.config.root_dir.clone(), base.unwrap_or_default())?

lychee-bin/tests/cli.rs

@@ -2798,9 +2798,6 @@ The config file should contain every possible key for documentation purposes."
             .arg(server.uri())
             .assert()
             .success();
-
-        // wiremock will fail if the expected request was not received
-        server.verify().await;
     }
 
     #[tokio::test]
@@ -2825,8 +2822,9 @@ The config file should contain every possible key for documentation purposes."
         let user_agent = received_request
             .headers
             .get("user-agent")
-            .and_then(|v| v.to_str().ok())
-            .unwrap_or("");
+            .expect("User agent missing")
+            .to_str()
+            .unwrap();
 
         assert!(
             user_agent.starts_with("lychee/"),

lychee-lib/src/collector.rs

@@ -157,10 +157,12 @@ impl Collector {
     /// fetches share the same user-agent, TLS settings, cookies, per-host
     /// rate limits and headers as regular link checks:
     ///
-    /// ```ignore
-    /// let lychee_client = ClientBuilder::builder().client()?;
-    /// let collector = Collector::new(…)?
-    ///     .host_pool(lychee_client.host_pool());
+    /// ```
+    /// # use lychee_lib::{BaseInfo, ClientBuilder, Collector, ErrorKind};
+    /// let client = ClientBuilder::builder().build().client()?;
+    /// let collector = Collector::new(None, BaseInfo::none())?
+    ///     .host_pool(client.host_pool());
+    /// # Ok::<(), ErrorKind>(())
     /// ```
     #[must_use]
     pub fn host_pool(mut self, host_pool: Arc<HostPool>) -> Self {
@@ -621,13 +623,13 @@ mod tests {
         use wiremock::{Mock, MockServer, ResponseTemplate};
 
         let mock_server = MockServer::start().await;
+        let uri = Uri::try_from("https://example.com").unwrap();
 
         Mock::given(method("GET"))
             .and(path("/"))
             .and(header("user-agent", "test-agent/1.0"))
             .respond_with(
-                ResponseTemplate::new(200)
-                    .set_body_string(r#"<a href="https://example.com">Link</a>"#),
+                ResponseTemplate::new(200).set_body_string(format!(r#"<a href="{uri}">Link</a>"#)),
             )
             .expect(1)
             .mount(&mock_server)
@@ -653,8 +655,7 @@ mod tests {
             .collect::<std::collections::HashSet<_>>()
             .await;
 
-        assert!(links.iter().any(|u| u.url.as_str().contains("example.com")));
-        // wiremock will panic here if the expected request was not received
+        assert_eq!(links, HashSet::from([uri]));
     }
 
     #[tokio::test]

lychee-lib/src/types/resolver.rs

@@ -51,7 +51,7 @@ impl UrlContentResolver {
         // Fetch with body since we need to extract links from the content.
         let response = self.host_pool.execute_request(request, true).await?;
 
-        // needs_body=true above guarantees text is populated on success.
+        // SAFETY: needs_body=true above guarantees text is populated on success.
         let content = response.text.unwrap_or_else(|| {
             unreachable!("execute_request with needs_body=true always returns text")
         });