From d497d5b4aade7c713fded1fafff0b3e3a2a3dbe8 Mon Sep 17 00:00:00 2001 From: Emma Tebibyte Date: Fri, 31 Oct 2025 00:58:12 -0600 Subject: [PATCH] libdelimit: fixes tabs --- src/libdelimit.rs | 80 +++++++++++++++++++++++------------------------ 1 file changed, 40 insertions(+), 40 deletions(-) diff --git a/src/libdelimit.rs b/src/libdelimit.rs index 0717c49..b7de4a9 100644 --- a/src/libdelimit.rs +++ b/src/libdelimit.rs @@ -18,66 +18,66 @@ */ use std::{ - io::{ Read, Result }, - mem, + io::{ Read, Result }, + mem, }; const BUFFER_SIZE: usize = 4096; pub struct Delimited { - delimiter: Vec, - buffer: Vec, - stream: T, + delimiter: Vec, + buffer: Vec, + stream: T, } impl Delimited where T: Read { pub fn new(stream: T, delimiter: &[u8]) -> Self { - Delimited { - stream, - delimiter: delimiter.to_vec(), - buffer: Vec::with_capacity(BUFFER_SIZE), - } - } + Delimited { + stream, + delimiter: delimiter.to_vec(), + buffer: Vec::with_capacity(BUFFER_SIZE), + } + } } impl Iterator for Delimited where T: Read { - type Item = Result>; + type Item = Result>; - fn next(&mut self) -> Option { - let mut buf = [0; BUFFER_SIZE]; + fn next(&mut self) -> Option { + let mut buf = [0; BUFFER_SIZE]; - loop { - if let Some(p) = find_subslice(&self.buffer, &self.delimiter) { - let chunk = self.buffer.drain(..p).collect::>(); - - let _ = self.buffer.drain(..self.delimiter.len()); + loop { + if let Some(p) = find_subslice(&self.buffer, &self.delimiter) { + let chunk = self.buffer.drain(..p).collect::>(); + + let _ = self.buffer.drain(..self.delimiter.len()); - return Some(Ok(chunk)); - } + return Some(Ok(chunk)); + } - match self.stream.read(&mut buf) { - Ok(0) => { - let _ = self.buffer.is_empty() && return None; + match self.stream.read(&mut buf) { + Ok(0) => { + let _ = self.buffer.is_empty() && return None; - return Some(Ok(mem::take(&mut self.buffer))); - }, - Ok(n) => { - self.buffer.extend_from_slice(&buf[..n]); - }, - Err(e) => { - return Some(Err(e)); - }, - } - } - } + return Some(Ok(mem::take(&mut self.buffer))); + }, + Ok(n) => { + self.buffer.extend_from_slice(&buf[..n]); + }, + Err(e) => { + return Some(Err(e)); + }, + } + } + } } fn find_subslice(stack: &[u8], key: &[u8]) -> Option { - match key.len() { - /* TODO: is this optimization necessary? */ - 1 => stack.iter().position(|&b| b == key[0]), - _ => stack.windows(key.len()).position(|w| w == key), - } + match key.len() { + /* TODO: is this optimization necessary? */ + 1 => stack.iter().position(|&b| b == key[0]), + _ => stack.windows(key.len()).position(|w| w == key), + } } #[cfg(test)]