From 5c43b030fecb0251d49dc4d9b21e82e54b2b1f6c Mon Sep 17 00:00:00 2001 From: Matt Brubeck Date: Thu, 28 Mar 2024 22:16:21 -0700 Subject: [PATCH] Simplify test error handling --- Cargo.lock | 1 - Cargo.toml | 1 - tests/tests.rs | 5 ++--- 3 files changed, 2 insertions(+), 5 deletions(-) diff --git a/Cargo.lock b/Cargo.lock index 708fa13..b1d4997 100644 --- 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 index ae148b9..0e01a39 100644 --- 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 index 5a33e0b..f78206f 100644 --- 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 { +fn get(args: &[&str], url: &str) -> Result { let mut server = Server::new(args); // actually perform the request @@ -137,7 +136,7 @@ fn get(args: &[&str], url: &str) -> Result { 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]