agate

commit 5c43b030fecb0251d49dc4d9b21e82e54b2b1f6c
parent 6b67e603bd93afb5afda402d633e25ee9752a507
Author: Matt Brubeck <mbrubeck@limpet.net>
Date:   Thu, 28 Mar 2024 22:16:21 -0700

Simplify test error handling

Diffstat:
M
Cargo.lock
 | 
1
-
M
Cargo.toml
 | 
1
-
M
tests/tests.rs
 | 
5
++---

3 files changed, 2 insertions(+), 5 deletions(-)
diff --git a/Cargo.lock b/Cargo.lock
@@ -21,7 +21,6 @@ checksum = "f26201604c87b1e01bd3d98f8d5d9a8fcbb815e8cedb41ffccbeb4bf593a35fe"
 name = "agate"
 version = "3.3.6"
 dependencies = [
- "anyhow",
  "configparser",
  "env_logger",
  "futures-util",
diff --git a/Cargo.toml b/Cargo.toml
@@ -27,7 +27,6 @@ tokio = { version = "1.36", features = ["fs", "io-util", "net", "rt-multi-thread
 url = "2.5.0"
 
 [dev-dependencies]
-anyhow = "1.0"
 gemini-fetch = "0.2.1"
 
 [profile.release]
diff --git a/tests/tests.rs b/tests/tests.rs
@@ -1,4 +1,3 @@
-use anyhow::anyhow;
 use gemini_fetch::{Header, Page, Status};
 use std::convert::TryInto;
 use std::io::{BufRead, BufReader, Read, Write};
@@ -129,7 +128,7 @@ impl Drop for Server {
     }
 }
 
-fn get(args: &[&str], url: &str) -> Result<Page, anyhow::Error> {
+fn get(args: &[&str], url: &str) -> Result<Page, String> {
     let mut server = Server::new(args);
 
     // actually perform the request
@@ -137,7 +136,7 @@ fn get(args: &[&str], url: &str) -> Result<Page, anyhow::Error> {
         Page::fetch_from(&Url::parse(url).unwrap(), server.get_addr(), None).await
     });
 
-    server.stop().map_err(|e| anyhow!(e)).and(page)
+    server.stop().and(page.map_err(|e| e.to_string()))
 }
 
 #[test]