leyoda/cosmic-workspaces
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Fix clippy lints

Browse source
This commit is contained in:
Ian Douglas Scott 2025-04-21 11:32:07 -07:00
parent 62fbd056bf
commit 655621fde0
7 changed files with 26 additions and 22 deletions
Download patch file Download diff file Expand all files Collapse all files

11
src/widgets/toplevels/toplevel_layout/axis_toplevel_layout.rs
View file

@ -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> {

1
src/widgets/toplevels/toplevel_layout/mod.rs
View file

@ -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;

4
src/widgets/toplevels/toplevel_layout/row_col_toplevel_layout.rs
View file

@ -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;
}

4
src/widgets/toplevels/toplevel_layout/two_row_col_toplevel_layout.rs
View file

@ -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 {