diff options
| author |  Poly <marynczakbartlomiej@gmail.com> | 2022-07-04 01:17:29 +0200 |
|---|---|---|
| committer |  Héctor Ramón Jiménez <hector0193@gmail.com> | 2022-07-09 17:07:38 +0200 |
| commit | 15f794b7a89efb3299cb85b392ec13af145fb0fd (patch) | |
| tree | 39d8c740168e4c09e15538451ba7f3899051ad43 /native/src/widget/text_input.rs | |
| parent | e053e25d2ccb17f7a162685a106a8bbd915a873f (diff) | |
| download | iced-15f794b7a89efb3299cb85b392ec13af145fb0fd.tar.gz iced-15f794b7a89efb3299cb85b392ec13af145fb0fd.tar.bz2 iced-15f794b7a89efb3299cb85b392ec13af145fb0fd.zip | |
Address Clippy lints
Diffstat (limited to 'native/src/widget/text_input.rs')
| -rw-r--r-- | native/src/widget/text_input.rs | 22 |
1 files changed, 11 insertions, 11 deletions
diff --git a/native/src/widget/text_input.rs b/native/src/widget/text_input.rs index d345cec3..835b2b4d 100644 --- a/native/src/widget/text_input.rs +++ b/native/src/widget/text_input.rs @@ -198,7 +198,7 @@ pub fn layout<Renderer>( where Renderer: text::Renderer, { - let text_size = size.unwrap_or(renderer.default_size()); + let text_size = size.unwrap_or_else(|| renderer.default_size()); let limits = limits .pad(padding) @@ -498,7 +498,7 @@ where None => { let content: String = clipboard .read() - .unwrap_or(String::new()) + .unwrap_or_default() .chars() .filter(|c| !c.is_control()) .collect(); @@ -597,7 +597,7 @@ pub fn draw<Renderer>( Renderer::Theme: StyleSheet, { let secure_value = is_secure.then(|| value.secure()); - let value = secure_value.as_ref().unwrap_or(&value); + let value = secure_value.as_ref().unwrap_or(value); let bounds = layout.bounds(); let text_bounds = layout.children().next().unwrap().bounds(); @@ -623,16 +623,16 @@ pub fn draw<Renderer>( ); let text = value.to_string(); - let size = size.unwrap_or(renderer.default_size()); + let size = size.unwrap_or_else(|| renderer.default_size()); let (cursor, offset) = if state.is_focused() { - match state.cursor.state(&value) { + match state.cursor.state(value) { cursor::State::Index(position) => { let (text_value_width, offset) = measure_cursor_and_scroll_offset( renderer, text_bounds, - &value, + value, size, position, font.clone(), @@ -664,7 +664,7 @@ pub fn draw<Renderer>( measure_cursor_and_scroll_offset( renderer, text_bounds, - &value, + value, size, left, font.clone(), @@ -674,7 +674,7 @@ pub fn draw<Renderer>( measure_cursor_and_scroll_offset( renderer, text_bounds, - &value, + value, size, right, font.clone(), @@ -998,16 +998,16 @@ fn find_cursor_position<Renderer>( where Renderer: text::Renderer, { - let size = size.unwrap_or(renderer.default_size()); + let size = size.unwrap_or_else(|| renderer.default_size()); let offset = - offset(renderer, text_bounds, font.clone(), size, &value, &state); + offset(renderer, text_bounds, font.clone(), size, value, state); renderer .hit_test( &value.to_string(), size.into(), - font.clone(), + font, Size::INFINITY, Point::new(x + offset, text_bounds.height / 2.0), true, |