Fix clippy lints
This commit is contained in:
parent
62fbd056bf
commit
655621fde0
7 changed files with 26 additions and 22 deletions
|
|
@ -80,14 +80,14 @@ impl AppData {
|
|||
for seat in self.seat_state.seats() {
|
||||
self.toplevel_manager_state
|
||||
.manager
|
||||
.activate(&cosmic_toplevel, &seat);
|
||||
.activate(cosmic_toplevel, &seat);
|
||||
}
|
||||
}
|
||||
}
|
||||
Cmd::CloseToplevel(toplevel_handle) => {
|
||||
let info = self.toplevel_info_state.info(&toplevel_handle);
|
||||
if let Some(cosmic_toplevel) = info.and_then(|x| x.cosmic_toplevel.as_ref()) {
|
||||
self.toplevel_manager_state.manager.close(&cosmic_toplevel);
|
||||
self.toplevel_manager_state.manager.close(cosmic_toplevel);
|
||||
}
|
||||
}
|
||||
Cmd::MoveToplevelToWorkspace(toplevel_handle, workspace_handle, output) => {
|
||||
|
|
@ -95,7 +95,7 @@ impl AppData {
|
|||
if let Some(cosmic_toplevel) = info.and_then(|x| x.cosmic_toplevel.as_ref()) {
|
||||
if self.toplevel_manager_state.manager.version() >= 2 {
|
||||
self.toplevel_manager_state.manager.move_to_ext_workspace(
|
||||
&cosmic_toplevel,
|
||||
cosmic_toplevel,
|
||||
&workspace_handle,
|
||||
&output,
|
||||
);
|
||||
|
|
@ -132,7 +132,7 @@ impl AppData {
|
|||
.workspace_state
|
||||
.workspace_groups()
|
||||
.find(|g| g.workspaces.iter().any(|w| w == workspace))
|
||||
.map_or(false, |group| {
|
||||
.is_some_and(|group| {
|
||||
self.capture_filter
|
||||
.workspaces_on_outputs
|
||||
.iter()
|
||||
|
|
|
|||
|
|
@ -70,7 +70,7 @@ impl ScreencopySession {
|
|||
qh,
|
||||
FrameData {
|
||||
frame_data: Default::default(),
|
||||
capture: Arc::downgrade(&capture),
|
||||
capture: Arc::downgrade(capture),
|
||||
},
|
||||
);
|
||||
conn.flush().unwrap();
|
||||
|
|
|
|||
|
|
@ -23,11 +23,11 @@ use crate::{
|
|||
App, LayerSurface, Msg, Toplevel, Workspace,
|
||||
};
|
||||
|
||||
fn dnd_destination_for_target<'a, T>(
|
||||
fn dnd_destination_for_target<T>(
|
||||
target: DropTarget,
|
||||
child: cosmic::Element<'a, Msg>,
|
||||
child: cosmic::Element<'_, Msg>,
|
||||
on_finish: impl Fn(T) -> Msg + 'static,
|
||||
) -> cosmic::Element<'a, Msg>
|
||||
) -> cosmic::Element<'_, Msg>
|
||||
where
|
||||
T: AllowedMimeTypes,
|
||||
{
|
||||
|
|
@ -74,7 +74,7 @@ pub(crate) fn layer_surface<'a>(
|
|||
|
||||
i.info.workspace.iter().any(|workspace| {
|
||||
app.workspace_for_handle(workspace)
|
||||
.map_or(false, |x| x.is_active())
|
||||
.is_some_and(|x| x.is_active())
|
||||
})
|
||||
}),
|
||||
layout,
|
||||
|
|
@ -143,8 +143,8 @@ fn workspace_item_appearance(
|
|||
appearance
|
||||
}
|
||||
|
||||
fn workspace_item<'a>(
|
||||
workspace: &'a Workspace,
|
||||
fn workspace_item(
|
||||
workspace: &Workspace,
|
||||
_output: &wl_output::WlOutput,
|
||||
layout: WorkspaceLayout,
|
||||
is_drop_target: bool,
|
||||
|
|
@ -376,10 +376,10 @@ fn toplevel_preview(toplevel: &Toplevel, is_being_dragged: bool) -> cosmic::Elem
|
|||
.into()
|
||||
}
|
||||
|
||||
fn toplevel_previews_entry<'a>(
|
||||
toplevel: &'a Toplevel,
|
||||
fn toplevel_previews_entry(
|
||||
toplevel: &Toplevel,
|
||||
is_being_dragged: bool,
|
||||
) -> cosmic::Element<'a, Msg> {
|
||||
) -> cosmic::Element<'_, Msg> {
|
||||
// Dragged window still takes up space until moved, but isn't rendered while drag surface is
|
||||
// shown.
|
||||
let preview = crate::widgets::visibility_wrapper(
|
||||
|
|
|
|||
|
|
@ -87,7 +87,7 @@ impl<T: AxisToplevelLayout> ToplevelLayout for T {
|
|||
) -> impl Iterator<Item = Rectangle> {
|
||||
let max_limit = AxisSize::unpack(self.axis(), max_limit);
|
||||
let toplevels = toplevels
|
||||
.into_iter()
|
||||
.iter()
|
||||
.map(|t| LayoutToplevel {
|
||||
preferred_size: AxisSize::unpack(self.axis(), t.preferred_size),
|
||||
_phantom_data: PhantomData,
|
||||
|
|
@ -95,8 +95,11 @@ impl<T: AxisToplevelLayout> ToplevelLayout for T {
|
|||
.collect::<Vec<_>>();
|
||||
let toplevels = AliasableVec::from_unique(toplevels);
|
||||
// Extend lifetime
|
||||
let toplevels_slice =
|
||||
unsafe { std::mem::transmute::<_, &'a [LayoutToplevel<'a, AxisSize>]>(&*toplevels) };
|
||||
let toplevels_slice = unsafe {
|
||||
std::mem::transmute::<&[LayoutToplevel<'_, AxisSize>], &'a [LayoutToplevel<'a, AxisSize>]>(
|
||||
&*toplevels,
|
||||
)
|
||||
};
|
||||
let inner = self
|
||||
.layout(max_limit, toplevels_slice)
|
||||
.map(|rect| rect.pack(self.axis()));
|
||||
|
|
@ -113,7 +116,7 @@ struct AxisLayoutIterator<'a, I: Iterator<Item = Rectangle>> {
|
|||
_toplevels: AliasableVec<LayoutToplevel<'a, AxisSize>>,
|
||||
}
|
||||
|
||||
impl<'a, I: Iterator<Item = Rectangle>> Iterator for AxisLayoutIterator<'a, I> {
|
||||
impl<I: Iterator<Item = Rectangle>> Iterator for AxisLayoutIterator<'_, I> {
|
||||
type Item = Rectangle;
|
||||
|
||||
fn next(&mut self) -> Option<Rectangle> {
|
||||
|
|
|
|||
|
|
@ -6,6 +6,7 @@ use std::marker::PhantomData;
|
|||
|
||||
mod axis_toplevel_layout;
|
||||
mod row_col_toplevel_layout;
|
||||
#[allow(unused_imports)]
|
||||
pub(crate) use row_col_toplevel_layout::RowColToplevelLayout;
|
||||
mod two_row_col_toplevel_layout;
|
||||
pub(crate) use two_row_col_toplevel_layout::TwoRowColToplevelLayout;
|
||||
|
|
|
|||
|
|
@ -57,7 +57,7 @@ impl AxisToplevelLayout for RowColToplevelLayout {
|
|||
max_limit: AxisSize,
|
||||
toplevels: &[LayoutToplevel<'_, AxisSize>],
|
||||
) -> impl Iterator<Item = AxisRectangle> {
|
||||
let requested_main_total = self.requested_main_total(&toplevels);
|
||||
let requested_main_total = self.requested_main_total(toplevels);
|
||||
let scale_factor = self.scale_factor(max_limit, toplevels);
|
||||
|
||||
// Add padding to center if total requested size doesn't fill available space
|
||||
|
|
@ -65,7 +65,7 @@ impl AxisToplevelLayout for RowColToplevelLayout {
|
|||
|
||||
let mut total_main = padding;
|
||||
let mut first = true;
|
||||
toplevels.into_iter().map(move |child| {
|
||||
toplevels.iter().map(move |child| {
|
||||
if !first {
|
||||
total_main += self.spacing as f32;
|
||||
}
|
||||
|
|
|
|||
|
|
@ -1,7 +1,7 @@
|
|||
use cosmic::iced::{advanced::layout::flex::Axis, Length};
|
||||
|
||||
use super::{
|
||||
axis_toplevel_layout::{AxisPoint, AxisRectangle, AxisSize, AxisToplevelLayout},
|
||||
axis_toplevel_layout::{AxisRectangle, AxisSize, AxisToplevelLayout},
|
||||
row_col_toplevel_layout::RowColToplevelLayout,
|
||||
LayoutToplevel,
|
||||
};
|
||||
|
|
@ -31,7 +31,7 @@ impl AxisToplevelLayout for TwoRowColToplevelLayout {
|
|||
max_limit: AxisSize,
|
||||
toplevels: &[LayoutToplevel<'_, AxisSize>],
|
||||
) -> impl Iterator<Item = AxisRectangle> {
|
||||
let requested_main_total = self.0.requested_main_total(&toplevels);
|
||||
let requested_main_total = self.0.requested_main_total(toplevels);
|
||||
let scale_factor = self.0.scale_factor(max_limit, toplevels);
|
||||
|
||||
let half_max_limit = AxisSize {
|
||||
|
|
|
|||
Loading…
Add table
Add a link
Reference in a new issue