Skip to content

Commit 9160659

Browse files
committed
restore msrv compatibility by removing sole if let ... else
1 parent 4e69551 commit 9160659

File tree

2 files changed

+12
-11
lines changed

2 files changed

+12
-11
lines changed

gix-config/src/file/section/body.rs

Lines changed: 4 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -84,9 +84,10 @@ impl<'event> Body<'event> {
8484

8585
/// Returns an iterator visiting all keys in order.
8686
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+
})
9091
}
9192

9293
/// Returns true if the section contains the provided key.

gix/src/object/tree/diff/for_each.rs

Lines changed: 8 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -132,8 +132,9 @@ where
132132
}
133133

134134
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),
137138
};
138139

139140
let outcome = tracked.emit(
@@ -201,8 +202,8 @@ where
201202
}
202203

203204
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
206207
.try_push_change(change, self.recorder.path())
207208
.map(|change| {
208209
Self::emit_change(
@@ -214,16 +215,15 @@ where
214215
&mut self.err,
215216
)
216217
})
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(
220220
change,
221221
self.recorder.path(),
222222
&mut self.visit,
223223
self.src_tree.repo,
224224
self.other_repo,
225225
&mut self.err,
226-
)
226+
),
227227
}
228228
}
229229
}

0 commit comments

Comments
 (0)