feat: improve error handling

This removes a seemingly redundant and not very illuminating error
variant. It also ensures that the error message from the `Url` crate is
displayed when displaying `UrlParseError`.

Author: CardboardTurkey

src/lib.rs

@@ -156,11 +156,7 @@ impl GitUrl {
     /// Returns a `Result<GitUrl>` after normalizing and parsing `url` for metadata
     pub fn parse(url: &str) -> Result<GitUrl, GitUrlParseError> {
         // Normalize the url so we can use Url crate to process ssh urls
-        let normalized = if let Ok(url) = normalize_url(url) {
-            url
-        } else {
-            return Err(GitUrlParseError::UrlNormalizeFailed);
-        };
+        let normalized = normalize_url(url)?;
 
         // Some pre-processing for paths
         let scheme = if let Ok(scheme) = Scheme::from_str(normalized.scheme()) {
@@ -485,12 +481,9 @@ fn is_ssh_url(url: &str) -> bool {
 
 #[derive(Error, Debug, PartialEq, Eq)]
 pub enum GitUrlParseError {
-    #[error("Error from Url crate")]
+    #[error("Error from Url crate: {0}")]
     UrlParseError(#[from] url::ParseError),
 
-    #[error("Url normalization into url::Url failed")]
-    UrlNormalizeFailed,
-
     #[error("No url scheme was found, then failed to normalize as ssh url.")]
     SshUrlNormalizeFailedNoScheme,
 

tests/parse.rs

@@ -383,7 +383,7 @@ fn bad_port_number() {
     assert!(e.is_err());
     assert_eq!(
         format!("{}", e.err().unwrap()),
-        "Url normalization into url::Url failed"
+        "Error from Url crate: invalid port number"
     );
 }