style: simplify string formatting for readability (#4001)

This commit is contained in:
Hamir Mahal 2024-11-22 13:14:11 -08:00 committed by GitHub
parent dbcdb6f1b4
commit fc6cf89ac0
No known key found for this signature in database
GPG key ID: B5690EEEBB952194
7 changed files with 18 additions and 17 deletions

View file

@ -1303,7 +1303,7 @@ mod tests {
#[test] #[test]
fn ensure_attrs_do_not_panic() { fn ensure_attrs_do_not_panic() {
foreach_event!(|event: event::Event| { foreach_event!(|event: event::Event| {
let _ = format!("{:?}", event); let _ = format!("{event:?}");
}); });
let _ = event::StartCause::Init.clone(); let _ = event::StartCause::Init.clone();

View file

@ -277,6 +277,7 @@
// doc // doc
#![cfg_attr(docsrs, feature(doc_auto_cfg, doc_cfg_hide), doc(cfg_hide(doc, docsrs)))] #![cfg_attr(docsrs, feature(doc_auto_cfg, doc_cfg_hide), doc(cfg_hide(doc, docsrs)))]
#![allow(clippy::missing_safety_doc)] #![allow(clippy::missing_safety_doc)]
#![warn(clippy::uninlined_format_args)]
// Re-export DPI types so that users don't have to put it in Cargo.toml. // Re-export DPI types so that users don't have to put it in Cargo.toml.
#[doc(inline)] #[doc(inline)]

View file

@ -189,7 +189,7 @@ declare_class!(
// Pass -delta so that action is reversed // Pass -delta so that action is reversed
(TouchPhase::Cancelled, -recognizer.scale()) (TouchPhase::Cancelled, -recognizer.scale())
} }
state => panic!("unexpected recognizer state: {:?}", state), state => panic!("unexpected recognizer state: {state:?}"),
}; };
let gesture_event = EventWrapper::StaticEvent(Event::WindowEvent { let gesture_event = EventWrapper::StaticEvent(Event::WindowEvent {
@ -248,7 +248,7 @@ declare_class!(
// Pass -delta so that action is reversed // Pass -delta so that action is reversed
(TouchPhase::Cancelled, -recognizer.rotation()) (TouchPhase::Cancelled, -recognizer.rotation())
} }
state => panic!("unexpected recognizer state: {:?}", state), state => panic!("unexpected recognizer state: {state:?}"),
}; };
// Make delta negative to match macos, convert to degrees // Make delta negative to match macos, convert to degrees
@ -299,7 +299,7 @@ declare_class!(
// Pass -delta so that action is reversed // Pass -delta so that action is reversed
(TouchPhase::Cancelled, -last_pan.x, -last_pan.y) (TouchPhase::Cancelled, -last_pan.x, -last_pan.y)
} }
state => panic!("unexpected recognizer state: {:?}", state), state => panic!("unexpected recognizer state: {state:?}"),
}; };

View file

@ -172,7 +172,7 @@ fn push_display(buffer: &mut Vec<u8>, display: &impl std::fmt::Display) {
} }
} }
write!(Writer { buffer }, "{}", display).unwrap(); write!(Writer { buffer }, "{display}").unwrap();
} }
#[cfg(test)] #[cfg(test)]

View file

@ -843,24 +843,24 @@ pub enum X11Error {
impl fmt::Display for X11Error { impl fmt::Display for X11Error {
fn fmt(&self, f: &mut fmt::Formatter<'_>) -> fmt::Result { fn fmt(&self, f: &mut fmt::Formatter<'_>) -> fmt::Result {
match self { match self {
X11Error::Xlib(e) => write!(f, "Xlib error: {}", e), X11Error::Xlib(e) => write!(f, "Xlib error: {e}"),
X11Error::Connect(e) => write!(f, "X11 connection error: {}", e), X11Error::Connect(e) => write!(f, "X11 connection error: {e}"),
X11Error::Connection(e) => write!(f, "X11 connection error: {}", e), X11Error::Connection(e) => write!(f, "X11 connection error: {e}"),
X11Error::XidsExhausted(e) => write!(f, "XID range exhausted: {}", e), X11Error::XidsExhausted(e) => write!(f, "XID range exhausted: {e}"),
X11Error::GetProperty(e) => write!(f, "Failed to get X property {}", e), X11Error::GetProperty(e) => write!(f, "Failed to get X property {e}"),
X11Error::X11(e) => write!(f, "X11 error: {:?}", e), X11Error::X11(e) => write!(f, "X11 error: {e:?}"),
X11Error::UnexpectedNull(s) => write!(f, "Xlib function returned null: {}", s), X11Error::UnexpectedNull(s) => write!(f, "Xlib function returned null: {s}"),
X11Error::InvalidActivationToken(s) => write!( X11Error::InvalidActivationToken(s) => write!(
f, f,
"Invalid activation token: {}", "Invalid activation token: {}",
std::str::from_utf8(s).unwrap_or("<invalid utf8>") std::str::from_utf8(s).unwrap_or("<invalid utf8>")
), ),
X11Error::MissingExtension(s) => write!(f, "Missing X11 extension: {}", s), X11Error::MissingExtension(s) => write!(f, "Missing X11 extension: {s}"),
X11Error::NoSuchVisual(visualid) => { X11Error::NoSuchVisual(visualid) => {
write!(f, "Could not find a matching X11 visual for ID `{:x}`", visualid) write!(f, "Could not find a matching X11 visual for ID `{visualid:x}`")
}, },
X11Error::XsettingsParse(err) => { X11Error::XsettingsParse(err) => {
write!(f, "Failed to parse xsettings: {:?}", err) write!(f, "Failed to parse xsettings: {err:?}")
}, },
X11Error::NoArgb32Format => { X11Error::NoArgb32Format => {
f.write_str("winit only supports X11 displays with ARGB32 picture formats") f.write_str("winit only supports X11 displays with ARGB32 picture formats")

View file

@ -164,7 +164,7 @@ impl XConnection {
fn new_xsettings_screen(xcb: &XCBConnection, default_screen: usize) -> Option<xproto::Atom> { fn new_xsettings_screen(xcb: &XCBConnection, default_screen: usize) -> Option<xproto::Atom> {
// Fetch the _XSETTINGS_S[screen number] atom. // Fetch the _XSETTINGS_S[screen number] atom.
let xsettings_screen = xcb let xsettings_screen = xcb
.intern_atom(false, format!("_XSETTINGS_S{}", default_screen).as_bytes()) .intern_atom(false, format!("_XSETTINGS_S{default_screen}").as_bytes())
.ok()? .ok()?
.reply() .reply()
.ok()? .ok()?

View file

@ -414,7 +414,7 @@ impl CoreWindow for Window {
window::ResizeDirection::West => "L", window::ResizeDirection::West => "L",
}; };
self.window_socket self.window_socket
.write(format!("D,{}", arg).as_bytes()) .write(format!("D,{arg}").as_bytes())
.map_err(|err| os_error!(format!("{err}")))?; .map_err(|err| os_error!(format!("{err}")))?;
Ok(()) Ok(())
} }