From 82db3c78b6cfa2cc55ece6ffa46811bfb5195f60 Mon Sep 17 00:00:00 2001
From: Héctor Ramón Jiménez <hector0193@gmail.com>
Date: Tue, 20 Jul 2021 21:34:20 +0700
Subject: Update `winit` and `glutin` dependencies
... and remove crates.io patch
---
winit/src/conversion.rs | 17 +++++------------
1 file changed, 5 insertions(+), 12 deletions(-)
(limited to 'winit/src/conversion.rs')
diff --git a/winit/src/conversion.rs b/winit/src/conversion.rs
index e61611aa..5a8b9fd8 100644
--- a/winit/src/conversion.rs
+++ b/winit/src/conversion.rs
@@ -218,17 +218,15 @@ pub fn menu<Message>(menu: &Menu<Message>) -> winit::window::Menu {
/// Given a [`Menu`] and an identifier of a [`menu::Entry`], it returns the
/// `Message` that should be produced when that entry is activated.
-pub fn menu_message<Message>(menu: &Menu<Message>, id: isize) -> Option<Message>
+pub fn menu_message<Message>(menu: &Menu<Message>, id: u32) -> Option<Message>
where
Message: Clone,
{
- use std::convert::TryFrom;
-
fn find_message<Message>(
- target: usize,
- starting_id: usize,
+ target: u32,
+ starting_id: u32,
menu: &Menu<Message>,
- ) -> Result<Message, usize>
+ ) -> Result<Message, u32>
where
Message: Clone,
{
@@ -260,12 +258,7 @@ where
Err(id - starting_id)
}
- // TODO: Does `winit` really need to provide an `isize`?
- if let Ok(id) = usize::try_from(id) {
- find_message(id, 0, menu).ok()
- } else {
- None
- }
+ find_message(id, 0, menu).ok()
}
/// Converts a `MouseCursor` from [`iced_native`] to a [`winit`] cursor icon.
--
cgit