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

yoda: cargo fix sweep post-rebase + iced submodule sweep bump

Browse source 
Leyoda 2026 – GPLv3
This commit is contained in:
Lionel DARNIS 2026-07-02 19:11:38 +02:00
parent 9e9ae942c4
commit 2fe2d35286
22 changed files with 53 additions and 58 deletions
Download patch file Download diff file Expand all files Collapse all files

2
iced

@ -1 +1 @@
Subproject commit 362b4abb1558374686080db674b8f7c5868ae6ac
Subproject commit 1a57634add6e820c299f1c59664cd98098a9c348

6
src/app/cosmic.rs
View file

@ -158,7 +158,7 @@ where
#[cfg(feature = "surface-message")]
match _surface_message {
#[cfg(all(feature = "wayland", target_os = "linux"))]
crate::surface::Action::AppSubsurface(settings, live_settings, view) => {
crate::surface::Action::AppSubsurface(settings, _live_settings, view) => {
let Some(settings) = std::sync::Arc::try_unwrap(settings)
.ok()
.and_then(|s| s.downcast::<Box<dyn Fn(&mut T) -> iced_runtime::platform_specific::wayland::subsurface::SctkSubsurfaceSettings + Send + Sync>>().ok()) else {
@ -185,7 +185,7 @@ where
self.get_subsurface(settings, view.map(|v| *v))
}
#[cfg(all(feature = "wayland", target_os = "linux"))]
crate::surface::Action::Subsurface(settings, live_settings, view) => {
crate::surface::Action::Subsurface(settings, _live_settings, view) => {
let Some(settings) = std::sync::Arc::try_unwrap(settings)
.ok()
.and_then(|s| s.downcast::<Box<dyn Fn() -> iced_runtime::platform_specific::wayland::subsurface::SctkSubsurfaceSettings + Send + Sync>>().ok()) else {
@ -1408,7 +1408,7 @@ impl<T: Application> Cosmic<T> {
{
use iced_winit::platform_specific::commands::corner_radius::corner_radius;
let mut theme = THEME.lock().unwrap();
let theme = THEME.lock().unwrap();
// TODO do we need per window sharp corners?
let rounded = (!self.app.core().window.sharp_corners

2
src/surface/action.rs
View file

@ -4,7 +4,7 @@
use super::Action;
use crate::Application;
use iced::{Rectangle, window};
use iced::window;
#[cfg(all(feature = "wayland", target_os = "linux"))]
use iced_runtime::platform_specific::wayland::CornerRadius;
#[cfg(all(feature = "wayland", target_os = "linux"))]

3
src/theme/mod.rs
View file

@ -8,9 +8,8 @@ pub mod portal;
pub mod style;
use ::iced::Alignment;
use cosmic_config::{CosmicConfigEntry, config_subscription};
use cosmic_config::CosmicConfigEntry;
use cosmic_theme::{Component, LayeredTheme, Spacing, ThemeMode};
use iced_futures::Subscription;
use iced_runtime::{Appearance, DefaultStyle};
use std::sync::{Arc, LazyLock, Mutex};
pub use style::*;

32
src/theme/style/iced.rs
View file

@ -832,7 +832,7 @@ impl menu::Catalog for Theme {
fn default<'a>() -> <Self as menu::Catalog>::Class<'a> {}
fn style(&self, class: &<Self as menu::Catalog>::Class<'_>) -> menu::Style {
fn style(&self, _class: &<Self as menu::Catalog>::Class<'_>) -> menu::Style {
let cosmic = self.cosmic();
menu::Style {
@ -858,7 +858,7 @@ impl pick_list::Catalog for Theme {
fn style(
&self,
class: &<Self as pick_list::Catalog>::Class<'_>,
_class: &<Self as pick_list::Catalog>::Class<'_>,
status: pick_list::Status,
) -> pick_list::Style {
let cosmic = &self.cosmic();
@ -899,7 +899,7 @@ impl radio::Catalog for Theme {
fn default<'a>() -> Self::Class<'a> {}
fn style(&self, class: &Self::Class<'_>, status: radio::Status) -> radio::Style {
fn style(&self, _class: &Self::Class<'_>, status: radio::Status) -> radio::Style {
let cur_container = self.current_container();
let theme = self.cosmic();
@ -952,7 +952,7 @@ impl toggler::Catalog for Theme {
fn default<'a>() -> Self::Class<'a> {}
fn style(&self, class: &Self::Class<'_>, status: toggler::Status) -> toggler::Style {
fn style(&self, _class: &Self::Class<'_>, status: toggler::Status) -> toggler::Style {
let cosmic = self.cosmic();
const HANDLE_MARGIN: f32 = 2.0;
let neutral_10 = cosmic.palette.neutral_10.with_alpha(0.1);
@ -980,8 +980,8 @@ impl toggler::Catalog for Theme {
padding_ratio: 0.0,
};
match status {
toggler::Status::Active { is_toggled } => active,
toggler::Status::Hovered { is_toggled } => {
toggler::Status::Active { is_toggled: _ } => active,
toggler::Status::Hovered { is_toggled: _ } => {
let is_active = matches!(status, toggler::Status::Hovered { is_toggled: true });
toggler::Style {
background: if is_active {
@ -1000,7 +1000,7 @@ impl toggler::Catalog for Theme {
..active
}
}
toggler::Status::Disabled { is_toggled } => {
toggler::Status::Disabled { is_toggled: _ } => {
active.background = active.background.scale_alpha(0.5);
active.foreground = active.foreground.scale_alpha(0.5);
active
@ -1017,7 +1017,7 @@ impl pane_grid::Catalog for Theme {
fn default<'a>() -> <Self as pane_grid::Catalog>::Class<'a> {}
fn style(&self, class: &<Self as pane_grid::Catalog>::Class<'_>) -> pane_grid::Style {
fn style(&self, _class: &<Self as pane_grid::Catalog>::Class<'_>) -> pane_grid::Style {
let theme = self.cosmic();
pane_grid::Style {
@ -1188,8 +1188,8 @@ impl scrollable::Catalog for Theme {
fn style(&self, class: &Self::Class<'_>, status: scrollable::Status) -> scrollable::Style {
match status {
scrollable::Status::Active {
is_horizontal_scrollbar_disabled,
is_vertical_scrollbar_disabled,
is_horizontal_scrollbar_disabled: _,
is_vertical_scrollbar_disabled: _,
} => {
let cosmic = self.cosmic();
let neutral_5 = cosmic.palette.neutral_5.with_alpha(0.7);
@ -1348,7 +1348,7 @@ impl svg::Catalog for Theme {
Svg::default()
}
fn style(&self, class: &Self::Class<'_>, status: svg::Status) -> svg::Style {
fn style(&self, class: &Self::Class<'_>, _status: svg::Status) -> svg::Style {
#[allow(clippy::match_same_arms)]
match class {
Svg::Default => svg::Style::default(),
@ -1485,7 +1485,7 @@ impl text_input::Catalog for Theme {
},
}
}
text_input::Status::Focused { is_hovered } => {
text_input::Status::Focused { is_hovered: _ } => {
let bg = self.current_container().small_widget.with_alpha(0.25);
match class {
@ -1562,7 +1562,7 @@ impl iced_widget::text_editor::Catalog for Theme {
let selection = cosmic.accent.base.into();
let value = cosmic.palette.neutral_9.into();
let placeholder = cosmic.palette.neutral_9.with_alpha(0.7).into();
let icon: Color = cosmic.background(self.transparent).on.into();
let _icon: Color = cosmic.background(self.transparent).on.into();
// TODO do we need to add icon color back?
match status {
@ -1579,7 +1579,7 @@ impl iced_widget::text_editor::Catalog for Theme {
value,
selection,
},
iced_widget::text_editor::Status::Focused { is_hovered } => {
iced_widget::text_editor::Status::Focused { is_hovered: _ } => {
iced_widget::text_editor::Style {
background: iced::Color::from(cosmic.bg_color()).into(),
border: Border {
@ -1682,8 +1682,8 @@ impl Base for Theme {
crate::theme::ThemeType::Light => "Cosmic Light Theme",
crate::theme::ThemeType::HighContrastDark => "Cosmic High Contrast Dark Theme",
crate::theme::ThemeType::HighContrastLight => "Cosmic High Contrast Light Theme",
crate::theme::ThemeType::Custom(theme) => "Custom Cosmic Theme",
crate::theme::ThemeType::System { prefer_dark, theme } => &theme.name,
crate::theme::ThemeType::Custom(_theme) => "Custom Cosmic Theme",
crate::theme::ThemeType::System { prefer_dark: _, theme } => &theme.name,
}
}
}

2
src/theme/style/menu_bar.rs
View file

@ -65,7 +65,7 @@ impl StyleSheet for Theme {
fn appearance(&self, style: &Self::Style, is_overlay: bool) -> Appearance {
let cosmic = self.cosmic();
let component = &cosmic.background(!is_overlay && self.transparent).component;
let mut bg = component.base;
let bg = component.base;
match style {
MenuBarStyle::Default => Appearance {

1
src/widget/cards.rs
View file

@ -3,7 +3,6 @@ use std::time::Duration;
use crate::anim;
use crate::theme::THEME;
use crate::widget::card::style::Style;
use crate::widget::icon::{self, Handle};
use crate::widget::{button, column, row, text};
use float_cmp::approx_eq;

2
src/widget/dnd_source.rs
View file

@ -6,7 +6,7 @@ use iced_core::window;
use crate::Element;
use crate::widget::{Id, Widget, container};
use iced::clipboard::dnd::{DndAction, DndEvent, SourceEvent};
use iced::{Event, Length, Point, Rectangle, Vector, event, mouse, overlay};
use iced::{Event, Length, Point, Rectangle, Vector, mouse, overlay};
use iced_core::widget::{Tree, tree};
use iced_core::{self, Clipboard, Shell, layout, renderer};

2
src/widget/id_container.rs
View file

@ -1,4 +1,4 @@
use iced_core::event::{self, Event};
use iced_core::event::Event;
use iced_core::widget::{Id, Operation, Tree};
use iced_core::{
Clipboard, Element, Layout, Length, Rectangle, Shell, Vector, Widget, layout, mouse, overlay,

2
src/widget/layer_container.rs
View file

@ -1,7 +1,7 @@
use crate::Theme;
use cosmic_theme::LayeredTheme;
use iced::widget::Container;
use iced_core::event::{self, Event};
use iced_core::event::Event;
use iced_core::widget::Tree;
use iced_core::{
Alignment, Clipboard, Element, Layout, Length, Padding, Rectangle, Shell, Vector, Widget,

4
src/widget/menu/menu_bar.rs
View file

@ -18,10 +18,8 @@ use crate::Renderer;
use crate::app::cosmic::{WINDOWING_SYSTEM, WindowingSystem};
use crate::style::menu_bar::StyleSheet;
use crate::widget::RcWrapper;
use crate::widget::dropdown::menu::{self, State};
use crate::widget::menu::menu_inner::init_root_menu;
use iced::event::Status;
use iced::{Point, Shadow, Vector, window};
use iced_core::Border;
use iced_widget::core::layout::{Limits, Node};
@ -768,7 +766,7 @@ where
tree: &'b mut Tree,
layout: Layout<'b>,
_renderer: &Renderer,
viewport: &Rectangle,
_viewport: &Rectangle,
translation: Vector,
) -> Option<overlay::Element<'b, Message, crate::Theme, Renderer>> {
#[cfg(all(

6
src/widget/menu/menu_column.rs
View file

@ -1,11 +1,11 @@
//! Distribute content vertically.
use crate::iced;
use iced::core::alignment::{self, Alignment};
use iced::core::event::{self, Event};
use iced::core::event::Event;
use iced::core::widget::{Operation, Tree};
use iced::core::{
Clipboard, Element, Layout, Length, Padding, Pixels, Rectangle, Shell, Size, Vector, Widget,
layout, mouse, overlay, renderer, widget,
layout, mouse, overlay, renderer,
};
#[allow(missing_debug_implementations)]
@ -242,7 +242,7 @@ where
shell: &mut Shell<'_, Message>,
viewport: &Rectangle,
) {
for (((i, child), state), c_layout) in self
for (((_i, child), state), c_layout) in self
.children
.iter_mut()
.enumerate()

16
src/widget/menu/menu_inner.rs
View file

@ -562,7 +562,7 @@ impl<'b, Message: Clone + 'static> Menu<'b, Message> {
shell: &mut Shell<'_, Message>,
) -> Option<(usize, MenuState)> {
use event::Event::{Mouse, Touch};
use event::Status::{Captured, Ignored};
use mouse::Button::Left;
use mouse::Event::{ButtonPressed, ButtonReleased, CursorMoved, WheelScrolled};
use touch::Event::{FingerLifted, FingerMoved, FingerPressed};
@ -580,7 +580,7 @@ impl<'b, Message: Clone + 'static> Menu<'b, Message> {
let viewport_size = viewport.size();
let overlay_offset = Point::ORIGIN - viewport.position();
let overlay_cursor = view_cursor.position().unwrap_or_default() - overlay_offset;
let menu_roots = match &mut self.menu_roots {
let _menu_roots = match &mut self.menu_roots {
Cow::Borrowed(_) => panic!(),
Cow::Owned(o) => o.as_mut_slice(),
};
@ -977,7 +977,7 @@ impl<Message: std::clone::Clone + 'static> Widget<Message, crate::Theme, crate::
#[allow(clippy::too_many_lines)]
fn update(
&mut self,
tree: &mut Tree,
_tree: &mut Tree,
event: &iced::Event,
layout: Layout<'_>,
cursor: mouse::Cursor,
@ -995,7 +995,7 @@ impl<Message: std::clone::Clone + 'static> Widget<Message, crate::Theme, crate::
target_os = "linux"
))]
if matches!(WINDOWING_SYSTEM.get(), Some(WindowingSystem::Wayland))
&& let Some((new_root, new_ms)) = new_root
&& let Some((new_root, _new_ms)) = new_root
{
use iced_runtime::platform_specific::wayland::CornerRadius;
use iced_runtime::platform_specific::wayland::popup::{
@ -1006,14 +1006,14 @@ impl<Message: std::clone::Clone + 'static> Widget<Message, crate::Theme, crate::
use crate::theme::THEME;
let overlay_offset = Point::ORIGIN - viewport.position();
let overlay_cursor = cursor.position().unwrap_or_default() - overlay_offset;
let _overlay_cursor = cursor.position().unwrap_or_default() - overlay_offset;
let Some((mut menu, popup_id)) = self.tree.inner.with_data_mut(|state| {
let popup_id = *state
.popup_id
.entry(self.window_id)
.or_insert_with(window::Id::unique);
let active_roots = state
let _active_roots = state
.active_root
.get(self.depth)
.cloned()
@ -1027,7 +1027,7 @@ impl<Message: std::clone::Clone + 'static> Widget<Message, crate::Theme, crate::
.map(|lo| lo.bounds())
.collect();
let mut popup_menu = Menu {
let popup_menu = Menu {
tree: self.tree.clone(),
menu_roots: Cow::Owned(Cow::into_owned(self.menu_roots.clone())),
bounds_expand: self.bounds_expand,
@ -1647,7 +1647,7 @@ fn process_scroll_events<Message>(
) where
Message: Clone,
{
use event::Status::{Captured, Ignored};
use mouse::ScrollDelta;
menu.tree.inner.with_data_mut(|state| {

2
src/widget/popover.rs
View file

@ -4,7 +4,7 @@
//! A container which displays an overlay when a popup widget is attached.
use iced::widget;
use iced_core::event::{self, Event};
use iced_core::event::Event;
use iced_core::widget::{Operation, Tree};
use iced_core::{
Clipboard, Element, Layout, Length, Point, Rectangle, Shell, Size, Vector, Widget, layout,

2
src/widget/radio.rs
View file

@ -1,7 +1,7 @@
//! Create choices using radio buttons.
use crate::{Theme, theme};
use iced::border;
use iced_core::event::{self, Event};
use iced_core::event::Event;
use iced_core::widget::tree::Tree;
use iced_core::{
Border, Clipboard, Element, Layout, Length, Pixels, Rectangle, Shell, Size, Vector, Widget,

2
src/widget/rectangle_tracker/mod.rs
View file

@ -5,7 +5,7 @@ use iced::futures::channel::mpsc::UnboundedSender;
use iced::widget::Container;
pub use subscription::*;
use iced_core::event::{self, Event};
use iced_core::event::Event;
use iced_core::widget::Tree;
use iced_core::{
Alignment, Clipboard, Element, Layout, Length, Padding, Rectangle, Shell, Widget, layout,

2
src/widget/responsive_container.rs
View file

@ -1,7 +1,7 @@
//! Responsive Container, which will notify of size changes.
use iced::{Limits, Size};
use iced_core::event::{self, Event};
use iced_core::event::Event;
use iced_core::widget::{Id, Operation, Tree, tree};
use iced_core::{
Clipboard, Element, Layout, Length, Rectangle, Shell, Vector, Widget, layout, mouse, overlay,

4
src/widget/segmented_button/widget.rs
View file

@ -9,7 +9,7 @@ use crate::widget::menu::{
self, CloseCondition, ItemHeight, ItemWidth, MenuBarState, PathHighlight, menu_roots_children,
menu_roots_diff,
};
use crate::widget::{Icon, context_menu, icon};
use crate::widget::{Icon, icon};
use crate::{Element, Renderer};
use derive_setters::Setters;
use iced::clipboard::dnd::{
@ -1683,7 +1683,7 @@ where
feature = "surface-message"
))]
if is_pressed(event)
&& let Some(on_context) = self.on_context.as_ref()
&& let Some(_on_context) = self.on_context.as_ref()
{
let (was_open, id) = state.menu_state.inner.with_data_mut(|data| {
let was_open = data.open;

4
src/widget/toaster/widget.rs
View file

@ -4,7 +4,7 @@
use iced::{Limits, Size};
use iced_core::layout::Node;
use iced_core::event::{self, Event};
use iced_core::event::Event;
use iced_core::renderer::{self};
use iced_core::widget::Operation;
use iced_core::widget::tree::Tree;
@ -152,7 +152,7 @@ where
translation,
)
} else {
let bounds = layout.bounds();
let _bounds = layout.bounds();
Some(overlay::Element::new(Box::new(ToasterOverlay::new(
&mut state.children[1],

11
src/widget/toggler.rs
View file

@ -1,18 +1,17 @@
//! Show toggle controls using togglers.
use std::time::{Duration, Instant};
use std::time::Duration;
use crate::{Element, anim};
use iced_core::renderer::{self, Renderer};
use iced_core::widget::{self, Tree, tree};
use iced_core::{
Border, Clipboard, Event, Layout, Length, Pixels, Rectangle, Shell, Size, Widget, alignment,
event, layout, mouse, text, touch, window,
Border, Clipboard, Event, Layout, Length, Pixels, Rectangle, Shell, Size, Widget, alignment, layout, mouse, text, touch, window,
};
use iced_widget::Id;
use iced_widget::toggler::Status;
pub use iced_widget::toggler::{Catalog, Style};
pub use iced_widget::toggler::Catalog;
pub fn toggler<'a, Message>(is_checked: bool) -> Toggler<'a, Message> {
Toggler::new(is_checked)
@ -260,7 +259,7 @@ impl<'a, Message> Widget<Message, crate::Theme, crate::Renderer> for Toggler<'a,
shell.capture_event();
}
}
Event::Window(window::Event::RedrawRequested(now)) => {
Event::Window(window::Event::RedrawRequested(_now)) => {
state.anim.anim_done(self.duration);
if state.anim.last_change.is_some() {
shell.request_redraw();
@ -370,7 +369,7 @@ impl<'a, Message> Widget<Message, crate::Theme, crate::Renderer> for Toggler<'a,
},
style.background,
);
let mut t = state.anim.t(self.duration, self.is_toggled);
let t = state.anim.t(self.duration, self.is_toggled);
let toggler_foreground_bounds = Rectangle {
x: bounds.x

2
src/widget/wayland/tooltip/widget.rs
View file

@ -301,7 +301,7 @@ impl<'a, Message: 'static + Clone, TopLevelMessage: 'static + Clone>
}
let content_layout = layout.children().next().unwrap();
let state = tree.state.downcast_ref::<State>();
let _state = tree.state.downcast_ref::<State>();
let styling = theme.style(&self.style);

2
src/widget/wrapper.rs
View file

@ -4,7 +4,7 @@ use std::rc::Rc;
use std::thread::{self, ThreadId};
use crate::Element;
use iced::{Length, Rectangle, Size, event};
use iced::{Length, Rectangle, Size};
use iced_core::id::Id;
use iced_core::widget::tree;
use iced_core::{Widget, widget};