From 6f93b8774d76c6d0c7fcebd1676d42b076a8b055 Mon Sep 17 00:00:00 2001 From: Ashley Wulber Date: Thu, 25 Sep 2025 11:47:53 -0400 Subject: [PATCH] cleanup use statements --- src/shell/grabs/moving.rs | 10 +--------- src/shell/layout/floating/mod.rs | 11 +---------- src/shell/layout/tiling/mod.rs | 7 ++----- 3 files changed, 4 insertions(+), 24 deletions(-) diff --git a/src/shell/grabs/moving.rs b/src/shell/grabs/moving.rs index d26fd03e..0e742fc0 100644 --- a/src/shell/grabs/moving.rs +++ b/src/shell/grabs/moving.rs @@ -14,19 +14,11 @@ use crate::{ CosmicMapped, CosmicSurface, Direction, ManagedLayer, }, utils::prelude::*, - wayland::protocols::{ - corner_radius::CornerRadiusData, - toplevel_info::{toplevel_enter_output, toplevel_enter_workspace}, - }, -}; -use smithay::{ - reexports::wayland_server::{Resource, Weak}, - wayland::{compositor::with_states, seat::WaylandFocus}, + wayland::protocols::toplevel_info::{toplevel_enter_output, toplevel_enter_workspace}, }; use calloop::LoopHandle; use cosmic::theme::CosmicTheme; -use cosmic_protocols::corner_radius::v1::server::cosmic_corner_radius_toplevel_v1::CosmicCornerRadiusToplevelV1; use smithay::{ backend::{ input::ButtonState, diff --git a/src/shell/layout/floating/mod.rs b/src/shell/layout/floating/mod.rs index cedbf6e9..6a29628c 100644 --- a/src/shell/layout/floating/mod.rs +++ b/src/shell/layout/floating/mod.rs @@ -1,20 +1,11 @@ // SPDX-License-Identifier: GPL-3.0-only -use crate::wayland::protocols::corner_radius::CornerRadiusData; -use smithay::{ - reexports::wayland_server::{Resource, Weak}, - wayland::compositor::with_states, -}; use std::{ collections::{HashMap, VecDeque}, - sync::{ - atomic::{AtomicBool, Ordering}, - Mutex, - }, + sync::atomic::{AtomicBool, Ordering}, time::{Duration, Instant}, }; -use cosmic_protocols::corner_radius::v1::server::cosmic_corner_radius_toplevel_v1::CosmicCornerRadiusToplevelV1; use cosmic_settings_config::shortcuts::action::ResizeDirection; use keyframe::{ease, functions::EaseInOutCubic}; use smithay::{ diff --git a/src/shell/layout/tiling/mod.rs b/src/shell/layout/tiling/mod.rs index 1f4b241b..6cbbdd8e 100644 --- a/src/shell/layout/tiling/mod.rs +++ b/src/shell/layout/tiling/mod.rs @@ -29,7 +29,6 @@ use crate::{ wayland::{ handlers::xdg_shell::popup::get_popup_toplevel, protocols::{ - corner_radius::CornerRadiusData, toplevel_info::{ toplevel_enter_output, toplevel_enter_workspace, toplevel_leave_output, toplevel_leave_workspace, @@ -38,9 +37,7 @@ use crate::{ }, }, }; -use smithay::{reexports::wayland_server::Resource, wayland::compositor::with_states}; -use cosmic_protocols::corner_radius::v1::server::cosmic_corner_radius_toplevel_v1::CosmicCornerRadiusToplevelV1; use cosmic_settings_config::shortcuts::action::{FocusDirection, ResizeDirection}; use id_tree::{InsertBehavior, MoveBehavior, Node, NodeId, NodeIdError, RemoveBehavior, Tree}; use keyframe::{ @@ -62,13 +59,13 @@ use smithay::{ desktop::{layer_map_for_output, space::SpaceElement, PopupKind, WindowSurfaceType}, input::Seat, output::Output, - reexports::wayland_server::{Client, Weak as WsWeak}, + reexports::wayland_server::Client, utils::{IsAlive, Logical, Physical, Point, Rectangle, Scale, Size}, wayland::{compositor::add_blocker, seat::WaylandFocus}, }; use std::{ collections::{HashMap, VecDeque}, - sync::{Arc, Mutex, Weak}, + sync::{Arc, Weak}, time::{Duration, Instant}, }; use tracing::trace;