Skip to content

Commit ca8ce12

Browse files
committed
cargo fmt
1 parent 334af9c commit ca8ce12

File tree

3 files changed

+15
-10
lines changed

3 files changed

+15
-10
lines changed

helix-core/src/transaction.rs

+6-2
Original file line numberDiff line numberDiff line change
@@ -378,7 +378,9 @@ impl ChangeSet {
378378
macro_rules! map {
379379
($map: expr, $i: expr) => {
380380
loop {
381-
let Some((pos, assoc)) = positions.peek_mut() else { return; };
381+
let Some((pos, assoc)) = positions.peek_mut() else {
382+
return;
383+
};
382384
if **pos < old_pos {
383385
// Positions are not sorted, revert to the last Operation that
384386
// contains this position and continue iterating from there.
@@ -405,7 +407,9 @@ impl ChangeSet {
405407
debug_assert!(old_pos <= **pos, "Reverse Iter across changeset works");
406408
continue 'outer;
407409
}
408-
let Some(new_pos) = $map(**pos, *assoc) else { break; };
410+
let Some(new_pos) = $map(**pos, *assoc) else {
411+
break;
412+
};
409413
**pos = new_pos;
410414
positions.next();
411415
}

helix-term/src/handlers/signature_help.rs

+6-7
Original file line numberDiff line numberDiff line change
@@ -118,8 +118,7 @@ pub fn request_signature_help(
118118
// Do not show the message if signature help was invoked
119119
// automatically on backspace, trigger characters, etc.
120120
if invoked == SignatureHelpInvoked::Manual {
121-
editor
122-
.set_error("No configured language server supports signature-help");
121+
editor.set_error("No configured language server supports signature-help");
123122
}
124123
return;
125124
};
@@ -264,11 +263,11 @@ fn signature_help_post_insert_char_hook(
264263
let (view, doc) = current!(cx.editor);
265264
// TODO support multiple language servers (not just the first that is found), likely by merging UI somehow
266265
let Some(language_server) = doc
267-
.language_servers_with_feature(LanguageServerFeature::SignatureHelp)
268-
.next()
269-
else {
270-
return Ok(());
271-
};
266+
.language_servers_with_feature(LanguageServerFeature::SignatureHelp)
267+
.next()
268+
else {
269+
return Ok(());
270+
};
272271

273272
let capabilities = language_server.capabilities();
274273

helix-view/src/register.rs

+3-1
Original file line numberDiff line numberDiff line change
@@ -233,7 +233,9 @@ fn read_from_clipboard<'a>(
233233
// If we're pasting the same values that we just yanked, re-use
234234
// the saved values. This allows pasting multiple selections
235235
// even when yanked to a clipboard.
236-
let Some(values) = saved_values else { return RegisterValues::new(iter::once(contents.into())) };
236+
let Some(values) = saved_values else {
237+
return RegisterValues::new(iter::once(contents.into()));
238+
};
237239

238240
if contents_are_saved(values, &contents) {
239241
RegisterValues::new(values.iter().map(Cow::from).rev())

0 commit comments

Comments
 (0)