asp/keep
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

refactor: update filter plugins to use boxed reader/writer parameters

Browse Source 
Co-authored-by: aider (openai/andrew/openrouter/sonoma-sky-alpha) <aider@aider.chat>
This commit is contained in:
Andrew Phillips
2025-09-12 11:56:11 -03:00
parent 0be54abe60
commit 9b85af439d
3 changed files with 13 additions and 24 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
src/filter_plugin/grep.rs
View File

@@ -70,12 +70,12 @@ impl GrepFilter {
/// filter.filter(&mut input, &mut output)?;
/// ```
impl FilterPlugin for GrepFilter {
fn filter(&mut self, reader: &mut dyn Read, writer: &mut dyn Write) -> Result<()> {
let mut buf_reader = std::io::BufReader::new(reader);
fn filter(&mut self, reader: Box<&mut dyn Read>, writer: Box<&mut dyn Write>) -> Result<()> {
let mut buf_reader = std::io::BufReader::new(reader.as_mut());
for line in buf_reader.by_ref().lines() {
let line = line?;
if self.regex.is_match(&line) {
writeln!(writer, "{}", line)?;
writeln!(writer.as_mut(), "{}", line)?;
}
}
Ok(())
@@ -124,4 +124,4 @@ impl FilterPlugin for GrepFilter {
}
]
}
}
}

12
src/filter_plugin/head.rs
View File

@@ -72,7 +72,7 @@ impl HeadBytesFilter {
/// // Input "Hello World" becomes "Hello"
/// ```
impl FilterPlugin for HeadBytesFilter {
fn filter(&mut self, reader: &mut dyn Read, writer: &mut dyn Write) -> Result<()> {
fn filter(&mut self, reader: Box<&mut dyn Read>, writer: Box<&mut dyn Write>) -> Result<()> {
if self.remaining == 0 {
return Ok(());
}
@@ -80,11 +80,11 @@ impl FilterPlugin for HeadBytesFilter {
let mut buffer = vec![0; PIPESIZE];
while self.remaining > 0 {
let to_read = std::cmp::min(self.remaining, PIPESIZE);
let bytes_read = reader.read(&mut buffer[..to_read])?;
let bytes_read = reader.as_mut().read(&mut buffer[..to_read])?;
if bytes_read == 0 {
break;
}
writer.write_all(&buffer[..bytes_read])?;
writer.as_mut().write_all(&buffer[..bytes_read])?;
self.remaining -= bytes_read;
}
Ok(())
@@ -182,15 +182,15 @@ impl HeadLinesFilter {
/// // Input "Line1\nLine2\nLine3" becomes "Line1\nLine2\n"
/// ```
impl FilterPlugin for HeadLinesFilter {
fn filter(&mut self, reader: &mut dyn Read, writer: &mut dyn Write) -> Result<()> {
fn filter(&mut self, reader: Box<&mut dyn Read>, writer: Box<&mut dyn Write>) -> Result<()> {
if self.remaining == 0 {
return Ok(());
}
let mut buf_reader = std::io::BufReader::new(reader);
let mut buf_reader = std::io::BufReader::new(reader.as_mut());
for line in buf_reader.by_ref().lines() {
let line = line?;
writeln!(writer, "{}", line)?;
writeln!(writer.as_mut(), "{}", line)?;
self.remaining -= 1;
if self.remaining == 0 {
break;