libdelimit: updates to make API easier to use; fop(1): updated to new libdelimit API

src/fop.rs

@@ -94,7 +94,7 @@ fn main() -> ExitCode {
 
 	let stdin = stdin().lock();
 
-	let mut input = Delimited::new(stdin, d.clone().as_bytes());
+	let mut input = Delimited::new(stdin, d.clone());
 	let mut n = 0;
 
 	let mut fopped = false;
@@ -104,7 +104,7 @@ fn main() -> ExitCode {
 			Ok(v) => v,
 			Err(e) => {
 				err(&argv[0], e);
-				exit(EX_IOERR.into());
+				return EX_IOERR.into();
 			},
 		};
 

src/libdelimit.rs

@@ -31,13 +31,25 @@ pub struct Delimited<T: Read> {
 }
 
 impl<T> Delimited<T> where T: Read {
-	pub fn new(stream: T, delimiter: &[u8]) -> Self {
+	pub fn new<R>(stream: T, delimiter: R) -> Self where R: AsRef<[u8]> {
 		Delimited {
 			stream,
-			delimiter: delimiter.to_vec(),
+			delimiter: delimiter.as_ref().to_vec(),
 			buffer: Vec::with_capacity(BUFFER_SIZE),
 		}
 	}
+
+	fn find_subslice(&self) -> Option<usize> {
+		match self.delimiter.len() {
+			/* TODO: is this optimization necessary? */
+			1 => self.buffer.iter().position(|&b| b == self.delimiter[0]),
+			_ => {
+				self.buffer
+					.windows(self.delimiter.len())
+					.position(|w| w == self.delimiter)
+			},
+		}
+	}
 }
 
 impl<T> Iterator for Delimited<T> where T: Read {
@@ -47,7 +59,7 @@ impl<T> Iterator for Delimited<T> where T: Read {
 		let mut buf = [0; BUFFER_SIZE];
 
 		loop {
-			if let Some(p) = find_subslice(&self.buffer, &self.delimiter) {
+			if let Some(p) = self.find_subslice() {
 				let chunk = self.buffer.drain(..p).collect::<Vec<_>>();
 				
 				let _ = self.buffer.drain(..self.delimiter.len());
@@ -56,7 +68,7 @@ impl<T> Iterator for Delimited<T> where T: Read {
 			}
 
 			match self.stream.read(&mut buf) {
-				Ok(0) => {
+				Ok(0) => { /* no bytes read, we’re probably done */
 					let _ = self.buffer.is_empty() && return None;
 
 					return Some(Ok(mem::take(&mut self.buffer)));
@@ -72,14 +84,6 @@ impl<T> Iterator for Delimited<T> where T: Read {
 	}
 }
 
-fn find_subslice(stack: &[u8], key: &[u8]) -> Option<usize> {
-	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)]
 mod tests {
 	use Delimited;
@@ -90,7 +94,7 @@ mod tests {
 		let input = vec!["meow", "woof", "ribbit"];
 		let r = input.join(&d);
 
-		let mut output = Delimited::new(r.as_bytes(), d.as_bytes());
+		let mut output = Delimited::new(r.as_bytes(), d);
 
 		let mut i = 0;
 		while let Some(item) = output.next() {