From 2e1d12ec90ea12e8824d79dfc31b5b3cae397df8 Mon Sep 17 00:00:00 2001
From: littleblack111 <littleblack11111@gmail.com>
Date: Sun, 21 Sep 2025 22:59:47 +0800
Subject: wip

---
 src/tasks/client.rs |  2 +-
 src/tasks/server.rs | 23 ++++++++++++-----------
 2 files changed, 13 insertions(+), 12 deletions(-)

(limited to 'src/tasks')

diff --git a/src/tasks/client.rs b/src/tasks/client.rs
index e4510aa..6561efd 100644
--- a/src/tasks/client.rs
+++ b/src/tasks/client.rs
@@ -6,7 +6,7 @@ use serde::Deserialize;
 #[derive(Clone, Copy)]
 pub struct Task(pub BaseTask<Name>);
 
-#[derive(Debug, Deserialize, Clone, Copy)]
+#[derive(Debug, Deserialize, Clone, Copy, PartialEq)]
 pub enum Name {
     Nop,
     Exec,
diff --git a/src/tasks/server.rs b/src/tasks/server.rs
index b1cfc15..45be9f1 100644
--- a/src/tasks/server.rs
+++ b/src/tasks/server.rs
@@ -4,13 +4,14 @@ use crate::tasks::{IntoTaskErr, Task as BaseTask, TaskOutput};
 use serde::Deserialize;
 use tokio::net::TcpStream;
 
-pub struct ServerCtx {
-    stream: TcpStream,
+#[derive(Clone, Copy)]
+pub struct ServerCtx<'a> {
+    pub stream: &'a TcpStream,
 }
 
-pub struct Task(pub BaseTask<Name, ServerCtx>);
+pub struct Task<'a>(pub BaseTask<Name, ServerCtx<'a>>);
 
-#[derive(Debug, Deserialize, Clone, Copy)]
+#[derive(Debug, Deserialize, Clone, Copy, PartialEq)]
 pub enum Name {
     GetIp,
 }
@@ -30,12 +31,12 @@ fn get_ip(_: &[&str], ctx: &ServerCtx) -> TaskOutput {
     }
 }
 
-impl TryFrom<&str> for &'static Task {
+impl<'a> TryFrom<Name> for &'static Task<'a> {
     type Error = IntoTaskErr;
 
-    fn try_from(value: &str) -> Result<Self, Self::Error> {
+    fn try_from(value: Name) -> Result<Self, Self::Error> {
         for task in TASKS {
-            if task.0.name.to_string() == value {
+            if task.0.name == value {
                 return Ok(task);
             }
         }
@@ -43,14 +44,14 @@ impl TryFrom<&str> for &'static Task {
     }
 }
 
-impl From<Task> for BaseTask<Name, ServerCtx> {
-    fn from(value: Task) -> Self {
+impl<'a> From<Task<'a>> for BaseTask<Name, ServerCtx<'a>> {
+    fn from(value: Task<'a>) -> Self {
         value.0
     }
 }
 
-impl AsRef<BaseTask<Name, ServerCtx>> for Task {
-    fn as_ref(&self) -> &BaseTask<Name, ServerCtx> {
+impl<'a> AsRef<BaseTask<Name, ServerCtx<'a>>> for Task<'a> {
+    fn as_ref(&self) -> &BaseTask<Name, ServerCtx<'a>> {
         &self.0
     }
 }
-- 
cgit v1.2.3