style: fix 1.67 clippy warnings

This commit is contained in:
Jake Stanger
2023-01-28 14:40:31 +00:00
parent 90cd078973
commit eb30105fc2
6 changed files with 19 additions and 24 deletions

View File

@@ -18,9 +18,9 @@ impl Display for Compositor {
f,
"{}",
match self {
Compositor::Sway => "Sway",
Compositor::Hyprland => "Hyprland",
Compositor::Unsupported => "Unsupported",
Self::Sway => "Sway",
Self::Hyprland => "Hyprland",
Self::Unsupported => "Unsupported",
}
)
}
@@ -44,9 +44,9 @@ impl Compositor {
let current = Self::get_current();
debug!("Getting workspace client for: {current}");
match current {
Compositor::Sway => Ok(sway::get_sub_client()),
Compositor::Hyprland => Ok(hyprland::get_client()),
Compositor::Unsupported => Err(Report::msg("Unsupported compositor")
Self::Sway => Ok(sway::get_sub_client()),
Self::Hyprland => Ok(hyprland::get_client()),
Self::Unsupported => Err(Report::msg("Unsupported compositor")
.note("Currently workspaces are only supported by Sway and Hyprland")),
}
}

View File

@@ -58,7 +58,7 @@ impl GlobalHandler<ZwlrForeignToplevelManagerV1> for ToplevelHandler {
if inner.registry.is_none() {
inner.registry = Some(registry);
}
if let LazyGlobal::Unknown = inner.manager {
if matches!(inner.manager, LazyGlobal::Unknown) {
inner.manager = LazyGlobal::Seen { id, version }
} else {
warn!(