From af4b9fcba1206e3fcc97fc243ffc674f85547942 Mon Sep 17 00:00:00 2001 From: nsfisis Date: Sat, 6 Jun 2026 19:47:36 +0900 Subject: refactor(http-response): take url directly instead of request map Response only ever reads the url out of the request array, so accept it as a String directly. With url always present the 'url key missing' LogicException can no longer fire, so Response::new and CurlResponse::new return Self instead of a double Result. Also drops the unused from_php_mixed/to_php_mixed stubs and the request_to_map helper. Co-Authored-By: Claude Opus 4.8 (1M context) --- crates/shirabe/src/util/http/curl_response.rs | 10 ++++------ 1 file changed, 4 insertions(+), 6 deletions(-) (limited to 'crates/shirabe/src/util/http/curl_response.rs') diff --git a/crates/shirabe/src/util/http/curl_response.rs b/crates/shirabe/src/util/http/curl_response.rs index 9f330b6..cc3d21b 100644 --- a/crates/shirabe/src/util/http/curl_response.rs +++ b/crates/shirabe/src/util/http/curl_response.rs @@ -13,16 +13,14 @@ pub struct CurlResponse { impl CurlResponse { pub fn new( - request: IndexMap, + url: String, code: Option, headers: Vec, body: Option, curl_info: IndexMap, - ) -> anyhow::Result> { - match Response::new(request, code, headers, body)? { - Ok(inner) => Ok(Ok(Self { inner, curl_info })), - Err(e) => Ok(Err(e)), - } + ) -> Self { + let inner = Response::new(url, code, headers, body); + Self { inner, curl_info } } pub fn get_curl_info(&self) -> &IndexMap { -- cgit v1.3.1