From 73359d0252c1f651237afbe66e32e9fb473c1d8d Mon Sep 17 00:00:00 2001
From: zhu327 <zhu327@gmail.com>
Date: Tue, 24 Dec 2024 17:52:11 +0800
Subject: [PATCH] refactor: fix some typo

---
 src/admin/mod.rs    | 29 ++++++++++++++---------------
 src/service/http.rs |  4 ++--
 2 files changed, 16 insertions(+), 17 deletions(-)

diff --git a/src/admin/mod.rs b/src/admin/mod.rs
index cf3643a..c75e3c6 100644
--- a/src/admin/mod.rs
+++ b/src/admin/mod.rs
@@ -22,7 +22,7 @@ use crate::{
 };
 
 #[async_trait]
-trait Hanlder {
+trait Handler {
     async fn handle(
         &self,
         etcd: &EtcdClientWrapper,
@@ -32,34 +32,33 @@ trait Hanlder {
 }
 
 pub struct AdminHttpApp {
-    etcd: EtcdClientWrapper,
-    router: Router<HashMap<Method, Box<dyn Hanlder + Send + Sync>>>,
-
     config: Admin,
+    etcd: EtcdClientWrapper,
+    router: Router<HashMap<Method, Box<dyn Handler + Send + Sync>>>,
 }
 
 impl AdminHttpApp {
     pub fn new(cfg: &Pingsix) -> Self {
         let mut this = Self {
+            config: cfg.admin.clone().unwrap(),
             etcd: EtcdClientWrapper::new(cfg.etcd.clone().unwrap()),
             router: Router::new(),
-            config: cfg.admin.clone().unwrap(),
         };
 
         this.route(
             "/apisix/admin/{resource}/{id}",
             Method::PUT,
-            Box::new(ResourcePutHanlder {}),
+            Box::new(ResourcePutHandler {}),
         )
         .route(
             "/apisix/admin/{resource}/{id}",
             Method::GET,
-            Box::new(ResourceGetHanlder {}),
+            Box::new(ResourceGetHandler {}),
         )
         .route(
             "/apisix/admin/{resource}/{id}",
             Method::DELETE,
-            Box::new(ResourceDeleteHanlder {}),
+            Box::new(ResourceDeleteHandler {}),
         );
 
         this
@@ -70,7 +69,7 @@ impl AdminHttpApp {
         &mut self,
         path: &str,
         method: Method,
-        handler: Box<dyn Hanlder + Send + Sync>,
+        handler: Box<dyn Handler + Send + Sync>,
     ) -> &mut Self {
         if self.router.at(path).is_err() {
             let mut hanlders = HashMap::new();
@@ -142,10 +141,10 @@ struct ValueWrapper<T> {
     value: T,
 }
 
-struct ResourcePutHanlder;
+struct ResourcePutHandler;
 
 #[async_trait]
-impl Hanlder for ResourcePutHanlder {
+impl Handler for ResourcePutHandler {
     async fn handle(
         &self,
         etcd: &EtcdClientWrapper,
@@ -176,10 +175,10 @@ impl Hanlder for ResourcePutHanlder {
     }
 }
 
-struct ResourceGetHanlder;
+struct ResourceGetHandler;
 
 #[async_trait]
-impl Hanlder for ResourceGetHanlder {
+impl Handler for ResourceGetHandler {
     async fn handle(
         &self,
         etcd: &EtcdClientWrapper,
@@ -222,10 +221,10 @@ impl Hanlder for ResourceGetHanlder {
     }
 }
 
-struct ResourceDeleteHanlder;
+struct ResourceDeleteHandler;
 
 #[async_trait]
-impl Hanlder for ResourceDeleteHanlder {
+impl Handler for ResourceDeleteHandler {
     async fn handle(
         &self,
         etcd: &EtcdClientWrapper,
diff --git a/src/service/http.rs b/src/service/http.rs
index f6a0649..28e846d 100644
--- a/src/service/http.rs
+++ b/src/service/http.rs
@@ -41,9 +41,9 @@ impl ProxyHttp for HttpService {
         ctx: &mut Self::CTX,
     ) -> Result<Box<HttpPeer>> {
         let peer = ctx.route.as_ref().unwrap().select_http_peer(session);
-        if let Ok(ref p) = peer {
+        if let Ok(ref peer) = peer {
             ctx.vars
-                .insert("upstream".to_string(), p._address.to_string());
+                .insert("upstream".to_string(), peer._address.to_string());
         }
         peer
     }