Remove thiserror from gix-transport, use gix-error

gix-transport/Cargo.toml

@@ -95,7 +95,6 @@ bstr = { version = "1.12.0", default-features = false, features = [
     "std",
     "unicode",
 ] }
-thiserror = "2.0.17"
 
 # for async-client
 async-trait = { version = "0.1.51", optional = true }

gix-transport/src/client/blocking_io/file.rs

@@ -210,8 +210,7 @@ impl client::blocking_io::Transport for SpawnProcessOnDemand {
     ) -> Result<SetServiceResponse<'_>, client::Error> {
         let (mut cmd, ssh_kind, cmd_name) = match &self.ssh_cmd {
             Some((command, kind)) => (
-                kind.prepare_invocation(command, &self.url, self.desired_version, self.ssh_disallow_shell)
-                    .map_err(client::Error::SshInvocation)?
+                kind.prepare_invocation(command, &self.url, self.desired_version, self.ssh_disallow_shell)?
                     .stderr(Stdio::piped()),
                 Some(*kind),
                 Cow::Owned(command.to_owned()),

gix-transport/src/client/blocking_io/http/curl/mod.rs

@@ -21,27 +21,7 @@ pub struct Options {
 /// The error returned by the 'remote' helper, a purely internal construct to perform http requests.
 ///
 /// It can be used for downcasting errors, which are boxed to hide the actual implementation.
-#[derive(Debug, thiserror::Error)]
-#[allow(missing_docs)]
-pub enum Error {
-    #[error(transparent)]
-    Curl(#[from] curl::Error),
-    #[error(transparent)]
-    Redirect(#[from] http::redirect::Error),
-    #[error("Could not finish reading all data to post to the remote")]
-    ReadPostBody(#[from] std::io::Error),
-    #[error(transparent)]
-    Authenticate(#[from] gix_credentials::protocol::Error),
-}
-
-impl crate::IsSpuriousError for Error {
-    fn is_spurious(&self) -> bool {
-        match self {
-            Error::Curl(err) => curl_is_spurious(err),
-            _ => false,
-        }
-    }
-}
+pub type Error = crate::Error;
 
 pub(crate) fn curl_is_spurious(err: &curl::Error) -> bool {
     err.is_couldnt_connect()
@@ -77,7 +57,7 @@ impl Curl {
         self.handle = Some(handle);
         self.req = req;
         self.res = res;
-        err_that_brought_thread_down.into()
+        err_that_brought_thread_down
     }
 
     fn make_request(

gix-transport/src/client/blocking_io/http/curl/remote.rs

@@ -378,19 +378,3 @@ fn to_curl_ssl_version(vers: SslVersion) -> curl::easy::SslVersion {
         SslVersion::TlsV1_3 => Tlsv13,
     }
 }
-
-impl From<Error> for http::Error {
-    fn from(err: Error) -> Self {
-        http::Error::Detail {
-            description: err.to_string(),
-        }
-    }
-}
-
-impl From<curl::Error> for http::Error {
-    fn from(err: curl::Error) -> Self {
-        http::Error::Detail {
-            description: err.to_string(),
-        }
-    }
-}

gix-transport/src/client/blocking_io/http/mod.rs

@@ -280,11 +280,9 @@ impl<H: Http> Transport<H> {
                 name.eq_ignore_ascii_case("content-type") && value.trim() == wanted_content_type
             })
         }) {
-            return Err(client::Error::Http(Error::Detail {
-                description: format!(
-                    "Didn't find '{wanted_content_type}' header to indicate 'smart' protocol, and 'dumb' protocol is not supported."
-                ),
-            }));
+            return Err(client::Error::HttpDetail(format!(
+                "Didn't find '{wanted_content_type}' header to indicate 'smart' protocol, and 'dumb' protocol is not supported."
+            )));
         }
         Ok(())
     }
@@ -391,13 +389,11 @@ impl<H: Http> blocking_io::Transport for Transport<H> {
 
         if let Some(announced_service) = line.as_bstr().strip_prefix(b"# service=") {
             if announced_service != service.as_str().as_bytes() {
-                return Err(client::Error::Http(Error::Detail {
-                    description: format!(
-                        "Expected to see service {:?}, but got {:?}",
-                        service.as_str(),
-                        announced_service
-                    ),
-                }));
+                return Err(client::Error::HttpDetail(format!(
+                    "Expected to see service {:?}, but got {:?}",
+                    service.as_str(),
+                    announced_service
+                )));
             }
 
             line_reader.as_read().read_to_end(&mut Vec::new())?;

gix-transport/src/client/blocking_io/http/redirect.rs

@@ -1,22 +1,14 @@
 /// The error provided when redirection went beyond what we deem acceptable.
-#[derive(Debug, thiserror::Error)]
-#[error("Redirect url {redirect_url:?} could not be reconciled with original url {expected_url} as they don't share the same suffix")]
-pub struct Error {
-    redirect_url: String,
-    expected_url: String,
-}
+pub type Error = crate::Error;
 
 pub(crate) fn base_url(redirect_url: &str, base_url: &str, url: String) -> Result<String, Error> {
     let tail = url
         .strip_prefix(base_url)
         .expect("BUG: caller assures `base_url` is subset of `url`");
-    redirect_url
-        .strip_suffix(tail)
-        .ok_or_else(|| Error {
-            redirect_url: redirect_url.into(),
-            expected_url: url,
-        })
-        .map(ToOwned::to_owned)
+    redirect_url.strip_suffix(tail).ok_or_else(|| crate::Error::Redirect {
+        redirect_url: redirect_url.into(),
+        expected_url: url,
+    }).map(ToOwned::to_owned)
 }
 
 pub(crate) fn swap_tails(effective_base_url: Option<&str>, base_url: &str, mut url: String) -> String {

gix-transport/src/client/blocking_io/http/reqwest/remote.rs

@@ -12,29 +12,7 @@ use crate::client::blocking_io::http::{
 };
 
 /// The error returned by the 'remote' helper, a purely internal construct to perform http requests.
-#[derive(Debug, thiserror::Error)]
-#[allow(missing_docs)]
-pub enum Error {
-    #[error(transparent)]
-    Reqwest(#[from] reqwest::Error),
-    #[error("Could not finish reading all data to post to the remote")]
-    ReadPostBody(#[from] std::io::Error),
-    #[error("Request configuration failed")]
-    ConfigureRequest(#[from] Box<dyn std::error::Error + Send + Sync + 'static>),
-    #[error(transparent)]
-    Redirect(#[from] redirect::Error),
-}
-
-impl crate::IsSpuriousError for Error {
-    fn is_spurious(&self) -> bool {
-        match self {
-            Error::Reqwest(err) => {
-                err.is_timeout() || err.is_connect() || err.status().is_some_and(|status| status.is_server_error())
-            }
-            _ => false,
-        }
-    }
-}
+pub type Error = crate::Error;
 
 impl Default for Remote {
     fn default() -> Self {
@@ -122,7 +100,7 @@ impl Default for Remote {
                 if let Some(ref mut request_options) = config.backend.as_ref().and_then(|backend| backend.lock().ok()) {
                     if let Some(options) = request_options.downcast_mut::<super::Options>() {
                         if let Some(configure_request) = &mut options.configure_request {
-                            configure_request(&mut req)?;
+                            configure_request(&mut req).map_err(|e| Error::ConfigureRequest(e.to_string()))?;
                         }
                     }
                 }
@@ -215,9 +193,7 @@ impl Remote {
             .expect("handler thread should never panic")
             .expect_err("something should have gone wrong with curl (we join on error only)");
         *self = Remote::default();
-        http::Error::InitHttpClient {
-            source: Box::new(err_that_brought_thread_down),
-        }
+        http::Error::InitHttpClient(err_that_brought_thread_down.to_string())
     }
 
     fn make_request(

gix-transport/src/client/blocking_io/http/traits.rs

@@ -1,39 +1,7 @@
 use crate::client::WriteMode;
 
 /// The error used by the [Http] trait.
-#[derive(Debug, thiserror::Error)]
-#[allow(missing_docs)]
-pub enum Error {
-    #[error("Could not initialize the http client")]
-    InitHttpClient {
-        source: Box<dyn std::error::Error + Send + Sync + 'static>,
-    },
-    #[error("{description}")]
-    Detail { description: String },
-    #[error("An IO error occurred while uploading the body of a POST request")]
-    PostBody(#[from] std::io::Error),
-}
-
-impl crate::IsSpuriousError for Error {
-    fn is_spurious(&self) -> bool {
-        match self {
-            Error::PostBody(err) => err.is_spurious(),
-            #[cfg(any(feature = "http-client-reqwest", feature = "http-client-curl"))]
-            Error::InitHttpClient { source } => {
-                #[cfg(feature = "http-client-curl")]
-                if let Some(err) = source.downcast_ref::<crate::client::blocking_io::http::curl::Error>() {
-                    return err.is_spurious();
-                }
-                #[cfg(feature = "http-client-reqwest")]
-                if let Some(err) = source.downcast_ref::<crate::client::blocking_io::http::reqwest::remote::Error>() {
-                    return err.is_spurious();
-                }
-                false
-            }
-            _ => false,
-        }
-    }
-}
+pub type Error = crate::Error;
 
 /// The return value of [`Http::get()`].
 pub struct GetResponse<H, B> {

gix-transport/src/client/blocking_io/ssh/mod.rs

@@ -8,16 +8,7 @@ use gix_url::{ArgumentSafety::*, Url};
 use crate::{client::blocking_io::file::SpawnProcessOnDemand, Protocol};
 
 /// The error used in [`connect()`].
-#[derive(Debug, thiserror::Error)]
-#[allow(missing_docs)]
-pub enum Error {
-    #[error("The scheme in \"{}\" is not usable for an ssh connection", .0.to_bstring())]
-    UnsupportedScheme(gix_url::Url),
-    #[error("Host name '{host}' could be mistaken for a command-line argument")]
-    AmbiguousHostName { host: String },
-}
-
-impl crate::IsSpuriousError for Error {}
+pub type Error = crate::Error;
 
 /// The kind of SSH programs we have built-in support for.
 ///
@@ -40,24 +31,8 @@ mod program_kind;
 
 ///
 pub mod invocation {
-    use std::ffi::OsString;
-
     /// The error returned when producing ssh invocation arguments based on a selected invocation kind.
-    #[derive(Debug, thiserror::Error)]
-    #[allow(missing_docs)]
-    pub enum Error {
-        #[error("Username '{user}' could be mistaken for a command-line argument")]
-        AmbiguousUserName { user: String },
-        #[error("Host name '{host}' could be mistaken for a command-line argument")]
-        AmbiguousHostName { host: String },
-        #[error("The 'Simple' ssh variant doesn't support {function}")]
-        Unsupported {
-            /// The simple command that should have been invoked.
-            command: OsString,
-            /// The function that was unsupported
-            function: &'static str,
-        },
-    }
+    pub type Error = crate::Error;
 }
 
 ///
@@ -109,7 +84,7 @@ pub fn connect(
     trace: bool,
 ) -> Result<SpawnProcessOnDemand, Error> {
     if url.scheme != gix_url::Scheme::Ssh || url.host().is_none() {
-        return Err(Error::UnsupportedScheme(url));
+        return Err(Error::UnsupportedScheme(url.scheme));
     }
     let ssh_cmd = options.ssh_command();
     let kind = determine_client_kind(options.kind, ssh_cmd, &url, options.disallow_shell)?;

gix-transport/src/client/blocking_io/ssh/program_kind.rs

@@ -54,7 +54,7 @@ impl ProgramKind {
             }
             ProgramKind::Simple => {
                 if url.port.is_some() {
-                    return Err(ssh::invocation::Error::Unsupported {
+                    return Err(ssh::invocation::Error::SshUnsupported {
                         command: ssh_cmd.into(),
                         function: "setting the port",
                     });

gix-transport/src/client/blocking_io/ssh/tests.rs

@@ -205,7 +205,7 @@ mod program_kind {
         fn simple_cannot_handle_any_arguments() {
             assert!(matches!(
                 try_call(ProgramKind::Simple, "ssh://user@host:42/p", Protocol::V2),
-                Err(ssh::invocation::Error::Unsupported { .. })
+                Err(ssh::invocation::Error::SshUnsupported { .. })
             ));
             assert_eq!(
                 call_args(ProgramKind::Simple, "ssh://user@host/p", Protocol::V2),

gix-transport/src/client/capabilities.rs

@@ -4,24 +4,6 @@ use bstr::{BStr, BString, ByteSlice};
 use crate::client;
 use crate::Protocol;
 
-/// The error used in [`Capabilities::from_bytes()`] and [`Capabilities::from_lines()`].
-#[derive(Debug, thiserror::Error)]
-#[allow(missing_docs)]
-pub enum Error {
-    #[error("Capabilities were missing entirely as there was no 0 byte")]
-    MissingDelimitingNullByte,
-    #[error("there was not a single capability behind the delimiter")]
-    NoCapabilities,
-    #[error("a version line was expected, but none was retrieved")]
-    MissingVersionLine,
-    #[error("expected 'version X', got {0:?}")]
-    MalformattedVersionLine(BString),
-    #[error("Got unsupported version {actual:?}, expected {}", *desired as u8)]
-    UnsupportedVersion { desired: Protocol, actual: BString },
-    #[error("An IO error occurred while reading V2 lines")]
-    Io(#[from] std::io::Error),
-}
-
 /// A structure to represent multiple [capabilities](Capability) or features supported by the server.
 ///
 /// ### Deviation
@@ -82,10 +64,10 @@ impl Capabilities {
     /// Parse capabilities from the given `bytes`.
     ///
     /// Useful in case they are encoded within a `ref` behind a null byte.
-    pub fn from_bytes(bytes: &[u8]) -> Result<(Capabilities, usize), Error> {
-        let delimiter_pos = bytes.find_byte(0).ok_or(Error::MissingDelimitingNullByte)?;
+    pub fn from_bytes(bytes: &[u8]) -> Result<(Capabilities, usize), crate::Error> {
+        let delimiter_pos = bytes.find_byte(0).ok_or(crate::Error::MissingDelimitingNullByte)?;
         if delimiter_pos + 1 == bytes.len() {
-            return Err(Error::NoCapabilities);
+            return Err(crate::Error::NoCapabilities);
         }
         let capabilities = &bytes[delimiter_pos + 1..];
         Ok((
@@ -103,19 +85,19 @@ impl Capabilities {
     /// Useful for parsing capabilities from a data sent from a server, and to avoid having to deal with
     /// blocking and async traits for as long as possible. There is no value in parsing a few bytes
     /// in a non-blocking fashion.
-    pub fn from_lines(lines_buf: BString) -> Result<Capabilities, Error> {
+    pub fn from_lines(lines_buf: BString) -> Result<Capabilities, crate::Error> {
         let mut lines = <_ as bstr::ByteSlice>::lines(lines_buf.as_slice().trim());
-        let version_line = lines.next().ok_or(Error::MissingVersionLine)?;
+        let version_line = lines.next().ok_or(crate::Error::MissingVersionLine)?;
         let (name, value) = version_line.split_at(
             version_line
                 .find(b" ")
-                .ok_or_else(|| Error::MalformattedVersionLine(version_line.to_owned().into()))?,
+                .ok_or_else(|| crate::Error::MalformattedVersionLine(version_line.to_owned().into()))?,
         );
         if name != b"version" {
-            return Err(Error::MalformattedVersionLine(version_line.to_owned().into()));
+            return Err(crate::Error::MalformattedVersionLine(version_line.to_owned().into()));
         }
         if value != b" 2" {
-            return Err(Error::UnsupportedVersion {
+            return Err(crate::Error::UnsupportedVersion {
                 desired: Protocol::V2,
                 actual: value.to_owned().into(),
             });