From 0804f94a6808be9e8caa72af82e776c87d2e61d5 Mon Sep 17 00:00:00 2001 From: nejni-marji Date: Sat, 29 Mar 2025 15:46:07 -0500 Subject: [PATCH 1/3] quick fix that resolves my bug --- src/client.rs | 3 +++ 1 file changed, 3 insertions(+) diff --git a/src/client.rs b/src/client.rs index 19452bf0..f64f0cef 100644 --- a/src/client.rs +++ b/src/client.rs @@ -678,6 +678,9 @@ impl Proto for Client { fn read_pair(&mut self) -> Result<(String, String)> { let line = self.read_line()?; + if line.starts_with("ACK") { + "".split(": ").next().ok_or(ParseError::BadPair)?; + } let mut split = line.split(": "); let key = split.next().ok_or(ParseError::BadPair)?; let val = split.next().ok_or(ParseError::BadPair)?; From 75b6194d6406a777f22465f83327f0d8a6127313 Mon Sep 17 00:00:00 2001 From: nejni-marji Date: Wed, 2 Apr 2025 20:37:20 -0500 Subject: [PATCH 2/3] slightly better code --- src/client.rs | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/client.rs b/src/client.rs index f64f0cef..1e747a9e 100644 --- a/src/client.rs +++ b/src/client.rs @@ -679,7 +679,7 @@ impl Proto for Client { fn read_pair(&mut self) -> Result<(String, String)> { let line = self.read_line()?; if line.starts_with("ACK") { - "".split(": ").next().ok_or(ParseError::BadPair)?; + return None.ok_or(ParseError::BadPair)?; } let mut split = line.split(": "); let key = split.next().ok_or(ParseError::BadPair)?; From 51f10d1fa70d499ad4684bd4d689119d5be78c5a Mon Sep 17 00:00:00 2001 From: nejni-marji Date: Wed, 2 Apr 2025 21:33:11 -0500 Subject: [PATCH 3/3] properly return an err --- src/client.rs | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/client.rs b/src/client.rs index 1e747a9e..96c4e956 100644 --- a/src/client.rs +++ b/src/client.rs @@ -679,7 +679,7 @@ impl Proto for Client { fn read_pair(&mut self) -> Result<(String, String)> { let line = self.read_line()?; if line.starts_with("ACK") { - return None.ok_or(ParseError::BadPair)?; + return Err(ParseError::BadPair.into()); } let mut split = line.split(": "); let key = split.next().ok_or(ParseError::BadPair)?;