diff --git a/src/cli/input.rs b/src/cli/input.rs index 97222237..aaf75aa5 100644 --- a/src/cli/input.rs +++ b/src/cli/input.rs @@ -749,10 +749,7 @@ impl Input { println!("{prefix}{}:", device.id); println!("{prefix} name: {}", device.name); if print_seat { - let seat = match device.seat.as_deref() { - Some(s) => s, - _ => "", - }; + let seat = device.seat.as_deref().unwrap_or(""); println!("{prefix} seat: {}", seat); } if let Some(v) = &device.syspath { diff --git a/src/clientmem.rs b/src/clientmem.rs index 47a2900e..ab814d92 100644 --- a/src/clientmem.rs +++ b/src/clientmem.rs @@ -117,7 +117,7 @@ impl ClientMem { } pub fn len(&self) -> usize { - unsafe { (*self.data).len() } + self.data.len() } pub fn offset(self: &Rc, offset: usize) -> ClientMemOffset { diff --git a/toml-config/src/config.rs b/toml-config/src/config.rs index 1a5537ea..7896ddd2 100644 --- a/toml-config/src/config.rs +++ b/toml-config/src/config.rs @@ -304,7 +304,7 @@ impl Display for Mode { fn fmt(&self, f: &mut Formatter<'_>) -> std::fmt::Result { write!(f, "{} x {}", self.width, self.height)?; if let Some(rr) = self.refresh_rate { - write!(f, " @ {}", rr)?; + write!(f, " @ {rr}")?; } Ok(()) } diff --git a/toml-config/src/config/error.rs b/toml-config/src/config/error.rs index 12102ddc..4c615179 100644 --- a/toml-config/src/config/error.rs +++ b/toml-config/src/config/error.rs @@ -34,12 +34,12 @@ impl Display for SpannedError<'_, E> { if let Some(cause) = &self.cause { write!(f, "{}: ", Report::new(cause))?; } - writeln!(f, "At line {}, column {}:", line_num, col_num)?; + writeln!(f, "At line {line_num}, column {col_num}:")?; for _ in 0..=gutter { write!(f, " ")?; } writeln!(f, "|")?; - write!(f, "{} | ", line_num)?; + write!(f, "{line_num} | ")?; writeln!(f, "{}", content.as_bstr())?; for _ in 0..=gutter { write!(f, " ")?; diff --git a/toml-config/src/toml/toml_parser.rs b/toml-config/src/toml/toml_parser.rs index cd5d387b..32966ecc 100644 --- a/toml-config/src/toml/toml_parser.rs +++ b/toml-config/src/toml/toml_parser.rs @@ -184,7 +184,7 @@ impl<'a> Parser<'a, '_> { if let Ok(n) = u32::from_str_radix(s, 16) { if let Some(c) = char::from_u32(n) { pos += len; - let _ = write!(res, "{}", c); + let _ = write!(res, "{c}"); break 'unicode; } }