better error output

Tubitv · Aug 31, 2022 · 1cccac4 · 1cccac4
1 parent 59d3363
commit 1cccac4
Show file tree

Hide file tree

Showing 7 changed files with 28 additions and 23 deletions.
diff --git a/Cargo.lock b/Cargo.lock
diff --git a/requester/Cargo.toml b/requester/Cargo.toml
@@ -1,6 +1,6 @@
 [package]
 name = "xreq-lib"
-version = "0.4.0"
+version = "0.4.1"
 edition = "2021"
 license = "MIT"
 documentation = "https://docs.rs/xreq-lib"

diff --git a/requester/src/diff.rs b/requester/src/diff.rs
@@ -83,16 +83,17 @@ impl DiffConfig {
     }
 
     pub fn get(&self, profile: &str) -> Result<&DiffContext> {
-        self.ctxs
-            .get(profile)
-            .ok_or_else(|| anyhow::anyhow!("profile {} not found", profile))
+        self.ctxs.get(profile).ok_or_else(|| {
+            anyhow::anyhow!(
+                "profile {} not found. Available profiles: {:?}.",
+                profile,
+                self.ctxs.keys()
+            )
+        })
     }
 
     pub async fn diff(&self, profile: &str) -> Result<DiffResult> {
-        let ctx = self
-            .ctxs
-            .get(profile)
-            .ok_or_else(|| anyhow::anyhow!("profile {} not found", profile))?;
+        let ctx = self.get(profile)?;
 
         ctx.diff().await
     }

diff --git a/requester/src/req.rs b/requester/src/req.rs
@@ -72,16 +72,17 @@ impl RequestConfig {
     }
 
     pub fn get(&self, profile: &str) -> Result<&RequestContext> {
-        self.ctxs
-            .get(profile)
-            .ok_or_else(|| anyhow::anyhow!("profile {} not found", profile))
+        self.ctxs.get(profile).ok_or_else(|| {
+            anyhow::anyhow!(
+                "profile {} not found. Available profiles: {:?}.",
+                profile,
+                self.ctxs.keys()
+            )
+        })
     }
 
     pub async fn send(&self, profile: &str) -> Result<Response> {
-        let ctx = self
-            .ctxs
-            .get(profile)
-            .ok_or_else(|| anyhow::anyhow!("profile {} not found", profile))?;
+        let ctx = self.get(profile)?;
 
         ctx.send().await
     }
@@ -120,7 +121,9 @@ impl RequestContext {
         match url.scheme() {
             "http" | "https" => {
                 let qs = serde_qs::to_string(&self.params)?;
-                url.set_query(Some(&qs));
+                if !qs.is_empty() {
+                    url.set_query(Some(&qs));
+                }
                 let client = Client::builder().user_agent(user_agent).build()?;
 
                 let mut builder = client

diff --git a/xdiff/Cargo.toml b/xdiff/Cargo.toml
@@ -1,6 +1,6 @@
 [package]
 name = "xdiff"
-version = "0.4.2"
+version = "0.4.3"
 edition = "2021"
 license = "MIT"
 documentation = "https://docs.rs/xdiff"
@@ -23,4 +23,4 @@ serde_json = "1.0.85"
 serde_yaml = "0.9.10"
 
 xreq-cli-utils = { version = "0.3.1", path = "../cli-utils" }
-xreq-lib = { version = "0.4.0", path = "../requester" }
+xreq-lib = { version = "0.4.1", path = "../requester" }
diff --git a/xreq/Cargo.toml b/xreq/Cargo.toml
@@ -1,6 +1,6 @@
 [package]
 name = "xreq"
-version = "0.4.2"
+version = "0.4.3"
 edition = "2021"
 license = "MIT"
 documentation = "https://docs.rs/xreq"
@@ -25,4 +25,4 @@ serde_yaml = "0.9.10"
 tokio = { version = "1.20.1", features = ["full"] }
 
 xreq-cli-utils = { version = "0.3.1", path = "../cli-utils" }
-xreq-lib = { version = "0.4.0", path = "../requester" }
+xreq-lib = { version = "0.4.1", path = "../requester" }
diff --git a/xreq/src/main.rs b/xreq/src/main.rs
@@ -110,6 +110,7 @@ async fn run(output: &mut Vec<String>, args: RunArgs) -> Result<()> {
     let resp = config.send().await?;
 
     if atty::is(atty::Stream::Stdout) {
+        output.push(format!("Sending: {}\n\n", resp.url()));
         print_status(output, &resp);
         print_headers(output, &resp);
     }