fix: error/help messages (#95)

s2-streamstore · Dec 23, 2024 · af18134 · af18134
1 parent 04b33d5
commit af18134
Show file tree

Hide file tree

Showing 3 changed files with 22 additions and 23 deletions.
diff --git a/Cargo.lock b/Cargo.lock
diff --git a/Cargo.toml b/Cargo.toml
@@ -28,7 +28,7 @@ miette = { version = "7.2.0", features = ["fancy"] }
 rand = "0.8.5"
 serde = { version = "1.0.214", features = ["derive"] }
 serde_json = "1.0.132"
-streamstore = "0.5.0"
+streamstore = "0.5.1"
 thiserror = "2.0.6"
 tokio = { version = "1.41.1", features = ["full"] }
 tokio-stream = { version = "0.1.16", features = ["io-util"] }

diff --git a/src/types.rs b/src/types.rs
@@ -33,7 +33,7 @@ fn parse_maybe_basin_or_uri(
         }
         Err(parse_basin_err) => {
             // Should definitely be a URI else error.
-            let uri = http::Uri::from_str(s).map_err(|_| parse_basin_err)?;
+            let uri = http::Uri::from_str(s).map_err(|_| parse_basin_err.clone())?;
 
             match uri.scheme_str() {
                 Some("s2") => (),
@@ -45,10 +45,9 @@ fn parse_maybe_basin_or_uri(
                     )));
                 }
                 None => {
-                    return Err(BasinNameOrUriParseError::InvalidUri(miette::miette!(
-                        help = "Make sure the URI starts with 's2://'",
-                        "Missing URI scheme"
-                    )))
+                    // It's probably not an attempt to enter a URI. Safe to
+                    // assume this is simply an invalid basin.
+                    return Err(parse_basin_err.into());
                 }
             };