Merge branch 'master' of https://github.com/emilk/egui into multiples_viewports

crates/egui-winit/Cargo.toml

@@ -4,7 +4,7 @@ version = "0.22.0"
 authors = ["Emil Ernerfeldt <emil.ernerfeldt@gmail.com>"]
 description = "Bindings for using egui with winit"
 edition = "2021"
-rust-version = "1.67"
+rust-version = "1.70"
 homepage = "https://github.com/emilk/egui/tree/master/crates/egui-winit"
 license = "MIT OR Apache-2.0"
 readme = "README.md"

crates/egui-winit/src/clipboard.rs

@@ -26,10 +26,6 @@ pub struct Clipboard {
 
 impl Clipboard {
     /// Construct a new instance
-    ///
-    /// # Safety
-    ///
-    /// The returned `Clipboard` must not outlive the input `_display_target`.
     pub fn new(_display_target: &dyn HasRawDisplayHandle) -> Self {
         Self {
             #[cfg(all(feature = "arboard", not(target_os = "android")))]

crates/egui-winit/src/lib.rs

@@ -87,10 +87,6 @@ pub struct State {
 
 impl State {
     /// Construct a new instance
-    ///
-    /// # Safety
-    ///
-    /// The returned `State` must not outlive the input `display_target`.
     pub fn new(display_target: &dyn HasRawDisplayHandle) -> Self {
         let egui_input = egui::RawInput {
             focused: false, // winit will tell us when we have focus

crates/egui-winit/src/window_settings.rs

@@ -127,12 +127,10 @@ fn clamp_pos_to_monitors<E>(
     let monitors = event_loop.available_monitors();
 
     // default to primary monitor, in case the correct monitor was disconnected.
-    let mut active_monitor = if let Some(active_monitor) = event_loop
+    let Some(mut active_monitor) = event_loop
         .primary_monitor()
         .or_else(|| event_loop.available_monitors().next())
-    {
-        active_monitor
-    } else {
+    else {
         return; // no monitors 🤷
     };