rm merge err

Author: viciousstar

tests/src/benches/redis.rs

@@ -173,6 +173,10 @@ mod proto_hook {
         fn ctx(&self) -> u64 {
             todo!()
         }
+
+        fn attachment(&self) -> Option<&protocol::Attachment> {
+            todo!()
+        }
     }
     #[derive(Debug)]
     pub(crate) struct TestStream {

tests/src/mq/protocol.rs

@@ -1,12 +1,11 @@
+use std::cell::UnsafeCell;
+
 use crate::proto_hook;
 use protocol::{
-    msgque::{McqText, OP_GET, OP_QUIT, OP_SET, OP_STATS, OP_VERSION},
-    AsyncBufRead, Attachment, BufRead, Commander, Error, HashedCommand, Metric, Proto,
-    RequestProcessor, Stream, Writer,
+    msgque::{MsgQue, OP_GET, OP_QUIT, OP_SET, OP_STATS, OP_VERSION},
+    Attachment, BufRead, Commander, Error, HashedCommand, Metric, Proto,
 };
 
-use protocol::BufRead;
-
 /// 请求以任意长度发送
 #[test]
 fn test_req_reenter() {
@@ -229,12 +228,14 @@ fn test_rsp() {
     }
 }
 
+#[allow(dead_code)]
 struct TestCtx {
     req: HashedCommand,
     metric: TestMetric,
 }
 
 impl TestCtx {
+    #[allow(dead_code)]
     fn new(req: HashedCommand) -> Self {
         Self {
             req,

tests/src/proto_hook.rs

@@ -77,6 +77,10 @@ impl Commander<TestMetric, TestMetricItem> for TestCtx {
     fn ctx(&self) -> u64 {
         todo!()
     }
+
+    fn attachment(&self) -> Option<&protocol::Attachment> {
+        todo!()
+    }
 }
 #[derive(Debug)]
 pub(crate) struct TestStream {