diff options
| author |  Héctor Ramón <hector0193@gmail.com> | 2022-07-09 19:03:40 +0200 |
|---|---|---|
| committer |  GitHub <noreply@github.com> | 2022-07-09 19:03:40 +0200 |
| commit | 9051dd6977d045f991092e247e6bd9da40d2e793 (patch) | |
| tree | cde7d983ffc085ed908be776e9021a8e41b44b44 /native/src/widget/text_input | |
| parent | c4c1221be62f51dd9f1d20ea2c4ea6e2c94e20aa (diff) | |
| parent | e548d6c0d5b430b090821e673dc453a24c885fbe (diff) | |
| download | iced-9051dd6977d045f991092e247e6bd9da40d2e793.tar.gz iced-9051dd6977d045f991092e247e6bd9da40d2e793.tar.bz2 iced-9051dd6977d045f991092e247e6bd9da40d2e793.zip | |
Merge pull request #1379 from PolyMeilex/fix/clippy
Address Clippy lints
Diffstat (limited to 'native/src/widget/text_input')
| -rw-r--r-- | native/src/widget/text_input/editor.rs | 19 | ||||
| -rw-r--r-- | native/src/widget/text_input/value.rs | 7 |
2 files changed, 9 insertions, 17 deletions
diff --git a/native/src/widget/text_input/editor.rs b/native/src/widget/text_input/editor.rs index bac530e1..d53fa8d9 100644 --- a/native/src/widget/text_input/editor.rs +++ b/native/src/widget/text_input/editor.rs @@ -15,12 +15,9 @@ impl<'a> Editor<'a> { } pub fn insert(&mut self, character: char) { - match self.cursor.selection(self.value) { - Some((left, right)) => { - self.cursor.move_left(self.value); - self.value.remove_many(left, right); - } - _ => {} + if let Some((left, right)) = self.cursor.selection(self.value) { + self.cursor.move_left(self.value); + self.value.remove_many(left, right); } self.value.insert(self.cursor.end(self.value), character); @@ -29,13 +26,9 @@ impl<'a> Editor<'a> { pub fn paste(&mut self, content: Value) { let length = content.len(); - - match self.cursor.selection(self.value) { - Some((left, right)) => { - self.cursor.move_left(self.value); - self.value.remove_many(left, right); - } - _ => {} + if let Some((left, right)) = self.cursor.selection(self.value) { + self.cursor.move_left(self.value); + self.value.remove_many(left, right); } self.value.insert_many(self.cursor.end(self.value), content); diff --git a/native/src/widget/text_input/value.rs b/native/src/widget/text_input/value.rs index 2034cca4..cf4da562 100644 --- a/native/src/widget/text_input/value.rs +++ b/native/src/widget/text_input/value.rs @@ -37,7 +37,7 @@ impl Value { let previous_string = &self.graphemes[..index.min(self.graphemes.len())].concat(); - UnicodeSegmentation::split_word_bound_indices(&previous_string as &str) + UnicodeSegmentation::split_word_bound_indices(previous_string as &str) .filter(|(_, word)| !word.trim_start().is_empty()) .next_back() .map(|(i, previous_word)| { @@ -58,9 +58,8 @@ impl Value { pub fn next_end_of_word(&self, index: usize) -> usize { let next_string = &self.graphemes[index..].concat(); - UnicodeSegmentation::split_word_bound_indices(&next_string as &str) - .filter(|(_, word)| !word.trim_start().is_empty()) - .next() + UnicodeSegmentation::split_word_bound_indices(next_string as &str) + .find(|(_, word)| !word.trim_start().is_empty()) .map(|(i, next_word)| { index + UnicodeSegmentation::graphemes(next_word, true).count() |