libdelimit: formatting & correctness

This commit is contained in:
Emma Tebibyte 2025-10-30 23:29:25 -06:00
parent 5cc1e2067b
commit 28bc2cd0d0
Signed by: emma
GPG Key ID: 427287A2F16F44FA

View File

@ -56,15 +56,12 @@ impl<T> Iterator for Delimited<T> where T: Read {
match self.stream.read(&mut buf) { match self.stream.read(&mut buf) {
Ok(0) => { Ok(0) => {
if self.buffer.is_empty() { let _ = self.buffer.is_empty() && return None;
return None;
}
return Some(Ok(mem::take(&mut self.buffer))); return Some(Ok(mem::take(&mut self.buffer)));
}, },
Ok(n) => { Ok(n) => {
let content = &buf[..n]; self.buffer.extend_from_slice(&buf[..n]);
self.buffer.extend_from_slice(&content);
}, },
Err(e) => { Err(e) => {
return Some(Err(e)); return Some(Err(e));
@ -78,9 +75,11 @@ fn find_subslice(stack: &[u8], key: &[u8]) -> Option<usize> {
if key.len() == 1 { if key.len() == 1 {
return stack.iter().position(|&b| b == key[0]); return stack.iter().position(|&b| b == key[0]);
} }
if key.len() > stack.len() { if key.len() > stack.len() {
return None; return None;
} }
for i in 0..=stack.len() - key.len() { for i in 0..=stack.len() - key.len() {
if &stack[i..i + key.len()] == key { if &stack[i..i + key.len()] == key {
return Some(i); return Some(i);