From 2a73ed7863fade2d558848dc01e31043ceec26c9 Mon Sep 17 00:00:00 2001
From: evalir <e@evalir.xyz>
Date: Thu, 23 Jan 2025 23:14:17 +0100
Subject: [PATCH 1/2] chore: make use of Req import consistent

---
 src/axum.rs       | 7 +++++--
 src/routes/ctx.rs | 4 ++--
 2 files changed, 7 insertions(+), 4 deletions(-)

diff --git a/src/axum.rs b/src/axum.rs
index e11e271..e0c55c0 100644
--- a/src/axum.rs
+++ b/src/axum.rs
@@ -1,4 +1,7 @@
-use crate::{types::Response, HandlerArgs};
+use crate::{
+    types::{Request, Response},
+    HandlerArgs,
+};
 use axum::{extract::FromRequest, response::IntoResponse};
 use bytes::Bytes;
 use std::{future::Future, pin::Pin};
@@ -15,7 +18,7 @@ where
                 return Box::<str>::from(Response::parse_error()).into_response();
             };
 
-            let Ok(req) = crate::types::Request::try_from(bytes) else {
+            let Ok(req) = Request::try_from(bytes) else {
                 return Box::<str>::from(Response::parse_error()).into_response();
             };
 
diff --git a/src/routes/ctx.rs b/src/routes/ctx.rs
index 88cff3c..dac11bc 100644
--- a/src/routes/ctx.rs
+++ b/src/routes/ctx.rs
@@ -2,7 +2,7 @@ use serde_json::value::RawValue;
 use tokio::sync::mpsc;
 use tracing::error;
 
-use crate::RpcSend;
+use crate::{types::Request, RpcSend};
 
 /// Errors that can occur when sending notifications.
 #[derive(thiserror::Error, Debug)]
@@ -82,5 +82,5 @@ pub struct HandlerArgs {
     /// The handler context.
     pub ctx: HandlerCtx,
     /// The JSON-RPC request.
-    pub req: crate::types::Request,
+    pub req: Request,
 }

From 63a252c6ab8652944c279913d47167eedaf21a71 Mon Sep 17 00:00:00 2001
From: evalir <e@evalir.xyz>
Date: Fri, 24 Jan 2025 16:23:05 +0100
Subject: [PATCH 2/2] chore: remove newline

---
 src/routes/ctx.rs | 3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)

diff --git a/src/routes/ctx.rs b/src/routes/ctx.rs
index dac11bc..c1df1aa 100644
--- a/src/routes/ctx.rs
+++ b/src/routes/ctx.rs
@@ -1,9 +1,8 @@
+use crate::{types::Request, RpcSend};
 use serde_json::value::RawValue;
 use tokio::sync::mpsc;
 use tracing::error;
 
-use crate::{types::Request, RpcSend};
-
 /// Errors that can occur when sending notifications.
 #[derive(thiserror::Error, Debug)]
 pub enum NotifyError {