leyoda/winit
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Fix clippy issues on stable

Browse source
This commit is contained in:
Kirill Chibisov 2023-01-27 07:18:58 +03:00 • committed by GitHub
parent e1b7fda409
commit 930df0ec45
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
36 changed files with 68 additions and 76 deletions
Download patch file Download diff file Expand all files Collapse all files

6
src/platform_impl/linux/mod.rs
View file

@ -727,8 +727,7 @@ impl<T: 'static> EventLoop<T> {
panic!("wayland feature is not enabled");
}
_ => panic!(
"Unknown environment variable value for {}, try one of `x11`,`wayland`",
BACKEND_PREFERENCE_ENV_VAR,
"Unknown environment variable value for {BACKEND_PREFERENCE_ENV_VAR}, try one of `x11`,`wayland`",
),
}
}
@ -751,8 +750,7 @@ impl<T: 'static> EventLoop<T> {
let x11_err = "backend disabled";
panic!(
"Failed to initialize any backend! Wayland status: {:?} X11 status: {:?}",
wayland_err, x11_err,
"Failed to initialize any backend! Wayland status: {wayland_err:?} X11 status: {x11_err:?}",
);
}

4
src/platform_impl/linux/x11/ime/callbacks.rs
View file

@ -168,7 +168,7 @@ pub unsafe extern "C" fn xim_instantiate_callback(
Err(err) => {
if (*inner).is_destroyed {
// We have no usable input methods!
panic!("Failed to reopen input method: {:?}", err);
panic!("Failed to reopen input method: {err:?}");
}
}
}
@ -195,7 +195,7 @@ pub unsafe extern "C" fn xim_destroy_callback(
Ok(()) => (*inner).is_fallback = true,
Err(err) => {
// We have no usable input methods!
panic!("Failed to open fallback input method: {:?}", err);
panic!("Failed to open fallback input method: {err:?}");
}
}
}

2
src/platform_impl/linux/x11/ime/mod.rs
View file

@ -171,7 +171,7 @@ impl Ime {
if self.is_destroyed() {
return None;
}
if let Some(&Some(ref context)) = self.inner.contexts.get(&window) {
if let Some(Some(context)) = self.inner.contexts.get(&window) {
Some(context.ic)
} else {
None

7
src/platform_impl/linux/x11/mod.rs
View file

@ -175,7 +175,7 @@ impl<T: 'static> EventLoop<T> {
let ime = RefCell::new({
let result = Ime::new(Arc::clone(&xconn), ime_event_sender);
if let Err(ImeCreationError::OpenFailure(ref state)) = result {
panic!("Failed to open input method: {:#?}", state);
panic!("Failed to open input method: {state:#?}");
}
result.expect("Failed to set input method destruction callback")
});
@ -212,8 +212,7 @@ impl<T: 'static> EventLoop<T> {
) != ffi::Success as libc::c_int
{
panic!(
"X server has XInput extension {}.{} but does not support XInput2",
xinput_major_ver, xinput_minor_ver,
"X server has XInput extension {xinput_major_ver}.{xinput_minor_ver} but does not support XInput2",
);
}
}
@ -454,7 +453,7 @@ impl<T: 'static> EventLoop<T> {
// Wait until
if let Err(e) = self.poll.poll(&mut events, iter_result.timeout) {
if e.raw_os_error() != Some(libc::EINTR) {
panic!("epoll returned an error: {:?}", e);
panic!("epoll returned an error: {e:?}");
}
}
events.clear();

6
src/platform_impl/linux/x11/util/randr.rs
View file

@ -117,8 +117,7 @@ impl XConnection {
EnvVarDPI::NotSet
} else {
panic!(
"`WINIT_X11_SCALE_FACTOR` invalid; DPI factors must be either normal floats greater than 0, or `randr`. Got `{}`",
var
"`WINIT_X11_SCALE_FACTOR` invalid; DPI factors must be either normal floats greater than 0, or `randr`. Got `{var}`"
);
}
},
@ -132,8 +131,7 @@ impl XConnection {
EnvVarDPI::Scale(dpi_override) => {
if !validate_scale_factor(dpi_override) {
panic!(
"`WINIT_X11_SCALE_FACTOR` invalid; DPI factors must be either normal floats greater than 0, or `randr`. Got `{}`",
dpi_override,
"`WINIT_X11_SCALE_FACTOR` invalid; DPI factors must be either normal floats greater than 0, or `randr`. Got `{dpi_override}`",
);
}
dpi_override