From 2af6a7d781eaa397312b61760f4dea6fc6620007 Mon Sep 17 00:00:00 2001
From: KokaKiwi <kokakiwi@deuxfleurs.fr>
Date: Mon, 27 Jun 2022 14:44:20 +0200
Subject: [PATCH] proto: Refactor Request struct

Fixes #4
---
 src/proto/req.rs       | 3 ---
 src/proto/req/mod.rs   | 5 +++++
 src/server/conn.rs     | 2 +-
 src/server/pipeline.rs | 2 +-
 4 files changed, 7 insertions(+), 5 deletions(-)
 delete mode 100644 src/proto/req.rs
 create mode 100644 src/proto/req/mod.rs

diff --git a/src/proto/req.rs b/src/proto/req.rs
deleted file mode 100644
index 8f0bcc9..0000000
--- a/src/proto/req.rs
+++ /dev/null
@@ -1,3 +0,0 @@
-use imap_codec::types::command::Command;
-
-pub type Request = Command;
diff --git a/src/proto/req/mod.rs b/src/proto/req/mod.rs
new file mode 100644
index 0000000..0f814d5
--- /dev/null
+++ b/src/proto/req/mod.rs
@@ -0,0 +1,5 @@
+use imap_codec::types::command::Command;
+
+pub struct Request {
+    pub command: Command,
+}
diff --git a/src/server/conn.rs b/src/server/conn.rs
index e3cf53e..a0a1281 100644
--- a/src/server/conn.rs
+++ b/src/server/conn.rs
@@ -157,7 +157,7 @@ where
     fn call(&mut self, req: Request) -> Self::Future {
         use futures::{FutureExt, TryFutureExt};
 
-        let tag = req.tag.clone();
+        let tag = req.command.tag.clone();
 
         self.inner.call(req).map_ok(|res| (Some(tag), res)).boxed()
     }
diff --git a/src/server/pipeline.rs b/src/server/pipeline.rs
index 149b346..0bb4579 100644
--- a/src/server/pipeline.rs
+++ b/src/server/pipeline.rs
@@ -67,7 +67,7 @@ where
 
             *this.read_buf = input.into();
 
-            let req = command;
+            let req = Request { command };
             return Poll::Ready(Some(Ok(req)));
         }
     }