diff --git a/helix-core/tests/indent.rs b/helix-core/tests/indent.rs index ab733f93..6d4b0c3e 100644 --- a/helix-core/tests/indent.rs +++ b/helix-core/tests/indent.rs @@ -222,7 +222,7 @@ fn test_treesitter_indent( .unwrap() .to_string(&indent_style, tab_width); assert!( - line.get_slice(..pos).map_or(false, |s| s == suggested_indent), + line.get_slice(..pos).is_some_and(|s| s == suggested_indent), "Wrong indentation for file {:?} on line {}:\n\"{}\" (original line)\n\"{}\" (suggested indentation)\n", test_name, i+1, diff --git a/helix-term/src/keymap.rs b/helix-term/src/keymap.rs index d8227b50..ea2c52b1 100644 --- a/helix-term/src/keymap.rs +++ b/helix-term/src/keymap.rs @@ -483,14 +483,11 @@ mod tests { .len() > 1 ); - assert!( - merged_keyamp - .get(&Mode::Insert) - .and_then(|key_trie| key_trie.node()) - .unwrap() - .len() - > 0 - ); + assert!(!merged_keyamp + .get(&Mode::Insert) + .and_then(|key_trie| key_trie.node()) + .unwrap() + .is_empty()); } #[test] diff --git a/helix-view/src/tree.rs b/helix-view/src/tree.rs index b1894453..2c1ddbd7 100644 --- a/helix-view/src/tree.rs +++ b/helix-view/src/tree.rs @@ -957,8 +957,7 @@ mod test { assert_eq!(10, tree.views().count()); assert_eq!( - std::iter::repeat(7) - .take(9) + std::iter::repeat_n(7, 9) .chain(Some(8)) // Rounding in `recalculate`. .collect::>(), tree.views()