File tree Expand file tree Collapse file tree 2 files changed +12
-11
lines changed
gix-config/src/file/section Expand file tree Collapse file tree 2 files changed +12
-11
lines changed Original file line number Diff line number Diff line change @@ -84,9 +84,10 @@ impl<'event> Body<'event> {
84
84
85
85
/// Returns an iterator visiting all keys in order.
86
86
pub fn keys ( & self ) -> impl Iterator < Item = & Key < ' event > > {
87
- self . 0
88
- . iter ( )
89
- . filter_map ( |e| if let Event :: SectionKey ( k) = e { Some ( k) } else { None } )
87
+ self . 0 . iter ( ) . filter_map ( |e| match e {
88
+ Event :: SectionKey ( k) => Some ( k) ,
89
+ _ => None ,
90
+ } )
90
91
}
91
92
92
93
/// Returns true if the section contains the provided key.
Original file line number Diff line number Diff line change @@ -132,8 +132,9 @@ where
132
132
}
133
133
134
134
fn process_tracked_changes ( & mut self ) -> Result < Option < rewrites:: Outcome > , Error > {
135
- let Some ( tracked) = self . tracked . as_mut ( ) else {
136
- return Ok ( None )
135
+ let tracked = match self . tracked . as_mut ( ) {
136
+ Some ( t) => t,
137
+ None => return Ok ( None ) ,
137
138
} ;
138
139
139
140
let outcome = tracked. emit (
@@ -201,8 +202,8 @@ where
201
202
}
202
203
203
204
fn visit ( & mut self , change : gix_diff:: tree:: visit:: Change ) -> gix_diff:: tree:: visit:: Action {
204
- if let Some ( tracked ) = self . tracked . as_mut ( ) {
205
- tracked
205
+ match self . tracked . as_mut ( ) {
206
+ Some ( tracked ) => tracked
206
207
. try_push_change ( change, self . recorder . path ( ) )
207
208
. map ( |change| {
208
209
Self :: emit_change (
@@ -214,16 +215,15 @@ where
214
215
& mut self . err ,
215
216
)
216
217
} )
217
- . unwrap_or ( gix_diff:: tree:: visit:: Action :: Continue )
218
- } else {
219
- Self :: emit_change (
218
+ . unwrap_or ( gix_diff:: tree:: visit:: Action :: Continue ) ,
219
+ None => Self :: emit_change (
220
220
change,
221
221
self . recorder . path ( ) ,
222
222
& mut self . visit ,
223
223
self . src_tree . repo ,
224
224
self . other_repo ,
225
225
& mut self . err ,
226
- )
226
+ ) ,
227
227
}
228
228
}
229
229
}
You can’t perform that action at this time.
0 commit comments