From ca9c05368e76f70a06cdc34b864711584e5744c2 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Markus=20R=C3=B8yset?= Date: Tue, 30 Mar 2021 21:27:32 +0200 Subject: [PATCH] Fix CI warnings (#1898) * Fix CI warnings * Use the panic! macro rather than format! + panic_any --- src/platform/windows.rs | 2 +- src/platform_impl/android/mod.rs | 1 + src/platform_impl/linux/mod.rs | 3 +-- src/platform_impl/linux/x11/mod.rs | 2 +- src/platform_impl/linux/x11/util/atom.rs | 3 +-- src/platform_impl/web/stdweb/canvas.rs | 1 + src/platform_impl/web/web_sys/canvas.rs | 1 + src/platform_impl/web/web_sys/canvas/mouse_handler.rs | 1 + src/platform_impl/web/web_sys/canvas/pointer_handler.rs | 1 + 9 files changed, 9 insertions(+), 6 deletions(-) diff --git a/src/platform/windows.rs b/src/platform/windows.rs index dd58d758..f2752aa0 100644 --- a/src/platform/windows.rs +++ b/src/platform/windows.rs @@ -133,7 +133,7 @@ pub trait WindowBuilderExtWindows { /// `COINIT_APARTMENTTHREADED`) on the same thread. Note that winit may still attempt to initialize /// COM API regardless of this option. Currently only fullscreen mode does that, but there may be more in the future. /// If you need COM API with `COINIT_MULTITHREADED` you must initialize it before calling any winit functions. - /// See https://docs.microsoft.com/en-us/windows/win32/api/objbase/nf-objbase-coinitialize#remarks for more information. + /// See for more information. fn with_drag_and_drop(self, flag: bool) -> WindowBuilder; /// Forces a theme or uses the system settings if `None` was provided. diff --git a/src/platform_impl/android/mod.rs b/src/platform_impl/android/mod.rs index 543bca1b..4dc3bb4a 100644 --- a/src/platform_impl/android/mod.rs +++ b/src/platform_impl/android/mod.rs @@ -245,6 +245,7 @@ impl EventLoop { KeyAction::Up => event::ElementState::Released, _ => event::ElementState::Released, }; + #[allow(deprecated)] let event = event::Event::WindowEvent { window_id, event: event::WindowEvent::KeyboardInput { diff --git a/src/platform_impl/linux/mod.rs b/src/platform_impl/linux/mod.rs index 480fc8af..3bf2b047 100644 --- a/src/platform_impl/linux/mod.rs +++ b/src/platform_impl/linux/mod.rs @@ -609,11 +609,10 @@ impl EventLoop { #[cfg(not(feature = "x11"))] let x11_err = "backend disabled"; - let err_string = format!( + panic!( "Failed to initialize any backend! Wayland status: {:?} X11 status: {:?}", wayland_err, x11_err, ); - panic!(err_string); } #[cfg(feature = "wayland")] diff --git a/src/platform_impl/linux/x11/mod.rs b/src/platform_impl/linux/x11/mod.rs index 11b5d9ec..a784e8b2 100644 --- a/src/platform_impl/linux/x11/mod.rs +++ b/src/platform_impl/linux/x11/mod.rs @@ -135,7 +135,7 @@ impl EventLoop { let ime = RefCell::new({ let result = Ime::new(Arc::clone(&xconn)); if let Err(ImeCreationError::OpenFailure(ref state)) = result { - panic!(format!("Failed to open input method: {:#?}", state)); + panic!("Failed to open input method: {:#?}", state); } result.expect("Failed to set input method destruction callback") }); diff --git a/src/platform_impl/linux/x11/util/atom.rs b/src/platform_impl/linux/x11/util/atom.rs index c311c5d2..41387224 100644 --- a/src/platform_impl/linux/x11/util/atom.rs +++ b/src/platform_impl/linux/x11/util/atom.rs @@ -27,12 +27,11 @@ impl XConnection { (self.xlib.XInternAtom)(self.display, name.as_ptr() as *const c_char, ffi::False) }; if atom == 0 { - let msg = format!( + panic!( "`XInternAtom` failed, which really shouldn't happen. Atom: {:?}, Error: {:#?}", name, self.check_errors(), ); - panic!(msg); } /*println!( "XInternAtom name:{:?} atom:{:?}", diff --git a/src/platform_impl/web/stdweb/canvas.rs b/src/platform_impl/web/stdweb/canvas.rs index 5bc8991f..cea976e2 100644 --- a/src/platform_impl/web/stdweb/canvas.rs +++ b/src/platform_impl/web/stdweb/canvas.rs @@ -17,6 +17,7 @@ use stdweb::web::event::{ use stdweb::web::html_element::CanvasElement; use stdweb::web::{document, EventListenerHandle, IElement, IEventTarget, IHtmlElement}; +#[allow(dead_code)] pub struct Canvas { /// Note: resizing the CanvasElement should go through `backend::set_canvas_size` to ensure the DPI factor is maintained. raw: CanvasElement, diff --git a/src/platform_impl/web/web_sys/canvas.rs b/src/platform_impl/web/web_sys/canvas.rs index 8013e7b1..9725e8b6 100644 --- a/src/platform_impl/web/web_sys/canvas.rs +++ b/src/platform_impl/web/web_sys/canvas.rs @@ -18,6 +18,7 @@ use web_sys::{ mod mouse_handler; mod pointer_handler; +#[allow(dead_code)] pub struct Canvas { common: Common, on_focus: Option>, diff --git a/src/platform_impl/web/web_sys/canvas/mouse_handler.rs b/src/platform_impl/web/web_sys/canvas/mouse_handler.rs index 65450980..81e2aead 100644 --- a/src/platform_impl/web/web_sys/canvas/mouse_handler.rs +++ b/src/platform_impl/web/web_sys/canvas/mouse_handler.rs @@ -8,6 +8,7 @@ use std::rc::Rc; use web_sys::{EventTarget, MouseEvent}; +#[allow(dead_code)] pub(super) struct MouseHandler { on_mouse_leave: Option>, on_mouse_enter: Option>, diff --git a/src/platform_impl/web/web_sys/canvas/pointer_handler.rs b/src/platform_impl/web/web_sys/canvas/pointer_handler.rs index 046732f7..5f6f3210 100644 --- a/src/platform_impl/web/web_sys/canvas/pointer_handler.rs +++ b/src/platform_impl/web/web_sys/canvas/pointer_handler.rs @@ -5,6 +5,7 @@ use crate::event::{ModifiersState, MouseButton}; use web_sys::PointerEvent; +#[allow(dead_code)] pub(super) struct PointerHandler { on_cursor_leave: Option>, on_cursor_enter: Option>,