From a2a04512edfb3a64977fb21a84ed35530edd65ef Mon Sep 17 00:00:00 2001 From: Julian Orth Date: Sun, 22 Oct 2023 16:01:40 +0200 Subject: [PATCH] all: address clippy lints --- src/ifs/wl_seat.rs | 2 +- src/logind.rs | 6 +++--- src/tree/container.rs | 1 - src/video/drm/sys.rs | 2 +- 4 files changed, 5 insertions(+), 6 deletions(-) diff --git a/src/ifs/wl_seat.rs b/src/ifs/wl_seat.rs index 04aab5b0..a0e04b53 100644 --- a/src/ifs/wl_seat.rs +++ b/src/ifs/wl_seat.rs @@ -887,7 +887,7 @@ impl WlSeatGlobal { } { let mut bindings = self.bindings.borrow_mut(); - let bindings = bindings.entry(client.id).or_insert_with(Default::default); + let bindings = bindings.entry(client.id).or_default(); bindings.insert(id, obj.clone()); } Ok(()) diff --git a/src/logind.rs b/src/logind.rs index aa2e796b..5e73f11c 100644 --- a/src/logind.rs +++ b/src/logind.rs @@ -110,7 +110,7 @@ impl Session { LOGIND_NAME, &self.session_path, org::freedesktop::login1::session::TakeDevice { major, minor }, - move |r| f(r), + f, ); } @@ -122,7 +122,7 @@ impl Session { .handle_signal::( Some(LOGIND_NAME), Some(&self.session_path), - move |v| f(v), + f, ) } @@ -154,7 +154,7 @@ impl Session { LOGIND_NAME, &self.seat, org::freedesktop::login1::seat::SwitchTo { vtnr }, - |r| f(r), + f, ); } } diff --git a/src/tree/container.rs b/src/tree/container.rs index b2a9ebd4..3e930bb0 100644 --- a/src/tree/container.rs +++ b/src/tree/container.rs @@ -736,7 +736,6 @@ impl ContainerNode { child.node.tl_set_visible(true); // log::info!("activate_child2"); self.schedule_layout(); - } else { } } diff --git a/src/video/drm/sys.rs b/src/video/drm/sys.rs index 7acbcb92..35c4dd03 100644 --- a/src/video/drm/sys.rs +++ b/src/video/drm/sys.rs @@ -814,7 +814,7 @@ pub fn mode_getconnector( modes: modes.into_iter().map(|m| m.into()).collect(), props: props .into_iter() - .zip(prop_values.into_iter()) + .zip(prop_values) .map(|(id, value)| DrmPropertyValue { id: DrmProperty(id), value,