yoda: iced_winit unreachable + deprecation cleanup (45→29 warnings)

- conversion.rs: drop 4 duplicate Interaction arms (Cell/Move/Copy/Help)
  that were already handled higher in the same match — pure dead code
  from a past merge, not a real bug.
- platform_specific/wayland/mod.rs: migrate HasRawDisplayHandle →
  HasDisplayHandle (display_handle().map(|h| h.as_raw())).
- conversion.rs: #[allow(deprecated)] on key_code/winit_key_code — the
  warning suggests Meta but no Meta variant exists in this enum
  (only MetaLeft/MetaRight, which aren't equivalent to Super).
- window.rs: #[allow(deprecated)] on enable_ime/disable_ime with TODO
  to migrate set_ime_* → request_ime_update(ImeRequest::*).
- lib.rs: #[allow(deprecated)] on process_event with TODO to migrate
  try_next → try_recv (futures-channel API change).

Leyoda 2026 – GPLv3
This commit is contained in:
Votre Nom 2026-05-05 18:11:19 +02:00
parent 8a7a32ff92
commit aa1c2593ac
4 changed files with 11 additions and 7 deletions

View file

@ -640,10 +640,6 @@ pub fn mouse_interaction(
Interaction::AllScroll => winit_core::cursor::CursorIcon::AllScroll,
Interaction::ZoomIn => winit_core::cursor::CursorIcon::ZoomIn,
Interaction::ZoomOut => winit_core::cursor::CursorIcon::ZoomOut,
Interaction::Cell => winit_core::cursor::CursorIcon::Cell,
Interaction::Move => winit_core::cursor::CursorIcon::Move,
Interaction::Copy => winit_core::cursor::CursorIcon::Copy,
Interaction::Help => winit_core::cursor::CursorIcon::Help,
Interaction::Hidden => {
return None;
}
@ -1079,6 +1075,7 @@ pub fn physical_key(
///
/// [`winit`]: https://github.com/rust-windowing/winit
/// [`iced`]: https://github.com/iced-rs/iced/tree/0.12
#[allow(deprecated)] // KeyCode::Super/Hyper/Turbo: legacy spec, no Meta variant in this enum
pub fn key_code(
key_code: winit::keyboard::KeyCode,
) -> Option<keyboard::key::Code> {
@ -1283,6 +1280,7 @@ pub fn key_code(
})
}
#[allow(deprecated)] // KeyCode::Super/Hyper/Turbo: legacy spec, no Meta variant in this enum
pub fn winit_key_code(
key_code: keyboard::key::Code,
) -> Option<winit::keyboard::KeyCode> {

View file

@ -362,6 +362,8 @@ where
where
F: Future<Output = ()>,
{
// TODO(yoda): migrate try_next → try_recv (futures-channel API change).
#[allow(deprecated)]
fn process_event(
&mut self,
event_loop: &dyn winit::event_loop::ActiveEventLoop,

View file

@ -18,8 +18,7 @@ use cursor_icon::CursorIcon;
use iced_futures::futures::channel::mpsc;
use iced_graphics::{Compositor, compositor};
use iced_runtime::core::{Vector, window};
use raw_window_handle::{HasDisplayHandle, HasWindowHandle};
use raw_window_handle::{HasRawDisplayHandle, RawWindowHandle};
use raw_window_handle::{HasDisplayHandle, HasWindowHandle, RawWindowHandle};
use sctk_event::SctkEvent;
use std::{collections::HashMap, sync::Arc};
use subsurface_widget::{SubsurfaceInstance, SubsurfaceState};
@ -106,7 +105,7 @@ impl PlatformSpecific {
display: OwnedDisplayHandle,
) -> Self {
self.wayland.winit_event_sender = Some(tx);
self.wayland.conn = match display.raw_display_handle() {
self.wayland.conn = match display.display_handle().map(|h| h.as_raw()) {
Ok(raw_window_handle::RawDisplayHandle::Wayland(
wayland_display_handle,
)) => {

View file

@ -325,6 +325,10 @@ where
}
}
// TODO(yoda): migrate to Window::request_ime_update(ImeRequest::*).
// Legacy set_ime_* still functional but deprecated; full migration
// requires ImeCapabilities + ImeRequestData reshape.
#[allow(deprecated)]
fn enable_ime(
&mut self,
cursor: Rectangle,
@ -355,6 +359,7 @@ where
}
}
#[allow(deprecated)] // see TODO on enable_ime
fn disable_ime(&mut self) {
if self.ime_state.is_some() {
self.raw.set_ime_allowed(false);