From 078b46720bf8acb341bdec966296060395ec8e2b Mon Sep 17 00:00:00 2001 From: Kirill Chibisov Date: Sat, 15 Jun 2024 15:26:26 +0300 Subject: [PATCH] chore: address 1.79 clippy lints --- src/platform_impl/android/mod.rs | 2 -- src/platform_impl/ios/app_state.rs | 6 +++--- src/platform_impl/ios/event_loop.rs | 7 +++---- src/platform_impl/ios/mod.rs | 1 - src/platform_impl/linux/wayland/mod.rs | 2 -- src/platform_impl/linux/x11/event_processor.rs | 2 +- src/platform_impl/linux/x11/ime/context.rs | 4 +++- src/platform_impl/linux/x11/mod.rs | 2 -- src/platform_impl/macos/event_loop.rs | 3 +-- src/platform_impl/macos/observer.rs | 10 +++++----- src/platform_impl/macos/window_delegate.rs | 4 ++-- src/platform_impl/orbital/mod.rs | 2 +- src/platform_impl/web/async/dispatcher.rs | 7 ++++++- src/platform_impl/web/event_loop/mod.rs | 6 +++++- src/platform_impl/windows/mod.rs | 2 -- 15 files changed, 30 insertions(+), 30 deletions(-) diff --git a/src/platform_impl/android/mod.rs b/src/platform_impl/android/mod.rs index 499ad67e2e..35751766ce 100644 --- a/src/platform_impl/android/mod.rs +++ b/src/platform_impl/android/mod.rs @@ -1,5 +1,3 @@ -#![cfg(android_platform)] - use std::cell::Cell; use std::collections::VecDeque; use std::hash::Hash; diff --git a/src/platform_impl/ios/app_state.rs b/src/platform_impl/ios/app_state.rs index 172ffe8e42..f62fe5e70a 100644 --- a/src/platform_impl/ios/app_state.rs +++ b/src/platform_impl/ios/app_state.rs @@ -798,7 +798,7 @@ impl EventLoopWaker { // future, but that gets changed to fire immediately in did_finish_launching let timer = CFRunLoopTimerCreate( ptr::null_mut(), - std::f64::MAX, + f64::MAX, 0.000_000_1, 0, 0, @@ -812,11 +812,11 @@ impl EventLoopWaker { } fn stop(&mut self) { - unsafe { CFRunLoopTimerSetNextFireDate(self.timer, std::f64::MAX) } + unsafe { CFRunLoopTimerSetNextFireDate(self.timer, f64::MAX) } } fn start(&mut self) { - unsafe { CFRunLoopTimerSetNextFireDate(self.timer, std::f64::MIN) } + unsafe { CFRunLoopTimerSetNextFireDate(self.timer, f64::MIN) } } fn start_at(&mut self, instant: Instant) { diff --git a/src/platform_impl/ios/event_loop.rs b/src/platform_impl/ios/event_loop.rs index 7881a7d1ab..bcf42a77ee 100644 --- a/src/platform_impl/ios/event_loop.rs +++ b/src/platform_impl/ios/event_loop.rs @@ -283,8 +283,7 @@ impl EventLoopProxy { cancel: None, perform: event_loop_proxy_handler, }; - let source = - CFRunLoopSourceCreate(ptr::null_mut(), CFIndex::max_value() - 1, &mut context); + let source = CFRunLoopSourceCreate(ptr::null_mut(), CFIndex::MAX - 1, &mut context); CFRunLoopAddSource(rl, source, kCFRunLoopCommonModes); CFRunLoopWakeUp(rl); @@ -367,7 +366,7 @@ fn setup_control_flow_observers() { ptr::null_mut(), kCFRunLoopAfterWaiting, 1, // repeat = true - CFIndex::min_value(), + CFIndex::MIN, control_flow_begin_handler, ptr::null_mut(), ); @@ -387,7 +386,7 @@ fn setup_control_flow_observers() { ptr::null_mut(), kCFRunLoopExit | kCFRunLoopBeforeWaiting, 1, // repeat = true - CFIndex::max_value(), + CFIndex::MAX, control_flow_end_handler, ptr::null_mut(), ); diff --git a/src/platform_impl/ios/mod.rs b/src/platform_impl/ios/mod.rs index bf2c011f25..f69ac21b79 100644 --- a/src/platform_impl/ios/mod.rs +++ b/src/platform_impl/ios/mod.rs @@ -1,4 +1,3 @@ -#![cfg(ios_platform)] #![allow(clippy::let_unit_value)] mod app_delegate; diff --git a/src/platform_impl/linux/wayland/mod.rs b/src/platform_impl/linux/wayland/mod.rs index 3e5939f6db..674671ff8c 100644 --- a/src/platform_impl/linux/wayland/mod.rs +++ b/src/platform_impl/linux/wayland/mod.rs @@ -1,5 +1,3 @@ -#![cfg(wayland_platform)] - //! Winit's Wayland backend. use std::fmt::Display; diff --git a/src/platform_impl/linux/x11/event_processor.rs b/src/platform_impl/linux/x11/event_processor.rs index 4b233ec692..9c6b95a2ac 100644 --- a/src/platform_impl/linux/x11/event_processor.rs +++ b/src/platform_impl/linux/x11/event_processor.rs @@ -434,7 +434,7 @@ impl EventProcessor { let flags = xev.data.get_long(1); let version = flags >> 24; self.dnd.version = Some(version); - let has_more_types = flags - (flags & (c_long::max_value() - 1)) == 1; + let has_more_types = flags - (flags & (c_long::MAX - 1)) == 1; if !has_more_types { let type_list = vec![ xev.data.get_long(2) as xproto::Atom, diff --git a/src/platform_impl/linux/x11/ime/context.rs b/src/platform_impl/linux/x11/ime/context.rs index 1cc8c355b9..aa046af67b 100644 --- a/src/platform_impl/linux/x11/ime/context.rs +++ b/src/platform_impl/linux/x11/ime/context.rs @@ -158,7 +158,9 @@ struct PreeditCallbacks { impl PreeditCallbacks { pub fn new(client_data: ffi::XPointer) -> PreeditCallbacks { let start_callback = create_xim_callback(client_data, unsafe { - mem::transmute(preedit_start_callback as usize) + mem::transmute::( + preedit_start_callback as usize, + ) }); let done_callback = create_xim_callback(client_data, preedit_done_callback); let caret_callback = create_xim_callback(client_data, preedit_caret_callback); diff --git a/src/platform_impl/linux/x11/mod.rs b/src/platform_impl/linux/x11/mod.rs index e8f263377b..58d48b484e 100644 --- a/src/platform_impl/linux/x11/mod.rs +++ b/src/platform_impl/linux/x11/mod.rs @@ -1,5 +1,3 @@ -#![cfg(x11_platform)] - use std::cell::{Cell, RefCell}; use std::collections::{HashMap, HashSet, VecDeque}; use std::ffi::CStr; diff --git a/src/platform_impl/macos/event_loop.rs b/src/platform_impl/macos/event_loop.rs index b6126764fe..fe405650a8 100644 --- a/src/platform_impl/macos/event_loop.rs +++ b/src/platform_impl/macos/event_loop.rs @@ -492,8 +492,7 @@ impl EventLoopProxy { cancel: None, perform: event_loop_proxy_handler, }; - let source = - CFRunLoopSourceCreate(ptr::null_mut(), CFIndex::max_value() - 1, &mut context); + let source = CFRunLoopSourceCreate(ptr::null_mut(), CFIndex::MAX - 1, &mut context); CFRunLoopAddSource(rl, source, kCFRunLoopCommonModes); CFRunLoopWakeUp(rl); diff --git a/src/platform_impl/macos/observer.rs b/src/platform_impl/macos/observer.rs index 1f960d0a6b..8339803086 100644 --- a/src/platform_impl/macos/observer.rs +++ b/src/platform_impl/macos/observer.rs @@ -214,13 +214,13 @@ pub fn setup_control_flow_observers(mtm: MainThreadMarker, panic_info: Weak) { let dimensions = dimensions.unwrap_or(Size::Logical(LogicalSize { - width: std::f32::MAX as f64, - height: std::f32::MAX as f64, + width: f32::MAX as f64, + height: f32::MAX as f64, })); let scale_factor = self.scale_factor(); let max_size = dimensions.to_logical::(scale_factor); diff --git a/src/platform_impl/orbital/mod.rs b/src/platform_impl/orbital/mod.rs index 91d85c3d16..f210a8ce04 100644 --- a/src/platform_impl/orbital/mod.rs +++ b/src/platform_impl/orbital/mod.rs @@ -103,7 +103,7 @@ pub struct WindowId { impl WindowId { pub const fn dummy() -> Self { - WindowId { fd: u64::max_value() } + WindowId { fd: u64::MAX } } } diff --git a/src/platform_impl/web/async/dispatcher.rs b/src/platform_impl/web/async/dispatcher.rs index 6623572154..10ab345e44 100644 --- a/src/platform_impl/web/async/dispatcher.rs +++ b/src/platform_impl/web/async/dispatcher.rs @@ -68,7 +68,12 @@ impl Dispatcher { // SAFETY: The `transmute` is necessary because `Closure` requires `'static`. This is // safe because this function won't return until `f` has finished executing. See // `Self::new()`. - let closure = Closure(unsafe { std::mem::transmute(closure) }); + let closure = Closure(unsafe { + std::mem::transmute::< + Box, + Box, + >(closure) + }); self.0.send(closure); diff --git a/src/platform_impl/web/event_loop/mod.rs b/src/platform_impl/web/event_loop/mod.rs index 54214a992e..0a6d5052a1 100644 --- a/src/platform_impl/web/event_loop/mod.rs +++ b/src/platform_impl/web/event_loop/mod.rs @@ -42,7 +42,11 @@ impl EventLoop { // SAFETY: The `transmute` is necessary because `run()` requires `'static`. This is safe // because this function will never return and all resources not cleaned up by the point we // `throw` will leak, making this actually `'static`. - let handler = unsafe { std::mem::transmute(handler) }; + let handler = unsafe { + std::mem::transmute::)>, Box) + 'static>>( + handler, + ) + }; self.elw.p.run(handler, false); // Throw an exception to break out of Rust execution and use unreachable to tell the diff --git a/src/platform_impl/windows/mod.rs b/src/platform_impl/windows/mod.rs index bfb18d81cc..15051f0ca3 100644 --- a/src/platform_impl/windows/mod.rs +++ b/src/platform_impl/windows/mod.rs @@ -1,5 +1,3 @@ -#![cfg(windows_platform)] - use smol_str::SmolStr; use windows_sys::Win32::Foundation::{HANDLE, HWND}; use windows_sys::Win32::UI::WindowsAndMessaging::{HMENU, WINDOW_LONG_PTR_INDEX};