Update to Rust 2024 and fix compiler errors

This commit is contained in:
Héctor Ramón Jiménez 2025-02-21 01:19:53 +01:00
parent 81ca3d2a22
commit 67e489e382
No known key found for this signature in database
GPG key ID: 7CC46565708259A7
6 changed files with 13 additions and 13 deletions

View file

@ -122,13 +122,13 @@ members = [
[workspace.package]
version = "0.14.0-dev"
authors = ["Héctor Ramón Jiménez <hector@hecrj.dev>"]
edition = "2021"
edition = "2024"
license = "MIT"
repository = "https://github.com/iced-rs/iced"
homepage = "https://iced.rs"
categories = ["gui"]
keywords = ["gui", "ui", "graphics", "interface", "widgets"]
rust-version = "1.82"
rust-version = "1.85"
[workspace.dependencies]
iced = { version = "0.14.0-dev", path = "." }

View file

@ -1252,7 +1252,7 @@ impl PartialEq<Code> for Physical {
#[inline]
fn eq(&self, rhs: &Code) -> bool {
match self {
Physical::Code(ref code) => code == rhs,
Physical::Code(code) => code == rhs,
Physical::Unidentified(_) => false,
}
}
@ -1269,7 +1269,7 @@ impl PartialEq<NativeCode> for Physical {
#[inline]
fn eq(&self, rhs: &NativeCode) -> bool {
match self {
Physical::Unidentified(ref code) => code == rhs,
Physical::Unidentified(code) => code == rhs,
Physical::Code(_) => false,
}
}

View file

@ -304,7 +304,7 @@ where
let size = size.unwrap_or_else(|| renderer.default_size());
let font = font.unwrap_or_else(|| renderer.default_font());
let State(ref mut paragraph) = state;
let State(paragraph) = state;
paragraph.update(text::Text {
content,

View file

@ -105,8 +105,8 @@ use crate::core::window;
use crate::core::{
Element, Event, Font, Point, Rectangle, Settings, Size, SmolStr,
};
use crate::runtime::user_interface;
use crate::runtime::UserInterface;
use crate::runtime::user_interface;
use std::borrow::Cow;
use std::fs;
@ -459,7 +459,9 @@ where
}
/// Turns the [`Simulator`] into the sequence of messages produced by any interactions.
pub fn into_messages(self) -> impl Iterator<Item = Message> {
pub fn into_messages(
self,
) -> impl Iterator<Item = Message> + use<Message, Theme, Renderer> {
self.messages.into_iter()
}
}

View file

@ -688,10 +688,10 @@ where
.iter()
.zip(&self.contents)
.zip(layout.children())
.filter(|((&pane, _content), _layout)| {
.filter(|((pane, _content), _layout)| {
self.internal
.maximized()
.map_or(true, |maximized| pane == maximized)
.map_or(true, |maximized| **pane == maximized)
})
.find_map(|((_pane, content), layout)| {
content.grid_interaction(

View file

@ -31,7 +31,7 @@
use std::ops::RangeInclusive;
pub use crate::slider::{
default, Catalog, Handle, HandleShape, Status, Style, StyleFn,
Catalog, Handle, HandleShape, Status, Style, StyleFn, default,
};
use crate::core::border::Border;
@ -393,9 +393,7 @@ where
shell.capture_event();
}
}
Event::Keyboard(keyboard::Event::KeyPressed {
ref key, ..
}) => {
Event::Keyboard(keyboard::Event::KeyPressed { key, .. }) => {
if cursor.is_over(layout.bounds()) {
match key {
Key::Named(key::Named::ArrowUp) => {