docs.rs: Simplify base_url argument

This allows us to not return a `Result` from the constructor function.

Author: Turbo87

crates/crates_io_docs_rs/examples/test_docs_rs_client.rs

@@ -1,6 +1,7 @@
 use anyhow::{Result, anyhow};
 use crates_io_docs_rs::{DocsRsClient, RealDocsRsClient};
 use std::env;
+use url::Url;
 
 #[tokio::main]
 async fn main() -> Result<()> {
@@ -10,7 +11,7 @@ async fn main() -> Result<()> {
         .nth(1)
         .ok_or_else(|| anyhow!("Missing access token"))?;
 
-    let docs_rs = RealDocsRsClient::new("https://docs.rs", access_token)?;
+    let docs_rs = RealDocsRsClient::new(Url::parse("https://docs.rs")?, access_token);
 
     docs_rs.rebuild_docs("empty-library", "1.0.0").await?;
 

crates/crates_io_docs_rs/src/lib.rs

@@ -3,7 +3,6 @@
 use async_trait::async_trait;
 use crates_io_env_vars::{var, var_parsed};
 use http::StatusCode;
-use reqwest::IntoUrl;
 use serde::Deserialize;
 use tracing::warn;
 use url::Url;
@@ -44,17 +43,15 @@ pub struct RealDocsRsClient {
 }
 
 impl RealDocsRsClient {
-    pub fn new(base_url: impl IntoUrl, api_token: impl Into<String>) -> Result<Self, DocsRsError> {
-        Ok(Self {
+    pub fn new(base_url: Url, api_token: impl Into<String>) -> Self {
+        Self {
             client: reqwest::Client::builder()
                 .user_agent("crates.io")
                 .build()
                 .unwrap(),
-            base_url: base_url
-                .into_url()
-                .map_err(|err| DocsRsError::Other(err.into()))?,
+            base_url,
             api_token: api_token.into(),
-        })
+        }
     }
 
     pub fn from_environment() -> Option<Self> {
@@ -69,7 +66,7 @@ impl RealDocsRsClient {
 
         let api_token = var("DOCS_RS_API_TOKEN").ok()??;
 
-        Some(Self::new(base_url, api_token).expect("URL is always valid here"))
+        Some(Self::new(base_url, api_token))
     }
 }
 
@@ -142,7 +139,7 @@ mod tests {
         let (server, mock) = mock("krate", "0.1.0", StatusCode::CREATED).await;
         mock.create();
 
-        let docs_rs = RealDocsRsClient::new(server.url(), "test_token")?;
+        let docs_rs = RealDocsRsClient::new(Url::parse(&server.url())?, "test_token");
 
         docs_rs.rebuild_docs("krate", "0.1.0").await?;
 
@@ -154,7 +151,7 @@ mod tests {
         let (server, mock) = mock("krate", "0.1.0", StatusCode::NOT_FOUND).await;
         mock.create();
 
-        let docs_rs = RealDocsRsClient::new(server.url(), "test_token")?;
+        let docs_rs = RealDocsRsClient::new(Url::parse(&server.url())?, "test_token");
 
         assert_matches!(
             docs_rs.rebuild_docs("krate", "0.1.0").await,
@@ -169,7 +166,7 @@ mod tests {
         let (server, mock) = mock("krate", "0.1.0", StatusCode::TOO_MANY_REQUESTS).await;
         mock.create();
 
-        let docs_rs = RealDocsRsClient::new(server.url(), "test_token")?;
+        let docs_rs = RealDocsRsClient::new(Url::parse(&server.url())?, "test_token");
 
         assert_matches!(
             docs_rs.rebuild_docs("krate", "0.1.0").await,
@@ -186,7 +183,7 @@ mod tests {
         let (server, mock) = mock("krate", "0.1.0", status).await;
         mock.create();
 
-        let docs_rs = RealDocsRsClient::new(server.url(), "test_token")?;
+        let docs_rs = RealDocsRsClient::new(Url::parse(&server.url())?, "test_token");
 
         assert_matches!(
             docs_rs.rebuild_docs("krate", "0.1.0").await,
@@ -204,7 +201,7 @@ mod tests {
         }))?;
         mock.with_body(&body).create();
 
-        let docs_rs = RealDocsRsClient::new(server.url(), "test_token")?;
+        let docs_rs = RealDocsRsClient::new(Url::parse(&server.url())?, "test_token");
 
         assert_matches!(
             docs_rs.rebuild_docs("krate", "0.1.0").await,
@@ -219,7 +216,7 @@ mod tests {
         let (server, mock) = mock("krate", "0.1.0", StatusCode::INTERNAL_SERVER_ERROR).await;
         mock.create();
 
-        let docs_rs = RealDocsRsClient::new(server.url(), "test_token")?;
+        let docs_rs = RealDocsRsClient::new(Url::parse(&server.url())?, "test_token");
 
         assert_matches!(
             docs_rs.rebuild_docs("krate", "0.1.0").await,