From 52141f3dcab04eaffef7cecc67f015d4f545df2f Mon Sep 17 00:00:00 2001 From: yggverse Date: Wed, 22 Jan 2025 10:13:15 +0200 Subject: [PATCH] remove extra functions --- src/client.rs | 30 +++++++++--------------------- src/client/connection.rs | 35 ----------------------------------- 2 files changed, 9 insertions(+), 56 deletions(-) diff --git a/src/client.rs b/src/client.rs index 206ac0d..3ae95f7 100644 --- a/src/client.rs +++ b/src/client.rs @@ -78,27 +78,15 @@ impl Client { Some(network_address), is_session_resumption, ) { - Ok(connection) => match request { - Request::Gemini(request) => connection - .gemini_request_async( - request, - priority, - cancellable, - move |result| match result { - Ok(response) => callback(Ok(response)), - Err(e) => callback(Err(Error::Connection(e))), - }, - ), - Request::Titan(request) => connection.titan_request_async( - request, - priority, - cancellable, - move |result| match result { - Ok(response) => callback(Ok(response)), - Err(e) => callback(Err(Error::Connection(e))), - }, - ), - }, + Ok(connection) => connection.request_async( + request, + priority, + cancellable, + move |result| match result { + Ok(response) => callback(Ok(response)), + Err(e) => callback(Err(Error::Connection(e))), + }, + ), Err(e) => callback(Err(Error::Connection(e))), } } diff --git a/src/client/connection.rs b/src/client/connection.rs index 66a745c..fdda6dc 100644 --- a/src/client/connection.rs +++ b/src/client/connection.rs @@ -57,41 +57,6 @@ impl Connection { priority: Priority, cancellable: Cancellable, callback: impl FnOnce(Result) + 'static, - ) { - match request { - Request::Gemini(request) => { - self.gemini_request_async(request, priority, cancellable, callback) - } - Request::Titan(request) => { - self.titan_request_async(request, priority, cancellable, callback) - } - } - } - - /// Make new request to `Self` connection using - /// [Gemini](https://geminiprotocol.net/docs/protocol-specification.gmi) protocol - /// * callback with new `Response` on success or `Error` on failure - /// * see also `request_async` method to send multi-protocol requests - pub fn gemini_request_async( - self, - request: Gemini, - priority: Priority, - cancellable: Cancellable, - callback: impl FnOnce(Result) + 'static, - ) { - self.bytes_request_async(&request.to_bytes(), priority, cancellable, callback); - } - - /// Make new request to `Self` connection using - /// [Titan](gemini://transjovian.org/titan/page/The%20Titan%20Specification) protocol - /// * callback with new `Response` on success or `Error` on failure - /// * see also `request_async` method to send multi-protocol requests - pub fn titan_request_async( - self, - request: Titan, - priority: Priority, - cancellable: Cancellable, - callback: impl FnOnce(Result) + 'static, ) { self.bytes_request_async(&request.to_bytes(), priority, cancellable, callback); }