gtk-rs · bilelmoussaoui · Aug 27, 2023 · Aug 25, 2023 · Aug 25, 2023 · Aug 25, 2023
diff --git a/.github/workflows/windows-msvc.yml b/.github/workflows/windows-msvc.yml
@@ -33,9 +33,9 @@ jobs:
       id: cache
       with:
         path: c:/gnome
-        key: ${{ runner.os }}-gtk4-14.1
+        key: ${{ runner.os }}-gtk4-14.2
         restore-keys: |
-          ${{ runner.os }}-gtk4-14.1
+          ${{ runner.os }}-gtk4-14.2
 
     - name: Set up the PATH environment
       run: |

diff --git a/Cargo.toml b/Cargo.toml
@@ -1,4 +1,5 @@
 [workspace]
+resolver = "2"
 
 default-members = [
   "examples",

diff --git a/gdk4-wayland/src/auto/versions.txt b/gdk4-wayland/src/auto/versions.txt
@@ -1,2 +1,2 @@
-Generated by gir (https://github.com/gtk-rs/gir @ dcaa0e340516)
-from gir-files (https://github.com/gtk-rs/gir-files @ 58cd940295f0)
+Generated by gir (https://github.com/gtk-rs/gir @ 0f2c059e0939)
+from gir-files (https://github.com/gtk-rs/gir-files @ 615ef8fb32f2)
diff --git a/gdk4-wayland/src/auto/wayland_device.rs b/gdk4-wayland/src/auto/wayland_device.rs
@@ -3,7 +3,6 @@
 // DO NOT EDIT
 
 use glib::translate::*;
-use std::fmt;
 
 glib::wrapper! {
     #[doc(alias = "GdkWaylandDevice")]
@@ -21,9 +20,3 @@ impl WaylandDevice {
         unsafe { from_glib_none(ffi::gdk_wayland_device_get_node_path(self.to_glib_none().0)) }
     }
 }
-
-impl fmt::Display for WaylandDevice {
-    fn fmt(&self, f: &mut fmt::Formatter) -> fmt::Result {
-        f.write_str("WaylandDevice")
-    }
-}
diff --git a/gdk4-wayland/src/auto/wayland_display.rs b/gdk4-wayland/src/auto/wayland_display.rs
@@ -4,7 +4,6 @@
 #![allow(deprecated)]
 
 use glib::translate::*;
-use std::fmt;
 
 glib::wrapper! {
     #[doc(alias = "GdkWaylandDisplay")]
@@ -61,9 +60,3 @@
         }
     }
 }
-
-impl fmt::Display for WaylandDisplay {
-    fn fmt(&self, f: &mut fmt::Formatter) -> fmt::Result {
-        f.write_str("WaylandDisplay")
-    }
-}
diff --git a/gdk4-wayland/src/auto/wayland_gl_context.rs b/gdk4-wayland/src/auto/wayland_gl_context.rs
@@ -2,8 +2,6 @@
 // from gir-files (https://github.com/gtk-rs/gir-files)
 // DO NOT EDIT
 
-use std::fmt;
-
 glib::wrapper! {
     #[doc(alias = "GdkWaylandGLContext")]
     pub struct WaylandGLContext(Object<ffi::GdkWaylandGLContext, ffi::GdkWaylandGLContextClass>) @extends gdk::GLContext, gdk::DrawContext;
@@ -14,9 +12,3 @@ glib::wrapper! {
 }
 
 impl WaylandGLContext {}
-
-impl fmt::Display for WaylandGLContext {
-    fn fmt(&self, f: &mut fmt::Formatter) -> fmt::Result {
-        f.write_str("WaylandGLContext")
-    }
-}
diff --git a/gdk4-wayland/src/auto/wayland_monitor.rs b/gdk4-wayland/src/auto/wayland_monitor.rs
@@ -2,8 +2,6 @@
 // from gir-files (https://github.com/gtk-rs/gir-files)
 // DO NOT EDIT
 
-use std::fmt;
-
 glib::wrapper! {
     #[doc(alias = "GdkWaylandMonitor")]
     pub struct WaylandMonitor(Object<ffi::GdkWaylandMonitor, ffi::GdkWaylandMonitorClass>) @extends gdk::Monitor;
@@ -14,9 +12,3 @@ glib::wrapper! {
 }
 
 impl WaylandMonitor {}
-
-impl fmt::Display for WaylandMonitor {
-    fn fmt(&self, f: &mut fmt::Formatter) -> fmt::Result {
-        f.write_str("WaylandMonitor")
-    }
-}
diff --git a/gdk4-wayland/src/auto/wayland_popup.rs b/gdk4-wayland/src/auto/wayland_popup.rs
@@ -3,7 +3,6 @@
 // DO NOT EDIT
 
 use crate::WaylandSurface;
-use std::fmt;
 
 glib::wrapper! {
     #[doc(alias = "GdkWaylandPopup")]
@@ -15,9 +14,3 @@ glib::wrapper! {
 }
 
 impl WaylandPopup {}
-
-impl fmt::Display for WaylandPopup {
-    fn fmt(&self, f: &mut fmt::Formatter) -> fmt::Result {
-        f.write_str("WaylandPopup")
-    }
-}
diff --git a/gdk4-wayland/src/auto/wayland_seat.rs b/gdk4-wayland/src/auto/wayland_seat.rs
@@ -2,8 +2,6 @@
 // from gir-files (https://github.com/gtk-rs/gir-files)
 // DO NOT EDIT
 
-use std::fmt;
-
 glib::wrapper! {
     #[doc(alias = "GdkWaylandSeat")]
     pub struct WaylandSeat(Object<ffi::GdkWaylandSeat, ffi::GdkWaylandSeatClass>) @extends gdk::Seat;
@@ -14,9 +12,3 @@ glib::wrapper! {
 }
 
 impl WaylandSeat {}
-
-impl fmt::Display for WaylandSeat {
-    fn fmt(&self, f: &mut fmt::Formatter) -> fmt::Result {
-        f.write_str("WaylandSeat")
-    }
-}
diff --git a/gdk4-wayland/src/auto/wayland_surface.rs b/gdk4-wayland/src/auto/wayland_surface.rs
@@ -2,8 +2,6 @@
 // from gir-files (https://github.com/gtk-rs/gir-files)
 // DO NOT EDIT
 
-use std::fmt;
-
 glib::wrapper! {
     #[doc(alias = "GdkWaylandSurface")]
     pub struct WaylandSurface(Object<ffi::GdkWaylandSurface>) @extends gdk::Surface;
@@ -16,9 +14,3 @@ glib::wrapper! {
 impl WaylandSurface {
     pub const NONE: Option<&'static WaylandSurface> = None;
 }
-
-impl fmt::Display for WaylandSurface {
-    fn fmt(&self, f: &mut fmt::Formatter) -> fmt::Result {
-        f.write_str("WaylandSurface")
-    }
-}
diff --git a/gdk4-wayland/src/auto/wayland_toplevel.rs b/gdk4-wayland/src/auto/wayland_toplevel.rs
@@ -5,7 +5,7 @@
 
 use crate::WaylandSurface;
 use glib::translate::*;
-use std::{boxed::Box as Box_, fmt};
+use std::boxed::Box as Box_;
 
 glib::wrapper! {
     #[doc(alias = "GdkWaylandToplevel")]
@@ -89,9 +89,3 @@ impl WaylandToplevel {
         }
     }
 }
-
-impl fmt::Display for WaylandToplevel {
-    fn fmt(&self, f: &mut fmt::Formatter) -> fmt::Result {
-        f.write_str("WaylandToplevel")
-    }
-}
diff --git a/gdk4-wayland/sys/versions.txt b/gdk4-wayland/sys/versions.txt
@@ -1,2 +1,2 @@
-Generated by gir (https://github.com/gtk-rs/gir @ dcaa0e340516)
-from gir-files (https://github.com/gtk-rs/gir-files @ 58cd940295f0)
+Generated by gir (https://github.com/gtk-rs/gir @ 0f2c059e0939)
+from gir-files (https://github.com/gtk-rs/gir-files @ 615ef8fb32f2)
diff --git a/gdk4-win32/src/auto/enums.rs b/gdk4-win32/src/auto/enums.rs
@@ -3,7 +3,6 @@
 // DO NOT EDIT
 
 use glib::translate::*;
-use std::fmt;
 
 #[derive(Debug, Eq, PartialEq, Ord, PartialOrd, Hash, Clone, Copy)]
 #[non_exhaustive]
@@ -17,20 +16,6 @@ pub enum Win32MessageFilterReturn {
     __Unknown(i32),
 }
 
-impl fmt::Display for Win32MessageFilterReturn {
-    fn fmt(&self, f: &mut fmt::Formatter) -> fmt::Result {
-        write!(
-            f,
-            "Win32MessageFilterReturn::{}",
-            match *self {
-                Self::Continue => "Continue",
-                Self::Remove => "Remove",
-                _ => "Unknown",
-            }
-        )
-    }
-}
-
 #[doc(hidden)]
 impl IntoGlib for Win32MessageFilterReturn {
     type GlibType = ffi::GdkWin32MessageFilterReturn;

diff --git a/gdk4-win32/src/auto/versions.txt b/gdk4-win32/src/auto/versions.txt
@@ -1,2 +1,2 @@
-Generated by gir (https://github.com/gtk-rs/gir @ dcaa0e340516)
-from gir-files (https://github.com/gtk-rs/gir-files @ 58cd940295f0)
+Generated by gir (https://github.com/gtk-rs/gir @ 0f2c059e0939)
+from gir-files (https://github.com/gtk-rs/gir-files @ 615ef8fb32f2)
diff --git a/gdk4-win32/src/auto/win32_display.rs b/gdk4-win32/src/auto/win32_display.rs
@@ -4,7 +4,6 @@
 
 use crate::Win32HCursor;
 use glib::{prelude::*, translate::*};
-use std::{fmt, mem};
 
 glib::wrapper! {
     #[doc(alias = "GdkWin32Display")]
@@ -54,8 +53,8 @@ impl Win32Display {
     pub fn wgl_version(display: &impl IsA<gdk::Display>) -> Option<(i32, i32)> {
         assert_initialized_main_thread!();
         unsafe {
-            let mut major = mem::MaybeUninit::uninit();
-            let mut minor = mem::MaybeUninit::uninit();
+            let mut major = std::mem::MaybeUninit::uninit();
+            let mut minor = std::mem::MaybeUninit::uninit();
             let ret = from_glib(ffi::gdk_win32_display_get_wgl_version(
                 display.as_ref().to_glib_none().0,
                 major.as_mut_ptr(),
@@ -69,9 +68,3 @@ impl Win32Display {
         }
     }
 }
-
-impl fmt::Display for Win32Display {
-    fn fmt(&self, f: &mut fmt::Formatter) -> fmt::Result {
-        f.write_str("Win32Display")
-    }
-}
diff --git a/gdk4-win32/src/auto/win32_display_manager.rs b/gdk4-win32/src/auto/win32_display_manager.rs
@@ -2,8 +2,6 @@
 // from gir-files (https://github.com/gtk-rs/gir-files)
 // DO NOT EDIT
 
-use std::fmt;
-
 glib::wrapper! {
     #[doc(alias = "GdkWin32DisplayManager")]
     pub struct Win32DisplayManager(Object<ffi::GdkWin32DisplayManager, ffi::GdkWin32DisplayManagerClass>) @extends gdk::DisplayManager;
@@ -14,9 +12,3 @@ glib::wrapper! {
 }
 
 impl Win32DisplayManager {}
-
-impl fmt::Display for Win32DisplayManager {
-    fn fmt(&self, f: &mut fmt::Formatter) -> fmt::Result {
-        f.write_str("Win32DisplayManager")
-    }
-}
diff --git a/gdk4-win32/src/auto/win32_drag.rs b/gdk4-win32/src/auto/win32_drag.rs
@@ -2,8 +2,6 @@
 // from gir-files (https://github.com/gtk-rs/gir-files)
 // DO NOT EDIT
 
-use std::fmt;
-
 glib::wrapper! {
     #[doc(alias = "GdkWin32Drag")]
     pub struct Win32Drag(Object<ffi::GdkWin32Drag, ffi::GdkWin32DragClass>) @extends gdk::Drag;
@@ -14,9 +12,3 @@ glib::wrapper! {
 }
 
 impl Win32Drag {}
-
-impl fmt::Display for Win32Drag {
-    fn fmt(&self, f: &mut fmt::Formatter) -> fmt::Result {
-        f.write_str("Win32Drag")
-    }
-}
diff --git a/gdk4-win32/src/auto/win32_gl_context.rs b/gdk4-win32/src/auto/win32_gl_context.rs
@@ -2,8 +2,6 @@
 // from gir-files (https://github.com/gtk-rs/gir-files)
 // DO NOT EDIT
 
-use std::fmt;
-
 glib::wrapper! {
     #[doc(alias = "GdkWin32GLContext")]
     pub struct Win32GLContext(Object<ffi::GdkWin32GLContext, ffi::GdkWin32GLContextClass>) @extends gdk::GLContext, gdk::DrawContext;
@@ -14,9 +12,3 @@ glib::wrapper! {
 }
 
 impl Win32GLContext {}
-
-impl fmt::Display for Win32GLContext {
-    fn fmt(&self, f: &mut fmt::Formatter) -> fmt::Result {
-        f.write_str("Win32GLContext")
-    }
-}
diff --git a/gdk4-win32/src/auto/win32_hcursor.rs b/gdk4-win32/src/auto/win32_hcursor.rs
@@ -3,7 +3,6 @@
 // DO NOT EDIT
 
 use glib::{prelude::*, translate::*};
-use std::fmt;
 
 glib::wrapper! {
     #[doc(alias = "GdkWin32HCursor")]
@@ -23,9 +22,3 @@ impl Win32HCursor {
         ObjectExt::property(self, "display")
     }
 }
-
-impl fmt::Display for Win32HCursor {
-    fn fmt(&self, f: &mut fmt::Formatter) -> fmt::Result {
-        f.write_str("Win32HCursor")
-    }
-}
diff --git a/gdk4-win32/src/auto/win32_monitor.rs b/gdk4-win32/src/auto/win32_monitor.rs
@@ -3,7 +3,6 @@
 // DO NOT EDIT
 
 use glib::{prelude::*, translate::*};
-use std::fmt;
 
 glib::wrapper! {
     #[doc(alias = "GdkWin32Monitor")]
@@ -29,9 +28,3 @@ impl Win32Monitor {
         }
     }
 }
-
-impl fmt::Display for Win32Monitor {
-    fn fmt(&self, f: &mut fmt::Formatter) -> fmt::Result {
-        f.write_str("Win32Monitor")
-    }
-}
diff --git a/gdk4-win32/src/auto/win32_screen.rs b/gdk4-win32/src/auto/win32_screen.rs
@@ -2,8 +2,6 @@
 // from gir-files (https://github.com/gtk-rs/gir-files)
 // DO NOT EDIT
 
-use std::fmt;
-
 glib::wrapper! {
     #[doc(alias = "GdkWin32Screen")]
     pub struct Win32Screen(Object<ffi::GdkWin32Screen, ffi::GdkWin32ScreenClass>);
@@ -14,9 +12,3 @@ glib::wrapper! {
 }
 
 impl Win32Screen {}
-
-impl fmt::Display for Win32Screen {
-    fn fmt(&self, f: &mut fmt::Formatter) -> fmt::Result {
-        f.write_str("Win32Screen")
-    }
-}
diff --git a/gdk4-win32/src/auto/win32_surface.rs b/gdk4-win32/src/auto/win32_surface.rs
@@ -4,7 +4,6 @@
 #![allow(deprecated)]
 
 use glib::{prelude::*, translate::*};
-use std::fmt;
 
 glib::wrapper! {
     #[doc(alias = "GdkWin32Surface")]
@@ -35,9 +34,3 @@ impl Win32Surface {
         }
     }
 }
-
-impl fmt::Display for Win32Surface {
-    fn fmt(&self, f: &mut fmt::Formatter) -> fmt::Result {
-        f.write_str("Win32Surface")
-    }
-}
diff --git a/gdk4-win32/sys/versions.txt b/gdk4-win32/sys/versions.txt
@@ -1,2 +1,2 @@
-Generated by gir (https://github.com/gtk-rs/gir @ dcaa0e340516)
-from gir-files (https://github.com/gtk-rs/gir-files @ 58cd940295f0)
+Generated by gir (https://github.com/gtk-rs/gir @ 0f2c059e0939)
+from gir-files (https://github.com/gtk-rs/gir-files @ 615ef8fb32f2)