some style and code improvements

- `is_some_and` => == `Some()`
- force a statement onto a single line using `()`
- combine two separate imports from smithay to one
- import `input` from the smithay reexports, so i don't get a version
conflict

Author: m4rch3n1ng

mayland-config/src/input.rs

@@ -2,8 +2,10 @@ use serde::{
 	Deserialize,
 	de::{VariantAccess, Visitor},
 };
-use smithay::input::keyboard::XkbConfig;
-use smithay::reexports::input::{AccelProfile, ClickMethod, ScrollMethod, TapButtonMap};
+use smithay::{
+	input::keyboard::XkbConfig,
+	reexports::input::{AccelProfile, ClickMethod, ScrollMethod, TapButtonMap},
+};
 
 #[derive(Debug, Default, PartialEq, Eq)]
 pub struct Input {

mayland-config/src/windowrules.rs

@@ -61,9 +61,7 @@ impl<'v> Visitor<'v> for WindowRulesVis {
 
 impl WindowRules {
 	pub fn compute(&self, app_id: Option<&str>, title: Option<&str>) -> WindowRule {
-		self.0
-			.iter()
-			.rev()
+		(self.0.iter().rev())
 			.filter_map(|(matcher, rule)| matcher.r#match(app_id, title).then_some(rule))
 			.fold(WindowRule::default(), |acc, cur| WindowRule {
 				floating: acc.floating.or(cur.floating),

src/input.rs

@@ -7,7 +7,6 @@ use crate::{
 	state::State,
 	utils::{RectExt, spawn},
 };
-use input as libinput;
 use mayland_config::{Action, input::TabletMapping};
 use smithay::{
 	backend::input::{
@@ -25,7 +24,10 @@ use smithay::{
 		pointer::{AxisFrame, ButtonEvent, MotionEvent, RelativeMotionEvent},
 	},
 	output::Output,
-	reexports::wayland_server::protocol::{wl_pointer, wl_surface::WlSurface},
+	reexports::{
+		input as libinput,
+		wayland_server::protocol::{wl_pointer, wl_surface::WlSurface},
+	},
 	utils::{Logical, Point, SERIAL_COUNTER, Serial},
 	wayland::{
 		input_method::InputMethodSeat,

src/layout/workspace.rs

@@ -456,7 +456,7 @@ impl Workspace {
 	}
 
 	fn remove_output(&mut self, output: &Output) {
-		debug_assert!(self.output.as_ref().is_some_and(|wo| wo == output));
+		debug_assert!(self.output.as_ref() == Some(output));
 		self.output = None;
 	}