aboutsummaryrefslogtreecommitdiff
path: root/helix-term
diff options
context:
space:
mode:
authorCasper Rogild Storm2023-04-03 04:41:41 +0000
committerGitHub2023-04-03 04:41:41 +0000
commit9420ba7484b14d10d24edf7236852cc18d985dfb (patch)
treece1b840a37b089823dc36c65717f65c3ce27351d /helix-term
parent1073dd632932d0c9131f6413a5ced69ee7096e60 (diff)
Let..else refactor (#6562)
Diffstat (limited to 'helix-term')
-rw-r--r--helix-term/src/commands/typed.rs12
1 files changed, 4 insertions, 8 deletions
diff --git a/helix-term/src/commands/typed.rs b/helix-term/src/commands/typed.rs
index 0255bbea..afc3d706 100644
--- a/helix-term/src/commands/typed.rs
+++ b/helix-term/src/commands/typed.rs
@@ -2125,20 +2125,16 @@ fn reset_diff_change(
let scrolloff = editor.config().scrolloff;
let (view, doc) = current!(editor);
- // TODO refactor to use let..else once MSRV is raised to 1.65
- let handle = match doc.diff_handle() {
- Some(handle) => handle,
- None => bail!("Diff is not available in the current buffer"),
+ let Some(handle) = doc.diff_handle() else {
+ bail!("Diff is not available in the current buffer")
};
let diff = handle.load();
let doc_text = doc.text().slice(..);
let line = doc.selection(view.id).primary().cursor_line(doc_text);
- // TODO refactor to use let..else once MSRV is raised to 1.65
- let hunk_idx = match diff.hunk_at(line as u32, true) {
- Some(hunk_idx) => hunk_idx,
- None => bail!("There is no change at the cursor"),
+ let Some(hunk_idx) = diff.hunk_at(line as u32, true) else {
+ bail!("There is no change at the cursor")
};
let hunk = diff.nth_hunk(hunk_idx);
let diff_base = diff.diff_base();