diff options
author | 2022-07-09 19:03:40 +0200 | |
---|---|---|
committer | 2022-07-09 19:03:40 +0200 | |
commit | 9051dd6977d045f991092e247e6bd9da40d2e793 (patch) | |
tree | cde7d983ffc085ed908be776e9021a8e41b44b44 /winit | |
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 '')
-rw-r--r-- | winit/src/application.rs | 2 | ||||
-rw-r--r-- | winit/src/conversion.rs | 8 | ||||
-rw-r--r-- | winit/src/lib.rs | 18 | ||||
-rw-r--r-- | winit/src/system.rs | 2 |
4 files changed, 19 insertions, 11 deletions
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/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::*; 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 { |