use Buffers implementation from gix-utils

Byron · Byron · commit 1ed74f7bf56a · 2023-11-28T15:17:01.000+01:00
diff --git a/Cargo.lock b/Cargo.lock
diff --git a/gix-filter/Cargo.toml b/gix-filter/Cargo.toml
@@ -18,6 +18,7 @@ gix-trace = { version = "^0.1.3", path = "../gix-trace" }
 gix-object = { version = "^0.38.0", path = "../gix-object" }
 gix-command = { version = "^0.2.10", path = "../gix-command" }
 gix-quote = { version = "^0.4.7", path = "../gix-quote" }
+gix-utils = { version = "^0.1.5", path = "../gix-utils" }
 gix-path = { version = "^0.10.0", path = "../gix-path" }
 gix-packetline = { package = "gix-packetline-blocking", version = "^0.16.6", path = "../gix-packetline-blocking" }
 gix-attributes = { version = "^0.20.0", path = "../gix-attributes" }
diff --git a/gix-filter/src/lib.rs b/gix-filter/src/lib.rs
@@ -43,7 +43,7 @@ pub struct Pipeline {
     /// State needed to keep running filter processes.
     processes: driver::State,
     /// A utility to handle multiple buffers to keep results of various filters.
-    bufs: pipeline::util::Buffers,
+    bufs: gix_utils::Buffers,
 }
 
 /// A declaration of a driver program.
diff --git a/gix-filter/src/pipeline/convert.rs b/gix-filter/src/pipeline/convert.rs
@@ -190,7 +190,7 @@ impl Pipeline {
             self.options.eol_config,
         )?;
 
-        let mut bufs = self.bufs.with_src(src);
+        let mut bufs = self.bufs.use_foreign_src(src);
         let (src, dest) = bufs.src_and_dest();
         if apply_ident_filter && ident::apply(src, self.options.object_hash, dest) {
             bufs.swap();
diff --git a/gix-filter/src/pipeline/mod.rs b/gix-filter/src/pipeline/mod.rs
@@ -114,6 +114,3 @@ impl Pipeline {
 pub mod convert;
 
 pub(crate) mod util;
-
-#[cfg(test)]
-mod tests;
diff --git a/gix-filter/src/pipeline/tests.rs b/gix-filter/src/pipeline/tests.rs
diff --git a/gix-filter/src/pipeline/util.rs b/gix-filter/src/pipeline/util.rs
@@ -11,54 +11,6 @@ use crate::{
     Driver,
 };
 
-/// A utility to do buffer-swapping with.
-#[derive(Default, Clone)]
-pub(crate) struct Buffers {
-    pub src: Vec<u8>,
-    pub dest: Vec<u8>,
-}
-
-/// A utility to do buffer-swapping with.
-pub(crate) struct BuffersWithSource<'src, 'bufs> {
-    pub ro_src: Option<&'src [u8]>,
-    pub src: &'bufs mut Vec<u8>,
-    pub dest: &'bufs mut Vec<u8>,
-}
-
-impl Buffers {
-    pub fn with_src<'a, 'src>(&'a mut self, src: &'src [u8]) -> BuffersWithSource<'src, 'a> {
-        self.clear();
-        BuffersWithSource {
-            ro_src: Some(src),
-            src: &mut self.src,
-            dest: &mut self.dest,
-        }
-    }
-    pub fn clear(&mut self) {
-        self.src.clear();
-        self.dest.clear();
-    }
-
-    pub fn swap(&mut self) {
-        std::mem::swap(&mut self.src, &mut self.dest);
-    }
-}
-
-impl BuffersWithSource<'_, '_> {
-    /// Must be called after every change (i.e. when it's known that `dest` was written.
-    pub fn swap(&mut self) {
-        self.ro_src.take();
-        std::mem::swap(&mut self.src, &mut self.dest);
-        self.dest.clear();
-    }
-    pub fn src_and_dest(&mut self) -> (&[u8], &mut Vec<u8>) {
-        match self.ro_src {
-            Some(src) => (src, &mut self.dest),
-            None => (self.src, &mut self.dest),
-        }
-    }
-}
-
 pub(crate) struct Configuration<'a> {
     pub(crate) driver: Option<&'a Driver>,
     /// What attributes say about CRLF handling.

Original file line number	Diff line number	Diff line change
`@@ -43,7 +43,7 @@ pub struct Pipeline {`
`43`	`43`	`/// State needed to keep running filter processes.`
`44`	`44`	`processes: driver::State,`
`45`	`45`	`/// A utility to handle multiple buffers to keep results of various filters.`
`46`		`- bufs: pipeline::util::Buffers,`
	`46`	`+ bufs: gix_utils::Buffers,`
`47`	`47`	`}`
`48`	`48`
`49`	`49`	`/// A declaration of a driver program.`