summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorBlaž Hrastnik2022-02-25 04:06:11 +0000
committerBlaž Hrastnik2022-02-25 04:06:11 +0000
commitb935fac9576cf333e22b82e40da8c4d73c8e547d (patch)
treeac3be8e90238e7435f440879d18d91c5591a6b54
parent9712bbb23b19a957aaba9080ec5ee5f3134e526e (diff)
Fix 1.60 lints
-rw-r--r--helix-term/src/ui/completion.rs2
-rw-r--r--helix-tui/src/widgets/reflow.rs2
2 files changed, 2 insertions, 2 deletions
diff --git a/helix-term/src/ui/completion.rs b/helix-term/src/ui/completion.rs
index adaac1a7..a6e92a19 100644
--- a/helix-term/src/ui/completion.rs
+++ b/helix-term/src/ui/completion.rs
@@ -165,7 +165,7 @@ impl Completion {
if let Some(additional_edits) = item
.additional_text_edits
.as_ref()
- .or_else(|| resolved_additional_text_edits.as_ref())
+ .or(resolved_additional_text_edits.as_ref())
{
if !additional_edits.is_empty() {
let transaction = util::generate_transaction_from_edits(
diff --git a/helix-tui/src/widgets/reflow.rs b/helix-tui/src/widgets/reflow.rs
index 33e52bb4..38071940 100644
--- a/helix-tui/src/widgets/reflow.rs
+++ b/helix-tui/src/widgets/reflow.rs
@@ -490,7 +490,7 @@ mod test {
assert_eq!(word_wrapper, vec!["AAAAAAAAAAAAAAA", "AAAA\u{00a0}AAA",]);
// Ensure that if the character was a regular space, it would be wrapped differently.
- let text_space = text.replace("\u{00a0}", " ");
+ let text_space = text.replace('\u{00a0}', " ");
let (word_wrapper_space, _) =
run_composer(Composer::WordWrapper { trim: true }, &text_space, width);
assert_eq!(word_wrapper_space, vec!["AAAAAAAAAAAAAAA AAAA", "AAA",]);