Skip to content

Commit 1763862

Browse files
committed
adapt to changes in gix-filter
1 parent 7d754cc commit 1763862

File tree

5 files changed

+5
-18
lines changed

5 files changed

+5
-18
lines changed

gix-archive/tests/archive.rs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -303,6 +303,6 @@ mod from_tree {
303303
}
304304

305305
fn noop_pipeline() -> gix_filter::Pipeline {
306-
gix_filter::Pipeline::new(&Default::default(), Default::default(), Default::default())
306+
gix_filter::Pipeline::new(Default::default(), Default::default())
307307
}
308308
}

gix-worktree-stream/tests/stream.rs

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -261,7 +261,6 @@ mod from_tree {
261261

262262
fn mutating_pipeline(driver: bool) -> gix_filter::Pipeline {
263263
gix_filter::Pipeline::new(
264-
&Default::default(),
265264
Default::default(),
266265
gix_filter::pipeline::Options {
267266
drivers: if driver { vec![driver_with_process()] } else { vec![] },

gix/src/config/cache/access.rs

Lines changed: 2 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -196,12 +196,8 @@ impl Cache {
196196
)?;
197197
let capabilities = self.fs_capabilities()?;
198198
let filters = {
199-
let collection = Default::default();
200-
let mut filters = gix_filter::Pipeline::new(
201-
&collection,
202-
repo.command_context()?,
203-
crate::filter::Pipeline::options(repo)?,
204-
);
199+
let mut filters =
200+
gix_filter::Pipeline::new(repo.command_context()?, crate::filter::Pipeline::options(repo)?);
205201
if let Ok(mut head) = repo.head() {
206202
let ctx = filters.driver_context_mut();
207203
ctx.ref_name = head.referent_name().map(|name| name.as_bstr().to_owned());

gix/src/filter.rs

Lines changed: 1 addition & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -113,11 +113,7 @@ impl<'repo> Pipeline<'repo> {
113113
/// Create a new instance by extracting all necessary information and configuration from a `repo` along with `cache` for accessing
114114
/// attributes. The `index` is used for some filters which may access it under very specific circumstances.
115115
pub fn new(repo: &'repo Repository, cache: gix_worktree::Stack) -> Result<Self, pipeline::options::Error> {
116-
let pipeline = gix_filter::Pipeline::new(
117-
cache.attributes_collection(),
118-
repo.command_context()?,
119-
Self::options(repo)?,
120-
);
116+
let pipeline = gix_filter::Pipeline::new(repo.command_context()?, Self::options(repo)?);
121117
Ok(Pipeline {
122118
inner: pipeline,
123119
cache,

gix/src/repository/worktree.rs

Lines changed: 1 addition & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -79,11 +79,7 @@ impl crate::Repository {
7979
let mut cache = self
8080
.attributes_only(&index, gix_worktree::stack::state::attributes::Source::IdMapping)?
8181
.detach();
82-
let pipeline = gix_filter::Pipeline::new(
83-
cache.attributes_collection(),
84-
self.command_context()?,
85-
crate::filter::Pipeline::options(self)?,
86-
);
82+
let pipeline = gix_filter::Pipeline::new(repo.command_context()?, crate::filter::Pipeline::options(self)?);
8783
let objects = self.objects.clone().into_arc().expect("TBD error handling");
8884
let stream = gix_worktree_stream::from_tree(
8985
id,

0 commit comments

Comments
 (0)