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

---
 winit/src/application.rs | 2 +-
 winit/src/conversion.rs  | 8 ++++----
 winit/src/system.rs      | 2 +-
 3 files changed, 6 insertions(+), 6 deletions(-)

(limited to 'winit')

diff --git a/winit/src/application.rs b/winit/src/application.rs
index 9c7dd74e..99402cf5 100644
--- a/winit/src/application.rs
+++ b/winit/src/application.rs
@@ -647,7 +647,7 @@ mod platform {
     {
         use winit::platform::run_return::EventLoopExtRunReturn;
 
-        let _ = event_loop.run_return(event_handler);
+        event_loop.run_return(event_handler);
 
         Ok(())
     }
diff --git a/winit/src/conversion.rs b/winit/src/conversion.rs
index 8e6c0b37..74f6f7a0 100644
--- a/winit/src/conversion.rs
+++ b/winit/src/conversion.rs
@@ -485,10 +485,10 @@ pub fn key_code(
 
 // As defined in: http://www.unicode.org/faq/private_use.html
 pub(crate) fn is_private_use_character(c: char) -> bool {
-    match c {
+    matches!(
+        c,
         '\u{E000}'..='\u{F8FF}'
         | '\u{F0000}'..='\u{FFFFD}'
-        | '\u{100000}'..='\u{10FFFD}' => true,
-        _ => false,
-    }
+        | '\u{100000}'..='\u{10FFFD}'
+    )
 }
diff --git a/winit/src/system.rs b/winit/src/system.rs
index 0ed61dc9..0303707e 100644
--- a/winit/src/system.rs
+++ b/winit/src/system.rs
@@ -24,7 +24,7 @@ pub(crate) fn information(
 
     let memory_used = sysinfo::get_current_pid()
         .and_then(|pid| system.process(pid).ok_or("Process not found"))
-        .and_then(|process| Ok(process.memory()))
+        .map(|process| process.memory())
         .ok();
 
     Information {
-- 
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.
---
 winit/src/lib.rs | 18 +++++++++++++-----
 1 file changed, 13 insertions(+), 5 deletions(-)

(limited to 'winit')

diff --git a/winit/src/lib.rs b/winit/src/lib.rs
index 22e7efdf..3bde0f2b 100644
--- a/winit/src/lib.rs
+++ b/winit/src/lib.rs
@@ -17,11 +17,19 @@
 #![doc(
     html_logo_url = "https://raw.githubusercontent.com/iced-rs/iced/9ab6923e943f784985e9ef9ca28b10278297225d/docs/logo.svg"
 )]
-#![deny(missing_docs)]
-#![deny(missing_debug_implementations)]
-#![deny(unused_results)]
-#![forbid(unsafe_code)]
-#![forbid(rust_2018_idioms)]
+#![deny(
+    missing_debug_implementations,
+    missing_docs,
+    unused_results,
+    clippy::extra_unused_lifetimes,
+    clippy::from_over_into,
+    clippy::needless_borrow,
+    clippy::new_without_default,
+    clippy::useless_conversion
+)]
+#![forbid(rust_2018_idioms, unsafe_code)]
+#![allow(clippy::inherent_to_string, clippy::type_complexity)]
+#![cfg_attr(docsrs, feature(doc_cfg))]
 
 #[doc(no_inline)]
 pub use iced_native::*;
-- 
cgit