File tree Expand file tree Collapse file tree 5 files changed +10
-15
lines changed
gix-worktree-stream/tests Expand file tree Collapse file tree 5 files changed +10
-15
lines changed Original file line number Diff line number Diff line change @@ -303,6 +303,6 @@ mod from_tree {
303
303
}
304
304
305
305
fn noop_pipeline ( ) -> gix_filter:: Pipeline {
306
- gix_filter:: Pipeline :: new ( & Default :: default ( ) , Default :: default ( ) )
306
+ gix_filter:: Pipeline :: new ( Default :: default ( ) )
307
307
}
308
308
}
Original file line number Diff line number Diff line change @@ -260,17 +260,14 @@ mod from_tree {
260
260
}
261
261
262
262
fn mutating_pipeline ( driver : bool ) -> gix_filter:: Pipeline {
263
- gix_filter:: Pipeline :: new (
264
- & Default :: default ( ) ,
265
- gix_filter:: pipeline:: Options {
266
- drivers : if driver { vec ! [ driver_with_process( ) ] } else { vec ! [ ] } ,
267
- eol_config : gix_filter:: eol:: Configuration {
268
- auto_crlf : gix_filter:: eol:: AutoCrlf :: Enabled ,
269
- ..Default :: default ( )
270
- } ,
263
+ gix_filter:: Pipeline :: new ( gix_filter:: pipeline:: Options {
264
+ drivers : if driver { vec ! [ driver_with_process( ) ] } else { vec ! [ ] } ,
265
+ eol_config : gix_filter:: eol:: Configuration {
266
+ auto_crlf : gix_filter:: eol:: AutoCrlf :: Enabled ,
271
267
..Default :: default ( )
272
268
} ,
273
- )
269
+ ..Default :: default ( )
270
+ } )
274
271
}
275
272
276
273
pub ( crate ) fn driver_with_process ( ) -> gix_filter:: Driver {
Original file line number Diff line number Diff line change @@ -196,8 +196,7 @@ impl Cache {
196
196
) ?;
197
197
let capabilities = self . fs_capabilities ( ) ?;
198
198
let filters = {
199
- let collection = Default :: default ( ) ;
200
- let mut filters = gix_filter:: Pipeline :: new ( & collection, crate :: filter:: Pipeline :: options ( repo) ?) ;
199
+ let mut filters = gix_filter:: Pipeline :: new ( crate :: filter:: Pipeline :: options ( repo) ?) ;
201
200
if let Ok ( mut head) = repo. head ( ) {
202
201
let ctx = filters. driver_context_mut ( ) ;
203
202
ctx. ref_name = head. referent_name ( ) . map ( |name| name. as_bstr ( ) . to_owned ( ) ) ;
Original file line number Diff line number Diff line change @@ -111,7 +111,7 @@ impl<'repo> Pipeline<'repo> {
111
111
/// Create a new instance by extracting all necessary information and configuration from a `repo` along with `cache` for accessing
112
112
/// attributes. The `index` is used for some filters which may access it under very specific circumstances.
113
113
pub fn new ( repo : & ' repo Repository , cache : gix_worktree:: Stack ) -> Result < Self , pipeline:: options:: Error > {
114
- let pipeline = gix_filter:: Pipeline :: new ( cache . attributes_collection ( ) , Self :: options ( repo) ?) ;
114
+ let pipeline = gix_filter:: Pipeline :: new ( Self :: options ( repo) ?) ;
115
115
Ok ( Pipeline {
116
116
inner : pipeline,
117
117
cache,
Original file line number Diff line number Diff line change @@ -79,8 +79,7 @@ impl crate::Repository {
79
79
let mut cache = self
80
80
. attributes_only ( & index, gix_worktree:: stack:: state:: attributes:: Source :: IdMapping ) ?
81
81
. detach ( ) ;
82
- let pipeline =
83
- gix_filter:: Pipeline :: new ( cache. attributes_collection ( ) , crate :: filter:: Pipeline :: options ( self ) ?) ;
82
+ let pipeline = gix_filter:: Pipeline :: new ( crate :: filter:: Pipeline :: options ( self ) ?) ;
84
83
let objects = self . objects . clone ( ) . into_arc ( ) . expect ( "TBD error handling" ) ;
85
84
let stream = gix_worktree_stream:: from_tree (
86
85
id,
You can’t perform that action at this time.
0 commit comments