File tree Expand file tree Collapse file tree 2 files changed +11
-16
lines changed Expand file tree Collapse file tree 2 files changed +11
-16
lines changed Original file line number Diff line number Diff line change @@ -39,7 +39,7 @@ pub mod is_active {
39
39
#[ error( transparent) ]
40
40
InitIsActivePlatform ( #[ from] gix_submodule:: is_active_platform:: Error ) ,
41
41
#[ error( transparent) ]
42
- QueryIsActive ( #[ from] gix_submodule :: is_active_platform :: is_active :: Error ) ,
42
+ QueryIsActive ( #[ from] gix_config :: value :: Error ) ,
43
43
#[ error( transparent) ]
44
44
InitAttributes ( #[ from] crate :: config:: attribute_stack:: Error ) ,
45
45
#[ error( transparent) ]
Original file line number Diff line number Diff line change @@ -140,21 +140,16 @@ impl<'repo> Submodule<'repo> {
140
140
/// Please see the [plumbing crate documentation](gix_submodule::IsActivePlatform::is_active()) for details.
141
141
pub fn is_active ( & self ) -> Result < bool , is_active:: Error > {
142
142
let ( mut platform, mut attributes) = self . state . active_state_mut ( ) ?;
143
- let is_active = platform. is_active (
144
- & self . state . modules ,
145
- & self . state . repo . config . resolved ,
146
- self . name . as_ref ( ) ,
147
- {
148
- |relative_path, case, is_dir, out| {
149
- attributes
150
- . set_case ( case)
151
- . at_entry ( relative_path, Some ( is_dir) , |id, buf| {
152
- self . state . repo . objects . find_blob ( id, buf)
153
- } )
154
- . map_or ( false , |platform| platform. matching_attributes ( out) )
155
- }
156
- } ,
157
- ) ?;
143
+ let is_active = platform. is_active ( & self . state . repo . config . resolved , self . name . as_ref ( ) , {
144
+ |relative_path, case, is_dir, out| {
145
+ attributes
146
+ . set_case ( case)
147
+ . at_entry ( relative_path, Some ( is_dir) , |id, buf| {
148
+ self . state . repo . objects . find_blob ( id, buf)
149
+ } )
150
+ . map_or ( false , |platform| platform. matching_attributes ( out) )
151
+ }
152
+ } ) ?;
158
153
Ok ( is_active)
159
154
}
160
155
You can’t perform that action at this time.
0 commit comments