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

fix: Rust 2024 errors

Browse source
This commit is contained in:
Michael Aaron Murphy 2025-03-19 19:23:34 +01:00
parent 77c3a8ed90
commit 2afa192573
No known key found for this signature in database
GPG key ID: B2732D4240C9212C
2 changed files with 11 additions and 11 deletions
Download patch file Download diff file Expand all files Collapse all files

2
src/malloc.rs
View file

@ -5,7 +5,7 @@ use std::os::raw::c_int;
const M_MMAP_THRESHOLD: c_int = -3; const M_MMAP_THRESHOLD: c_int = -3;
extern "C" { unsafe extern "C" {
fn malloc_trim(pad: usize); fn malloc_trim(pad: usize);
fn mallopt(param: c_int, value: c_int) -> c_int; fn mallopt(param: c_int, value: c_int) -> c_int;

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

@ -6,29 +6,29 @@ use crate::iced_core::id::Internal;
use crate::theme::{SegmentedButton as Style, THEME}; use crate::theme::{SegmentedButton as Style, THEME};
use crate::widget::dnd_destination::DragId; use crate::widget::dnd_destination::DragId;
use crate::widget::menu::{ use crate::widget::menu::{
self, menu_roots_children, menu_roots_diff, CloseCondition, ItemHeight, ItemWidth, self, CloseCondition, ItemHeight, ItemWidth, MenuBarState, PathHighlight, menu_roots_children,
MenuBarState, PathHighlight, menu_roots_diff,
}; };
use crate::widget::{icon, Icon}; use crate::widget::{Icon, icon};
use crate::{Element, Renderer}; use crate::{Element, Renderer};
use derive_setters::Setters; use derive_setters::Setters;
use iced::clipboard::dnd::{self, DndAction, DndDestinationRectangle, DndEvent, OfferEvent}; use iced::clipboard::dnd::{self, DndAction, DndDestinationRectangle, DndEvent, OfferEvent};
use iced::clipboard::mime::AllowedMimeTypes; use iced::clipboard::mime::AllowedMimeTypes;
use iced::touch::Finger; use iced::touch::Finger;
use iced::{ use iced::{
alignment, event, keyboard, mouse, touch, Alignment, Background, Color, Event, Length, Padding, Alignment, Background, Color, Event, Length, Padding, Rectangle, Size, Task, Vector, alignment,
Rectangle, Size, Task, Vector, event, keyboard, mouse, touch,
}; };
use iced_core::mouse::ScrollDelta; use iced_core::mouse::ScrollDelta;
use iced_core::text::{LineHeight, Paragraph, Renderer as TextRenderer, Shaping, Wrapping}; use iced_core::text::{LineHeight, Paragraph, Renderer as TextRenderer, Shaping, Wrapping};
use iced_core::widget::{self, operation, tree}; use iced_core::widget::{self, operation, tree};
use iced_core::{layout, renderer, widget::Tree, Clipboard, Layout, Shell, Widget};
use iced_core::{Border, Gradient, Point, Renderer as IcedRenderer, Shadow, Text}; use iced_core::{Border, Gradient, Point, Renderer as IcedRenderer, Shadow, Text};
use iced_runtime::{task, Action}; use iced_core::{Clipboard, Layout, Shell, Widget, layout, renderer, widget::Tree};
use iced_runtime::{Action, task};
use slotmap::{Key, SecondaryMap}; use slotmap::{Key, SecondaryMap};
use std::borrow::Cow; use std::borrow::Cow;
use std::collections::hash_map::DefaultHasher;
use std::collections::HashSet; use std::collections::HashSet;
use std::collections::hash_map::DefaultHasher;
use std::hash::{Hash, Hasher}; use std::hash::{Hash, Hasher};
use std::marker::PhantomData; use std::marker::PhantomData;
use std::mem; use std::mem;
@ -537,7 +537,7 @@ where
pub fn get_drag_id(&self) -> u128 { pub fn get_drag_id(&self) -> u128 {
self.drag_id.map_or_else( self.drag_id.map_or_else(
|| { || {
u128::from(match &self.id.0 .0 { u128::from(match &self.id.0.0 {
Internal::Unique(id) | Internal::Custom(id, _) => *id, Internal::Unique(id) | Internal::Custom(id, _) => *id,
Internal::Set(_) => panic!("Invalid Id assigned to dnd destination."), Internal::Set(_) => panic!("Invalid Id assigned to dnd destination."),
}) })
@ -1180,7 +1180,7 @@ where
} }
Background::Gradient(g) => { Background::Gradient(g) => {
let Gradient::Linear(mut l) = g; let Gradient::Linear(l) = g;
for c in &mut l.stops { for c in &mut l.stops {
let Some(stop) = c else { let Some(stop) = c else {
continue; continue;