From 15f794b7a89efb3299cb85b392ec13af145fb0fd Mon Sep 17 00:00:00 2001
From: Poly <marynczakbartlomiej@gmail.com>
Date: Mon, 4 Jul 2022 01:17:29 +0200
Subject: Address Clippy lints

---
 native/src/widget/text_input.rs | 22 +++++++++++-----------
 1 file changed, 11 insertions(+), 11 deletions(-)

(limited to 'native/src/widget/text_input.rs')

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,
-- 
cgit 


From 2f76a10a1d3617e414fb33c0c6cd5cb7782197ad Mon Sep 17 00:00:00 2001
From: Héctor Ramón Jiménez <hector0193@gmail.com>
Date: Sat, 9 Jul 2022 18:03:59 +0200
Subject: Fix further `clippy` lints

... and explicitly annotate crates as well.
---
 native/src/widget/text_input.rs | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to 'native/src/widget/text_input.rs')

diff --git a/native/src/widget/text_input.rs b/native/src/widget/text_input.rs
index 835b2b4d..98265ef2 100644
--- a/native/src/widget/text_input.rs
+++ b/native/src/widget/text_input.rs
@@ -176,7 +176,7 @@ where
             theme,
             layout,
             cursor_position,
-            &self.state,
+            self.state,
             value.unwrap_or(&self.value),
             &self.placeholder,
             self.size,
-- 
cgit