From cf4660841a35139f4b48ac71f6c7cd9482ab5198 Mon Sep 17 00:00:00 2001
From: Lucas Kent <rubickent@gmail.com>
Date: Thu, 13 Jan 2022 16:59:57 +1100
Subject: [PATCH] Update to Rust 2021 Edition (#2114)

---
 Cargo.toml                          |  2 +-
 src/platform_impl/macos/observer.rs |  5 ++++-
 src/platform_impl/windows/window.rs | 12 ++++++++++++
 3 files changed, 17 insertions(+), 2 deletions(-)

diff --git a/Cargo.toml b/Cargo.toml
index b1e4159b..d1c9a1c8 100644
--- a/Cargo.toml
+++ b/Cargo.toml
@@ -3,7 +3,7 @@ name = "winit"
 version = "0.26.1"
 authors = ["The winit contributors", "Pierre Krieger <pierre.krieger1708@gmail.com>"]
 description = "Cross-platform window creation library."
-edition = "2018"
+edition = "2021"
 keywords = ["windowing"]
 license = "Apache-2.0"
 readme = "README.md"
diff --git a/src/platform_impl/macos/observer.rs b/src/platform_impl/macos/observer.rs
index 5f92c55b..308637cb 100644
--- a/src/platform_impl/macos/observer.rs
+++ b/src/platform_impl/macos/observer.rs
@@ -139,7 +139,10 @@ where
     // However we want to keep that weak reference around after the function.
     std::mem::forget(info_from_raw);
 
-    stop_app_on_panic(Weak::clone(&panic_info), move || f(panic_info.0));
+    stop_app_on_panic(Weak::clone(&panic_info), move || {
+        let _ = &panic_info;
+        f(panic_info.0)
+    });
 }
 
 // begin is queued with the highest priority to ensure it is processed before other observers
diff --git a/src/platform_impl/windows/window.rs b/src/platform_impl/windows/window.rs
index f0ea7fbd..06176304 100644
--- a/src/platform_impl/windows/window.rs
+++ b/src/platform_impl/windows/window.rs
@@ -90,6 +90,7 @@ impl Window {
         let window = self.window.clone();
         let window_state = Arc::clone(&self.window_state);
         self.thread_executor.execute_in_thread(move || {
+            let _ = &window;
             WindowState::set_window_flags(window_state.lock(), window.0, |f| {
                 f.set(WindowFlags::VISIBLE, visible)
             });
@@ -131,6 +132,7 @@ impl Window {
         let window_state = Arc::clone(&self.window_state);
         let window = self.window.clone();
         self.thread_executor.execute_in_thread(move || {
+            let _ = &window;
             WindowState::set_window_flags(window_state.lock(), window.0, |f| {
                 f.set(WindowFlags::MAXIMIZED, false)
             });
@@ -185,6 +187,7 @@ impl Window {
         let window_state = Arc::clone(&self.window_state);
         let window = self.window.clone();
         self.thread_executor.execute_in_thread(move || {
+            let _ = &window;
             WindowState::set_window_flags(window_state.lock(), window.0, |f| {
                 f.set(WindowFlags::MAXIMIZED, false)
             });
@@ -215,6 +218,7 @@ impl Window {
         let window_state = Arc::clone(&self.window_state);
 
         self.thread_executor.execute_in_thread(move || {
+            let _ = &window;
             WindowState::set_window_flags(window_state.lock(), window.0, |f| {
                 f.set(WindowFlags::RESIZABLE, resizable)
             });
@@ -256,6 +260,7 @@ impl Window {
         let (tx, rx) = channel();
 
         self.thread_executor.execute_in_thread(move || {
+            let _ = &window;
             let result = window_state
                 .lock()
                 .mouse
@@ -273,6 +278,7 @@ impl Window {
         let (tx, rx) = channel();
 
         self.thread_executor.execute_in_thread(move || {
+            let _ = &window;
             let result = window_state
                 .lock()
                 .mouse
@@ -340,6 +346,7 @@ impl Window {
         let window_state = Arc::clone(&self.window_state);
 
         self.thread_executor.execute_in_thread(move || {
+            let _ = &window;
             WindowState::set_window_flags(window_state.lock(), window.0, |f| {
                 f.set(WindowFlags::MINIMIZED, minimized)
             });
@@ -352,6 +359,7 @@ impl Window {
         let window_state = Arc::clone(&self.window_state);
 
         self.thread_executor.execute_in_thread(move || {
+            let _ = &window;
             WindowState::set_window_flags(window_state.lock(), window.0, |f| {
                 f.set(WindowFlags::MAXIMIZED, maximized)
             });
@@ -384,6 +392,7 @@ impl Window {
         drop(window_state_lock);
 
         self.thread_executor.execute_in_thread(move || {
+            let _ = &window;
             // Change video mode if we're transitioning to or from exclusive
             // fullscreen
             match (&old_fullscreen, &fullscreen) {
@@ -528,6 +537,7 @@ impl Window {
         let window_state = Arc::clone(&self.window_state);
 
         self.thread_executor.execute_in_thread(move || {
+            let _ = &window;
             WindowState::set_window_flags(window_state.lock(), window.0, |f| {
                 f.set(WindowFlags::DECORATIONS, decorations)
             });
@@ -540,6 +550,7 @@ impl Window {
         let window_state = Arc::clone(&self.window_state);
 
         self.thread_executor.execute_in_thread(move || {
+            let _ = &window;
             WindowState::set_window_flags(window_state.lock(), window.0, |f| {
                 f.set(WindowFlags::ALWAYS_ON_TOP, always_on_top)
             });
@@ -612,6 +623,7 @@ impl Window {
         }
 
         self.thread_executor.execute_in_thread(move || unsafe {
+            let _ = &window;
             let (flags, count) = request_type
                 .map(|ty| match ty {
                     UserAttentionType::Critical => {