From ca78017557d730d2a3047428c4d82b693d59d568 Mon Sep 17 00:00:00 2001 From: Pierre Date: Sun, 10 Mar 2024 18:28:45 +0100 Subject: [PATCH] Cargo fmt --- src/main.rs | 2 +- src/respparser.rs | 4 +--- src/respserializer.rs | 16 +++++++--------- src/server.rs | 1 + 4 files changed, 10 insertions(+), 13 deletions(-) diff --git a/src/main.rs b/src/main.rs index 488d352..9f4c593 100644 --- a/src/main.rs +++ b/src/main.rs @@ -1,6 +1,6 @@ mod respparser; -mod server; mod respserializer; +mod server; fn main() { let port: &str = "6388"; diff --git a/src/respparser.rs b/src/respparser.rs index e7802a9..ad8190d 100644 --- a/src/respparser.rs +++ b/src/respparser.rs @@ -61,8 +61,6 @@ impl RespParser { } } - - #[cfg(test)] mod resp_parser_tests { use super::*; @@ -162,7 +160,7 @@ mod resp_parser_tests { x => panic!("Unexpected RESP type: {:?}", x), } } - + #[test] fn test_parse_null() { let data = "*-1\r\n"; diff --git a/src/respserializer.rs b/src/respserializer.rs index 676b65d..fcd62cf 100644 --- a/src/respserializer.rs +++ b/src/respserializer.rs @@ -1,6 +1,5 @@ use crate::respparser::RespType; - #[derive(Debug, PartialEq)] pub struct RespSerializer { writer: W, @@ -15,33 +14,32 @@ impl RespSerializer { match resp { RespType::SimpleString(s) => { writeln!(self.writer, "+{}\r", s) - }, + } RespType::Error(s) => { writeln!(self.writer, "-{}\r", s) - }, + } RespType::Integer(i) => { writeln!(self.writer, ":{}\r", i) - }, + } RespType::BulkString(bytes) => { writeln!(self.writer, "${}\r", bytes.len())?; self.writer.write_all(bytes)?; writeln!(self.writer, "\r") - }, + } RespType::Array(arr) => { writeln!(self.writer, "*{}\r", arr.len())?; for resp in arr { self.serialize(resp)?; } Ok(()) - }, + } RespType::Null => { writeln!(self.writer, "$-1\r") - }, + } } } } - #[cfg(test)] mod resp_serializer_tests { use super::*; @@ -103,4 +101,4 @@ mod resp_serializer_tests { serializer.serialize(&resp).unwrap(); assert_eq!(writer, b"$-1\r\n"); } -} \ No newline at end of file +} diff --git a/src/server.rs b/src/server.rs index e73fb45..502aaa7 100644 --- a/src/server.rs +++ b/src/server.rs @@ -14,6 +14,7 @@ fn handle_client(mut stream: TcpStream) { let mut serializer = RespSerializer::new(stream); let _ = serializer.serialize(&mock_response); } + pub fn start_tcp_stream(port: &str) { let listener = TcpListener::bind(format!("127.0.0.1:{}", port)).expect("Could not bind"); for stream in listener.incoming() {