diff --git a/gdk4-wayland/src/auto/versions.txt b/gdk4-wayland/src/auto/versions.txt index 17a2d3ead99b..b317bfad4458 100644 --- 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 @ 76bbe9b90aaa) +Generated by gir (https://github.com/gtk-rs/gir @ f477238c6579) from gir-files (https://github.com/gtk-rs/gir-files @ 307566e1ab58) diff --git a/gdk4-wayland/src/auto/wayland_device.rs b/gdk4-wayland/src/auto/wayland_device.rs index 36d2d69a6f88..f3669d7ef57c 100644 --- 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 index fc7fc6335250..b5a4b830822c 100644 --- 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 WaylandDisplay { } } } - -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 index 855be99bef26..9e59ccb1e38c 100644 --- 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) @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 index 7f6e62f5b01a..02170fee1ba4 100644 --- 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) @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 index b4a8701af8cd..6606cbbd82e8 100644 --- 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 index 67c81f881d68..581f4298a5cf 100644 --- 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) @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 index 3bfa85b4c32a..b7736cae9ef3 100644 --- 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) @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 index e0ebfe327bd8..fa18fa50b50f 100644 --- 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 index 17a2d3ead99b..b317bfad4458 100644 --- 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 @ 76bbe9b90aaa) +Generated by gir (https://github.com/gtk-rs/gir @ f477238c6579) from gir-files (https://github.com/gtk-rs/gir-files @ 307566e1ab58) diff --git a/gdk4-win32/src/auto/enums.rs b/gdk4-win32/src/auto/enums.rs index 3c3dbfad37f2..8eec62d54e18 100644 --- 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 index 17a2d3ead99b..b317bfad4458 100644 --- 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 @ 76bbe9b90aaa) +Generated by gir (https://github.com/gtk-rs/gir @ f477238c6579) from gir-files (https://github.com/gtk-rs/gir-files @ 307566e1ab58) diff --git a/gdk4-win32/src/auto/win32_display.rs b/gdk4-win32/src/auto/win32_display.rs index 8d7d16466cf0..8dba28029211 100644 --- a/gdk4-win32/src/auto/win32_display.rs +++ b/gdk4-win32/src/auto/win32_display.rs @@ -4,7 +4,7 @@ use crate::Win32HCursor; use glib::{prelude::*, translate::*}; -use std::{fmt, mem}; +use std::mem; glib::wrapper! { #[doc(alias = "GdkWin32Display")] @@ -69,9 +69,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 index 8ea46fa41da4..b5d03ed73c19 100644 --- 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) @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 index 0dada192f5cf..ed592f0526b7 100644 --- 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) @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 index 126b3ea39c45..a57e10e2fdfc 100644 --- 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) @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 index 3f1f838308f7..ac2b4783080c 100644 --- 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 index 4acf0e374319..b6f3b5b7c5ba 100644 --- 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 index a01744c676f0..7a5d4c71a543 100644 --- 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); @@ -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 index 7fc68f1dab9c..9d5cb38c554d 100644 --- 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/tests/abi.rs b/gdk4-win32/sys/tests/abi.rs index 80a173996660..1341e8714b57 100644 --- a/gdk4-win32/sys/tests/abi.rs +++ b/gdk4-win32/sys/tests/abi.rs @@ -10,7 +10,7 @@ use std::error::Error; use std::ffi::OsString; use std::mem::{align_of, size_of}; use std::path::Path; -use std::process::Command; +use std::process::{Command, Stdio}; use std::str; use tempfile::Builder; @@ -70,9 +70,11 @@ fn pkg_config_cflags(packages: &[&str]) -> Result, Box> { let mut cmd = Command::new(pkg_config); cmd.arg("--cflags"); cmd.args(packages); + cmd.stderr(Stdio::inherit()); let out = cmd.output()?; if !out.status.success() { - return Err(format!("command {cmd:?} returned {}", out.status).into()); + let (status, stdout) = (out.status, String::from_utf8_lossy(&out.stdout)); + return Err(format!("command {cmd:?} failed, {status:?}\nstdout: {stdout}").into()); } let stdout = str::from_utf8(&out.stdout)?; Ok(shell_words::split(stdout.trim())?) @@ -187,13 +189,15 @@ fn get_c_output(name: &str) -> Result> { let cc = Compiler::new().expect("configured compiler"); cc.compile(&c_file, &exe)?; - let mut abi_cmd = Command::new(exe); - let output = abi_cmd.output()?; - if !output.status.success() { - return Err(format!("command {abi_cmd:?} failed, {output:?}").into()); + let mut cmd = Command::new(exe); + cmd.stderr(Stdio::inherit()); + let out = cmd.output()?; + if !out.status.success() { + let (status, stdout) = (out.status, String::from_utf8_lossy(&out.stdout)); + return Err(format!("command {cmd:?} failed, {status:?}\nstdout: {stdout}").into()); } - Ok(String::from_utf8(output.stdout)?) + Ok(String::from_utf8(out.stdout)?) } const RUST_LAYOUTS: &[(&str, Layout)] = &[( diff --git a/gdk4-win32/sys/versions.txt b/gdk4-win32/sys/versions.txt index 17a2d3ead99b..b317bfad4458 100644 --- 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 @ 76bbe9b90aaa) +Generated by gir (https://github.com/gtk-rs/gir @ f477238c6579) from gir-files (https://github.com/gtk-rs/gir-files @ 307566e1ab58) diff --git a/gdk4-x11/src/auto/enums.rs b/gdk4-x11/src/auto/enums.rs index 4bbf82aba6e3..fd25f430a107 100644 --- a/gdk4-x11/src/auto/enums.rs +++ b/gdk4-x11/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] @@ -19,21 +18,6 @@ pub enum X11DeviceType { __Unknown(i32), } -impl fmt::Display for X11DeviceType { - fn fmt(&self, f: &mut fmt::Formatter) -> fmt::Result { - write!( - f, - "X11DeviceType::{}", - match *self { - Self::Logical => "Logical", - Self::Physical => "Physical", - Self::Floating => "Floating", - _ => "Unknown", - } - ) - } -} - #[doc(hidden)] impl IntoGlib for X11DeviceType { type GlibType = ffi::GdkX11DeviceType; diff --git a/gdk4-x11/src/auto/versions.txt b/gdk4-x11/src/auto/versions.txt index 17a2d3ead99b..b317bfad4458 100644 --- a/gdk4-x11/src/auto/versions.txt +++ b/gdk4-x11/src/auto/versions.txt @@ -1,2 +1,2 @@ -Generated by gir (https://github.com/gtk-rs/gir @ 76bbe9b90aaa) +Generated by gir (https://github.com/gtk-rs/gir @ f477238c6579) from gir-files (https://github.com/gtk-rs/gir-files @ 307566e1ab58) diff --git a/gdk4-x11/src/auto/x11_app_launch_context.rs b/gdk4-x11/src/auto/x11_app_launch_context.rs index 7976049dd4ab..cd805ab45d12 100644 --- a/gdk4-x11/src/auto/x11_app_launch_context.rs +++ b/gdk4-x11/src/auto/x11_app_launch_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 = "GdkX11AppLaunchContext")] pub struct X11AppLaunchContext(Object) @extends gdk::AppLaunchContext, gio::AppLaunchContext; @@ -14,9 +12,3 @@ glib::wrapper! { } impl X11AppLaunchContext {} - -impl fmt::Display for X11AppLaunchContext { - fn fmt(&self, f: &mut fmt::Formatter) -> fmt::Result { - f.write_str("X11AppLaunchContext") - } -} diff --git a/gdk4-x11/src/auto/x11_device_manager_xi2.rs b/gdk4-x11/src/auto/x11_device_manager_xi2.rs index c1a222fd82ba..90da8fe9d4bc 100644 --- a/gdk4-x11/src/auto/x11_device_manager_xi2.rs +++ b/gdk4-x11/src/auto/x11_device_manager_xi2.rs @@ -3,7 +3,6 @@ // DO NOT EDIT use glib::{prelude::*, translate::*}; -use std::fmt; glib::wrapper! { #[doc(alias = "GdkX11DeviceManagerXI2")] @@ -87,9 +86,3 @@ impl X11DeviceManagerXI2Builder { self.builder.build() } } - -impl fmt::Display for X11DeviceManagerXI2 { - fn fmt(&self, f: &mut fmt::Formatter) -> fmt::Result { - f.write_str("X11DeviceManagerXI2") - } -} diff --git a/gdk4-x11/src/auto/x11_device_xi2.rs b/gdk4-x11/src/auto/x11_device_xi2.rs index b8456a906d85..b13c3c9bbe63 100644 --- a/gdk4-x11/src/auto/x11_device_xi2.rs +++ b/gdk4-x11/src/auto/x11_device_xi2.rs @@ -3,7 +3,6 @@ // DO NOT EDIT use glib::{prelude::*, translate::*}; -use std::fmt; glib::wrapper! { #[doc(alias = "GdkX11DeviceXI2")] @@ -106,9 +105,3 @@ impl X11DeviceXI2Builder { self.builder.build() } } - -impl fmt::Display for X11DeviceXI2 { - fn fmt(&self, f: &mut fmt::Formatter) -> fmt::Result { - f.write_str("X11DeviceXI2") - } -} diff --git a/gdk4-x11/src/auto/x11_display.rs b/gdk4-x11/src/auto/x11_display.rs index 06b877faaf33..fbf0db529ab7 100644 --- a/gdk4-x11/src/auto/x11_display.rs +++ b/gdk4-x11/src/auto/x11_display.rs @@ -5,7 +5,7 @@ use crate::X11Screen; use glib::translate::*; -use std::{fmt, mem, ptr}; +use std::{mem, ptr}; glib::wrapper! { #[doc(alias = "GdkX11Display")] @@ -226,9 +226,3 @@ impl X11Display { unsafe { from_glib_full(ffi::gdk_x11_display_open(display_name.to_glib_none().0)) } } } - -impl fmt::Display for X11Display { - fn fmt(&self, f: &mut fmt::Formatter) -> fmt::Result { - f.write_str("X11Display") - } -} diff --git a/gdk4-x11/src/auto/x11_drag.rs b/gdk4-x11/src/auto/x11_drag.rs index d302c4932f55..95b4eca6f4fe 100644 --- a/gdk4-x11/src/auto/x11_drag.rs +++ b/gdk4-x11/src/auto/x11_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 = "GdkX11Drag")] pub struct X11Drag(Object) @extends gdk::Drag; @@ -14,9 +12,3 @@ glib::wrapper! { } impl X11Drag {} - -impl fmt::Display for X11Drag { - fn fmt(&self, f: &mut fmt::Formatter) -> fmt::Result { - f.write_str("X11Drag") - } -} diff --git a/gdk4-x11/src/auto/x11_monitor.rs b/gdk4-x11/src/auto/x11_monitor.rs index bba4e100aa36..667eb60220eb 100644 --- a/gdk4-x11/src/auto/x11_monitor.rs +++ b/gdk4-x11/src/auto/x11_monitor.rs @@ -3,7 +3,6 @@ // DO NOT EDIT use glib::translate::*; -use std::fmt; glib::wrapper! { #[doc(alias = "GdkX11Monitor")] @@ -25,9 +24,3 @@ impl X11Monitor { } } } - -impl fmt::Display for X11Monitor { - fn fmt(&self, f: &mut fmt::Formatter) -> fmt::Result { - f.write_str("X11Monitor") - } -} diff --git a/gdk4-x11/src/auto/x11_screen.rs b/gdk4-x11/src/auto/x11_screen.rs index 7060297a21d0..1d09b90e0124 100644 --- a/gdk4-x11/src/auto/x11_screen.rs +++ b/gdk4-x11/src/auto/x11_screen.rs @@ -7,7 +7,7 @@ use glib::{ signal::{connect_raw, SignalHandlerId}, translate::*, }; -use std::{boxed::Box as Box_, fmt, mem::transmute}; +use std::{boxed::Box as Box_, mem::transmute}; glib::wrapper! { #[doc(alias = "GdkX11Screen")] @@ -79,9 +79,3 @@ impl X11Screen { } } } - -impl fmt::Display for X11Screen { - fn fmt(&self, f: &mut fmt::Formatter) -> fmt::Result { - f.write_str("X11Screen") - } -} diff --git a/gdk4-x11/src/auto/x11_surface.rs b/gdk4-x11/src/auto/x11_surface.rs index 6ad89e40cbca..6c9dfbd496c0 100644 --- a/gdk4-x11/src/auto/x11_surface.rs +++ b/gdk4-x11/src/auto/x11_surface.rs @@ -3,7 +3,6 @@ // DO NOT EDIT use glib::{prelude::*, translate::*}; -use std::fmt; glib::wrapper! { #[doc(alias = "GdkX11Surface")] @@ -110,9 +109,3 @@ impl X11Surface { } } } - -impl fmt::Display for X11Surface { - fn fmt(&self, f: &mut fmt::Formatter) -> fmt::Result { - f.write_str("X11Surface") - } -} diff --git a/gdk4-x11/src/auto/x11gl_context.rs b/gdk4-x11/src/auto/x11gl_context.rs index 1a6bfe2d6246..d6eaf87600bf 100644 --- a/gdk4-x11/src/auto/x11gl_context.rs +++ b/gdk4-x11/src/auto/x11gl_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 = "GdkX11GLContext")] pub struct X11GLContext(Object) @extends gdk::GLContext, gdk::DrawContext; @@ -14,9 +12,3 @@ glib::wrapper! { } impl X11GLContext {} - -impl fmt::Display for X11GLContext { - fn fmt(&self, f: &mut fmt::Formatter) -> fmt::Result { - f.write_str("X11GLContext") - } -} diff --git a/gdk4-x11/sys/tests/abi.rs b/gdk4-x11/sys/tests/abi.rs index a1bcfb231023..1a0ce4eee04a 100644 --- a/gdk4-x11/sys/tests/abi.rs +++ b/gdk4-x11/sys/tests/abi.rs @@ -10,7 +10,7 @@ use std::error::Error; use std::ffi::OsString; use std::mem::{align_of, size_of}; use std::path::Path; -use std::process::Command; +use std::process::{Command, Stdio}; use std::str; use tempfile::Builder; @@ -70,9 +70,11 @@ fn pkg_config_cflags(packages: &[&str]) -> Result, Box> { let mut cmd = Command::new(pkg_config); cmd.arg("--cflags"); cmd.args(packages); + cmd.stderr(Stdio::inherit()); let out = cmd.output()?; if !out.status.success() { - return Err(format!("command {cmd:?} returned {}", out.status).into()); + let (status, stdout) = (out.status, String::from_utf8_lossy(&out.stdout)); + return Err(format!("command {cmd:?} failed, {status:?}\nstdout: {stdout}").into()); } let stdout = str::from_utf8(&out.stdout)?; Ok(shell_words::split(stdout.trim())?) @@ -187,13 +189,15 @@ fn get_c_output(name: &str) -> Result> { let cc = Compiler::new().expect("configured compiler"); cc.compile(&c_file, &exe)?; - let mut abi_cmd = Command::new(exe); - let output = abi_cmd.output()?; - if !output.status.success() { - return Err(format!("command {abi_cmd:?} failed, {output:?}").into()); + let mut cmd = Command::new(exe); + cmd.stderr(Stdio::inherit()); + let out = cmd.output()?; + if !out.status.success() { + let (status, stdout) = (out.status, String::from_utf8_lossy(&out.stdout)); + return Err(format!("command {cmd:?} failed, {status:?}\nstdout: {stdout}").into()); } - Ok(String::from_utf8(output.stdout)?) + Ok(String::from_utf8(out.stdout)?) } const RUST_LAYOUTS: &[(&str, Layout)] = &[( diff --git a/gdk4-x11/sys/versions.txt b/gdk4-x11/sys/versions.txt index 17a2d3ead99b..b317bfad4458 100644 --- a/gdk4-x11/sys/versions.txt +++ b/gdk4-x11/sys/versions.txt @@ -1,2 +1,2 @@ -Generated by gir (https://github.com/gtk-rs/gir @ 76bbe9b90aaa) +Generated by gir (https://github.com/gtk-rs/gir @ f477238c6579) from gir-files (https://github.com/gtk-rs/gir-files @ 307566e1ab58) diff --git a/gdk4/src/auto/app_launch_context.rs b/gdk4/src/auto/app_launch_context.rs index 505effd3b46a..c1e77483fc02 100644 --- a/gdk4/src/auto/app_launch_context.rs +++ b/gdk4/src/auto/app_launch_context.rs @@ -4,7 +4,6 @@ use crate::Display; use glib::{prelude::*, translate::*}; -use std::fmt; glib::wrapper! { #[doc(alias = "GdkAppLaunchContext")] @@ -71,9 +70,3 @@ pub trait GdkAppLaunchContextExt: IsA + sealed::Sealed + 'stat } impl> GdkAppLaunchContextExt for O {} - -impl fmt::Display for AppLaunchContext { - fn fmt(&self, f: &mut fmt::Formatter) -> fmt::Result { - f.write_str("AppLaunchContext") - } -} diff --git a/gdk4/src/auto/button_event.rs b/gdk4/src/auto/button_event.rs index 43945a771768..c9772b6803f3 100644 --- a/gdk4/src/auto/button_event.rs +++ b/gdk4/src/auto/button_event.rs @@ -3,7 +3,6 @@ // DO NOT EDIT use glib::translate::*; -use std::fmt; glib::wrapper! { #[doc(alias = "GdkButtonEvent")] @@ -28,9 +27,3 @@ impl ButtonEvent { unsafe { ffi::gdk_button_event_get_button(self.to_glib_none().0) } } } - -impl fmt::Display for ButtonEvent { - fn fmt(&self, f: &mut fmt::Formatter) -> fmt::Result { - f.write_str("ButtonEvent") - } -} diff --git a/gdk4/src/auto/cairo_context.rs b/gdk4/src/auto/cairo_context.rs index 9476f4cb3b20..8b1ac33c55c6 100644 --- a/gdk4/src/auto/cairo_context.rs +++ b/gdk4/src/auto/cairo_context.rs @@ -4,7 +4,6 @@ use crate::DrawContext; use glib::translate::*; -use std::fmt; glib::wrapper! { #[doc(alias = "GdkCairoContext")] @@ -21,9 +20,3 @@ impl CairoContext { unsafe { from_glib_full(ffi::gdk_cairo_context_cairo_create(self.to_glib_none().0)) } } } - -impl fmt::Display for CairoContext { - fn fmt(&self, f: &mut fmt::Formatter) -> fmt::Result { - f.write_str("CairoContext") - } -} diff --git a/gdk4/src/auto/clipboard.rs b/gdk4/src/auto/clipboard.rs index 3a12bd44354b..8961c85114b9 100644 --- a/gdk4/src/auto/clipboard.rs +++ b/gdk4/src/auto/clipboard.rs @@ -8,7 +8,7 @@ use glib::{ signal::{connect_raw, SignalHandlerId}, translate::*, }; -use std::{boxed::Box as Box_, fmt, mem::transmute, pin::Pin, ptr}; +use std::{boxed::Box as Box_, mem::transmute, pin::Pin, ptr}; glib::wrapper! { #[doc(alias = "GdkClipboard")] @@ -417,9 +417,3 @@ impl Clipboard { } } } - -impl fmt::Display for Clipboard { - fn fmt(&self, f: &mut fmt::Formatter) -> fmt::Result { - f.write_str("Clipboard") - } -} diff --git a/gdk4/src/auto/content_deserializer.rs b/gdk4/src/auto/content_deserializer.rs index 8b2f389af1ba..788c0df945a1 100644 --- a/gdk4/src/auto/content_deserializer.rs +++ b/gdk4/src/auto/content_deserializer.rs @@ -3,7 +3,6 @@ // DO NOT EDIT use glib::translate::*; -use std::fmt; glib::wrapper! { #[doc(alias = "GdkContentDeserializer")] @@ -72,9 +71,3 @@ impl ContentDeserializer { } } } - -impl fmt::Display for ContentDeserializer { - fn fmt(&self, f: &mut fmt::Formatter) -> fmt::Result { - f.write_str("ContentDeserializer") - } -} diff --git a/gdk4/src/auto/content_provider.rs b/gdk4/src/auto/content_provider.rs index 572eb4a136e0..6cadbbe326c2 100644 --- a/gdk4/src/auto/content_provider.rs +++ b/gdk4/src/auto/content_provider.rs @@ -8,7 +8,7 @@ use glib::{ signal::{connect_raw, SignalHandlerId}, translate::*, }; -use std::{boxed::Box as Box_, fmt, mem::transmute, pin::Pin, ptr}; +use std::{boxed::Box as Box_, mem::transmute, pin::Pin, ptr}; glib::wrapper! { #[doc(alias = "GdkContentProvider")] @@ -249,9 +249,3 @@ pub trait ContentProviderExt: IsA + sealed::Sealed + 'static { } impl> ContentProviderExt for O {} - -impl fmt::Display for ContentProvider { - fn fmt(&self, f: &mut fmt::Formatter) -> fmt::Result { - f.write_str("ContentProvider") - } -} diff --git a/gdk4/src/auto/content_serializer.rs b/gdk4/src/auto/content_serializer.rs index 24cf22614cc4..0d69a86ca5d5 100644 --- a/gdk4/src/auto/content_serializer.rs +++ b/gdk4/src/auto/content_serializer.rs @@ -3,7 +3,6 @@ // DO NOT EDIT use glib::translate::*; -use std::fmt; glib::wrapper! { #[doc(alias = "GdkContentSerializer")] @@ -64,9 +63,3 @@ impl ContentSerializer { } } } - -impl fmt::Display for ContentSerializer { - fn fmt(&self, f: &mut fmt::Formatter) -> fmt::Result { - f.write_str("ContentSerializer") - } -} diff --git a/gdk4/src/auto/crossing_event.rs b/gdk4/src/auto/crossing_event.rs index a66acbc7860c..74e20c569e7c 100644 --- a/gdk4/src/auto/crossing_event.rs +++ b/gdk4/src/auto/crossing_event.rs @@ -4,7 +4,6 @@ use crate::{CrossingMode, NotifyType}; use glib::translate::*; -use std::fmt; glib::wrapper! { #[doc(alias = "GdkCrossingEvent")] @@ -41,9 +40,3 @@ impl CrossingEvent { unsafe { from_glib(ffi::gdk_crossing_event_get_mode(self.to_glib_none().0)) } } } - -impl fmt::Display for CrossingEvent { - fn fmt(&self, f: &mut fmt::Formatter) -> fmt::Result { - f.write_str("CrossingEvent") - } -} diff --git a/gdk4/src/auto/cursor.rs b/gdk4/src/auto/cursor.rs index a31b878d112a..72ae9db76bbb 100644 --- a/gdk4/src/auto/cursor.rs +++ b/gdk4/src/auto/cursor.rs @@ -4,7 +4,6 @@ use crate::Texture; use glib::{prelude::*, translate::*}; -use std::fmt; glib::wrapper! { #[doc(alias = "GdkCursor")] @@ -140,9 +139,3 @@ impl CursorBuilder { self.builder.build() } } - -impl fmt::Display for Cursor { - fn fmt(&self, f: &mut fmt::Formatter) -> fmt::Result { - f.write_str("Cursor") - } -} diff --git a/gdk4/src/auto/delete_event.rs b/gdk4/src/auto/delete_event.rs index f818dab8c7d0..0ce292e13ea8 100644 --- a/gdk4/src/auto/delete_event.rs +++ b/gdk4/src/auto/delete_event.rs @@ -3,7 +3,6 @@ // DO NOT EDIT use glib::translate::*; -use std::fmt; glib::wrapper! { #[doc(alias = "GdkDeleteEvent")] @@ -22,9 +21,3 @@ impl glib::StaticType for DeleteEvent { } impl DeleteEvent {} - -impl fmt::Display for DeleteEvent { - fn fmt(&self, f: &mut fmt::Formatter) -> fmt::Result { - f.write_str("DeleteEvent") - } -} diff --git a/gdk4/src/auto/device_pad.rs b/gdk4/src/auto/device_pad.rs index eb1f5b249554..3f80e4b2f674 100644 --- a/gdk4/src/auto/device_pad.rs +++ b/gdk4/src/auto/device_pad.rs @@ -4,7 +4,6 @@ use crate::{Device, DevicePadFeature}; use glib::{prelude::*, translate::*}; -use std::fmt; glib::wrapper! { #[doc(alias = "GdkDevicePad")] @@ -59,9 +58,3 @@ pub trait DevicePadExt: IsA + sealed::Sealed + 'static { } impl> DevicePadExt for O {} - -impl fmt::Display for DevicePad { - fn fmt(&self, f: &mut fmt::Formatter) -> fmt::Result { - f.write_str("DevicePad") - } -} diff --git a/gdk4/src/auto/device_tool.rs b/gdk4/src/auto/device_tool.rs index 5415302ad407..05e86d012085 100644 --- a/gdk4/src/auto/device_tool.rs +++ b/gdk4/src/auto/device_tool.rs @@ -4,7 +4,6 @@ use crate::{AxisFlags, DeviceToolType}; use glib::translate::*; -use std::fmt; glib::wrapper! { #[doc(alias = "GdkDeviceTool")] @@ -40,9 +39,3 @@ impl DeviceTool { unsafe { from_glib(ffi::gdk_device_tool_get_tool_type(self.to_glib_none().0)) } } } - -impl fmt::Display for DeviceTool { - fn fmt(&self, f: &mut fmt::Formatter) -> fmt::Result { - f.write_str("DeviceTool") - } -} diff --git a/gdk4/src/auto/display_manager.rs b/gdk4/src/auto/display_manager.rs index 242bb593ee04..afaccf1ddd9e 100644 --- a/gdk4/src/auto/display_manager.rs +++ b/gdk4/src/auto/display_manager.rs @@ -8,7 +8,7 @@ use glib::{ signal::{connect_raw, SignalHandlerId}, translate::*, }; -use std::{boxed::Box as Box_, fmt, mem::transmute}; +use std::{boxed::Box as Box_, mem::transmute}; glib::wrapper! { #[doc(alias = "GdkDisplayManager")] @@ -116,9 +116,3 @@ impl DisplayManager { } } } - -impl fmt::Display for DisplayManager { - fn fmt(&self, f: &mut fmt::Formatter) -> fmt::Result { - f.write_str("DisplayManager") - } -} diff --git a/gdk4/src/auto/dnd_event.rs b/gdk4/src/auto/dnd_event.rs index 7be53ab2dcc4..d216814a28d8 100644 --- a/gdk4/src/auto/dnd_event.rs +++ b/gdk4/src/auto/dnd_event.rs @@ -4,7 +4,6 @@ use crate::Drop; use glib::translate::*; -use std::fmt; glib::wrapper! { #[doc(alias = "GdkDNDEvent")] @@ -29,9 +28,3 @@ impl DNDEvent { unsafe { from_glib_none(ffi::gdk_dnd_event_get_drop(self.to_glib_none().0)) } } } - -impl fmt::Display for DNDEvent { - fn fmt(&self, f: &mut fmt::Formatter) -> fmt::Result { - f.write_str("DNDEvent") - } -} diff --git a/gdk4/src/auto/drag.rs b/gdk4/src/auto/drag.rs index 94834d70624f..15504df9a129 100644 --- a/gdk4/src/auto/drag.rs +++ b/gdk4/src/auto/drag.rs @@ -10,7 +10,7 @@ use glib::{ signal::{connect_raw, SignalHandlerId}, translate::*, }; -use std::{boxed::Box as Box_, fmt, mem::transmute}; +use std::{boxed::Box as Box_, mem::transmute}; glib::wrapper! { #[doc(alias = "GdkDrag")] @@ -279,9 +279,3 @@ pub trait DragExt: IsA + sealed::Sealed + 'static { } impl> DragExt for O {} - -impl fmt::Display for Drag { - fn fmt(&self, f: &mut fmt::Formatter) -> fmt::Result { - f.write_str("Drag") - } -} diff --git a/gdk4/src/auto/drag_surface.rs b/gdk4/src/auto/drag_surface.rs index 8a48945c8b8d..f3103bf6ebc3 100644 --- a/gdk4/src/auto/drag_surface.rs +++ b/gdk4/src/auto/drag_surface.rs @@ -4,7 +4,6 @@ use crate::Surface; use glib::{prelude::*, translate::*}; -use std::fmt; glib::wrapper! { #[doc(alias = "GdkDragSurface")] @@ -38,9 +37,3 @@ pub trait DragSurfaceExt: IsA + sealed::Sealed + 'static { } impl> DragSurfaceExt for O {} - -impl fmt::Display for DragSurface { - fn fmt(&self, f: &mut fmt::Formatter) -> fmt::Result { - f.write_str("DragSurface") - } -} diff --git a/gdk4/src/auto/draw_context.rs b/gdk4/src/auto/draw_context.rs index 4d5809e09190..f61eb7e33004 100644 --- a/gdk4/src/auto/draw_context.rs +++ b/gdk4/src/auto/draw_context.rs @@ -4,7 +4,6 @@ use crate::{Display, Surface}; use glib::{prelude::*, translate::*}; -use std::fmt; glib::wrapper! { #[doc(alias = "GdkDrawContext")] @@ -73,9 +72,3 @@ pub trait DrawContextExt: IsA + sealed::Sealed + 'static { } impl> DrawContextExt for O {} - -impl fmt::Display for DrawContext { - fn fmt(&self, f: &mut fmt::Formatter) -> fmt::Result { - f.write_str("DrawContext") - } -} diff --git a/gdk4/src/auto/drop.rs b/gdk4/src/auto/drop.rs index 55cb3b86f8e0..3b125a13a183 100644 --- a/gdk4/src/auto/drop.rs +++ b/gdk4/src/auto/drop.rs @@ -8,7 +8,7 @@ use glib::{ signal::{connect_raw, SignalHandlerId}, translate::*, }; -use std::{boxed::Box as Box_, fmt, mem::transmute, pin::Pin, ptr}; +use std::{boxed::Box as Box_, mem::transmute, pin::Pin, ptr}; glib::wrapper! { #[doc(alias = "GdkDrop")] @@ -162,9 +162,3 @@ impl Drop { } } } - -impl fmt::Display for Drop { - fn fmt(&self, f: &mut fmt::Formatter) -> fmt::Result { - f.write_str("Drop") - } -} diff --git a/gdk4/src/auto/enums.rs b/gdk4/src/auto/enums.rs index 0f171e3c7a45..a8040ea7a868 100644 --- a/gdk4/src/auto/enums.rs +++ b/gdk4/src/auto/enums.rs @@ -3,7 +3,6 @@ // DO NOT EDIT use glib::{prelude::*, translate::*}; -use std::fmt; #[derive(Debug, Eq, PartialEq, Ord, PartialOrd, Hash, Clone, Copy)] #[non_exhaustive] @@ -37,30 +36,6 @@ pub enum AxisUse { __Unknown(i32), } -impl fmt::Display for AxisUse { - fn fmt(&self, f: &mut fmt::Formatter) -> fmt::Result { - write!( - f, - "AxisUse::{}", - match *self { - Self::Ignore => "Ignore", - Self::X => "X", - Self::Y => "Y", - Self::DeltaX => "DeltaX", - Self::DeltaY => "DeltaY", - Self::Pressure => "Pressure", - Self::Xtilt => "Xtilt", - Self::Ytilt => "Ytilt", - Self::Wheel => "Wheel", - Self::Distance => "Distance", - Self::Rotation => "Rotation", - Self::Slider => "Slider", - _ => "Unknown", - } - ) - } -} - #[doc(hidden)] impl IntoGlib for AxisUse { type GlibType = ffi::GdkAxisUse; @@ -190,27 +165,6 @@ pub enum CrossingMode { __Unknown(i32), } -impl fmt::Display for CrossingMode { - fn fmt(&self, f: &mut fmt::Formatter) -> fmt::Result { - write!( - f, - "CrossingMode::{}", - match *self { - Self::Normal => "Normal", - Self::Grab => "Grab", - Self::Ungrab => "Ungrab", - Self::GtkGrab => "GtkGrab", - Self::GtkUngrab => "GtkUngrab", - Self::StateChanged => "StateChanged", - Self::TouchBegin => "TouchBegin", - Self::TouchEnd => "TouchEnd", - Self::DeviceSwitch => "DeviceSwitch", - _ => "Unknown", - } - ) - } -} - #[doc(hidden)] impl IntoGlib for CrossingMode { type GlibType = ffi::GdkCrossingMode; @@ -322,21 +276,6 @@ pub enum DevicePadFeature { __Unknown(i32), } -impl fmt::Display for DevicePadFeature { - fn fmt(&self, f: &mut fmt::Formatter) -> fmt::Result { - write!( - f, - "DevicePadFeature::{}", - match *self { - Self::Button => "Button", - Self::Ring => "Ring", - Self::Strip => "Strip", - _ => "Unknown", - } - ) - } -} - #[doc(hidden)] impl IntoGlib for DevicePadFeature { type GlibType = ffi::GdkDevicePadFeature; @@ -446,26 +385,6 @@ pub enum DeviceToolType { __Unknown(i32), } -impl fmt::Display for DeviceToolType { - fn fmt(&self, f: &mut fmt::Formatter) -> fmt::Result { - write!( - f, - "DeviceToolType::{}", - match *self { - Self::Unknown => "Unknown", - Self::Pen => "Pen", - Self::Eraser => "Eraser", - Self::Brush => "Brush", - Self::Pencil => "Pencil", - Self::Airbrush => "Airbrush", - Self::Mouse => "Mouse", - Self::Lens => "Lens", - _ => "Unknown", - } - ) - } -} - #[doc(hidden)] impl IntoGlib for DeviceToolType { type GlibType = ffi::GdkDeviceToolType; @@ -575,21 +494,6 @@ pub enum DragCancelReason { __Unknown(i32), } -impl fmt::Display for DragCancelReason { - fn fmt(&self, f: &mut fmt::Formatter) -> fmt::Result { - write!( - f, - "DragCancelReason::{}", - match *self { - Self::NoTarget => "NoTarget", - Self::UserCancelled => "UserCancelled", - Self::Error => "Error", - _ => "Unknown", - } - ) - } -} - #[doc(hidden)] impl IntoGlib for DragCancelReason { type GlibType = ffi::GdkDragCancelReason; @@ -743,48 +647,6 @@ pub enum EventType { __Unknown(i32), } -impl fmt::Display for EventType { - fn fmt(&self, f: &mut fmt::Formatter) -> fmt::Result { - write!( - f, - "EventType::{}", - match *self { - Self::Delete => "Delete", - Self::MotionNotify => "MotionNotify", - Self::ButtonPress => "ButtonPress", - Self::ButtonRelease => "ButtonRelease", - Self::KeyPress => "KeyPress", - Self::KeyRelease => "KeyRelease", - Self::EnterNotify => "EnterNotify", - Self::LeaveNotify => "LeaveNotify", - Self::FocusChange => "FocusChange", - Self::ProximityIn => "ProximityIn", - Self::ProximityOut => "ProximityOut", - Self::DragEnter => "DragEnter", - Self::DragLeave => "DragLeave", - Self::DragMotion => "DragMotion", - Self::DropStart => "DropStart", - Self::Scroll => "Scroll", - Self::GrabBroken => "GrabBroken", - Self::TouchBegin => "TouchBegin", - Self::TouchUpdate => "TouchUpdate", - Self::TouchEnd => "TouchEnd", - Self::TouchCancel => "TouchCancel", - Self::TouchpadSwipe => "TouchpadSwipe", - Self::TouchpadPinch => "TouchpadPinch", - Self::PadButtonPress => "PadButtonPress", - Self::PadButtonRelease => "PadButtonRelease", - Self::PadRing => "PadRing", - Self::PadStrip => "PadStrip", - Self::PadGroupMode => "PadGroupMode", - #[cfg(feature = "v4_8")] - Self::TouchpadHold => "TouchpadHold", - _ => "Unknown", - } - ) - } -} - #[doc(hidden)] impl IntoGlib for EventType { type GlibType = ffi::GdkEventType; @@ -934,20 +796,6 @@ pub enum FullscreenMode { __Unknown(i32), } -impl fmt::Display for FullscreenMode { - fn fmt(&self, f: &mut fmt::Formatter) -> fmt::Result { - write!( - f, - "FullscreenMode::{}", - match *self { - Self::CurrentMonitor => "CurrentMonitor", - Self::AllMonitors => "AllMonitors", - _ => "Unknown", - } - ) - } -} - #[doc(hidden)] impl IntoGlib for FullscreenMode { type GlibType = ffi::GdkFullscreenMode; @@ -1049,23 +897,6 @@ pub enum GLError { __Unknown(i32), } -impl fmt::Display for GLError { - fn fmt(&self, f: &mut fmt::Formatter) -> fmt::Result { - write!( - f, - "GLError::{}", - match *self { - Self::NotAvailable => "NotAvailable", - Self::UnsupportedFormat => "UnsupportedFormat", - Self::UnsupportedProfile => "UnsupportedProfile", - Self::CompilationFailed => "CompilationFailed", - Self::LinkFailed => "LinkFailed", - _ => "Unknown", - } - ) - } -} - #[doc(hidden)] impl IntoGlib for GLError { type GlibType = ffi::GdkGLError; @@ -1206,28 +1037,6 @@ pub enum Gravity { __Unknown(i32), } -impl fmt::Display for Gravity { - fn fmt(&self, f: &mut fmt::Formatter) -> fmt::Result { - write!( - f, - "Gravity::{}", - match *self { - Self::NorthWest => "NorthWest", - Self::North => "North", - Self::NorthEast => "NorthEast", - Self::West => "West", - Self::Center => "Center", - Self::East => "East", - Self::SouthWest => "SouthWest", - Self::South => "South", - Self::SouthEast => "SouthEast", - Self::Static => "Static", - _ => "Unknown", - } - ) - } -} - #[doc(hidden)] impl IntoGlib for Gravity { type GlibType = ffi::GdkGravity; @@ -1349,25 +1158,6 @@ pub enum InputSource { __Unknown(i32), } -impl fmt::Display for InputSource { - fn fmt(&self, f: &mut fmt::Formatter) -> fmt::Result { - write!( - f, - "InputSource::{}", - match *self { - Self::Mouse => "Mouse", - Self::Pen => "Pen", - Self::Keyboard => "Keyboard", - Self::Touchscreen => "Touchscreen", - Self::Touchpad => "Touchpad", - Self::Trackpoint => "Trackpoint", - Self::TabletPad => "TabletPad", - _ => "Unknown", - } - ) - } -} - #[doc(hidden)] impl IntoGlib for InputSource { type GlibType = ffi::GdkInputSource; @@ -1475,21 +1265,6 @@ pub enum KeyMatch { __Unknown(i32), } -impl fmt::Display for KeyMatch { - fn fmt(&self, f: &mut fmt::Formatter) -> fmt::Result { - write!( - f, - "KeyMatch::{}", - match *self { - Self::None => "None", - Self::Partial => "Partial", - Self::Exact => "Exact", - _ => "Unknown", - } - ) - } -} - #[doc(hidden)] impl IntoGlib for KeyMatch { type GlibType = ffi::GdkKeyMatch; @@ -1677,65 +1452,6 @@ pub enum MemoryFormat { __Unknown(i32), } -impl fmt::Display for MemoryFormat { - fn fmt(&self, f: &mut fmt::Formatter) -> fmt::Result { - write!( - f, - "MemoryFormat::{}", - match *self { - Self::B8g8r8a8Premultiplied => "B8g8r8a8Premultiplied", - Self::A8r8g8b8Premultiplied => "A8r8g8b8Premultiplied", - Self::R8g8b8a8Premultiplied => "R8g8b8a8Premultiplied", - Self::B8g8r8a8 => "B8g8r8a8", - Self::A8r8g8b8 => "A8r8g8b8", - Self::R8g8b8a8 => "R8g8b8a8", - Self::A8b8g8r8 => "A8b8g8r8", - Self::R8g8b8 => "R8g8b8", - Self::B8g8r8 => "B8g8r8", - #[cfg(feature = "v4_6")] - Self::R16g16b16 => "R16g16b16", - #[cfg(feature = "v4_6")] - Self::R16g16b16a16Premultiplied => "R16g16b16a16Premultiplied", - #[cfg(feature = "v4_6")] - Self::R16g16b16a16 => "R16g16b16a16", - #[cfg(feature = "v4_6")] - Self::R16g16b16Float => "R16g16b16Float", - #[cfg(feature = "v4_6")] - Self::R16g16b16a16FloatPremultiplied => "R16g16b16a16FloatPremultiplied", - #[cfg(feature = "v4_6")] - Self::R16g16b16a16Float => "R16g16b16a16Float", - #[cfg(feature = "v4_6")] - Self::R32g32b32Float => "R32g32b32Float", - #[cfg(feature = "v4_6")] - Self::R32g32b32a32FloatPremultiplied => "R32g32b32a32FloatPremultiplied", - #[cfg(feature = "v4_6")] - Self::R32g32b32a32Float => "R32g32b32a32Float", - #[cfg(feature = "v4_12")] - Self::G8a8Premultiplied => "G8a8Premultiplied", - #[cfg(feature = "v4_12")] - Self::G8a8 => "G8a8", - #[cfg(feature = "v4_12")] - Self::G8 => "G8", - #[cfg(feature = "v4_12")] - Self::G16a16Premultiplied => "G16a16Premultiplied", - #[cfg(feature = "v4_12")] - Self::G16a16 => "G16a16", - #[cfg(feature = "v4_12")] - Self::G16 => "G16", - #[cfg(feature = "v4_12")] - Self::A8 => "A8", - #[cfg(feature = "v4_12")] - Self::A16 => "A16", - #[cfg(feature = "v4_12")] - Self::A16Float => "A16Float", - #[cfg(feature = "v4_12")] - Self::A32Float => "A32Float", - _ => "Unknown", - } - ) - } -} - #[doc(hidden)] impl IntoGlib for MemoryFormat { type GlibType = ffi::GdkMemoryFormat; @@ -1935,24 +1651,6 @@ pub enum NotifyType { __Unknown(i32), } -impl fmt::Display for NotifyType { - fn fmt(&self, f: &mut fmt::Formatter) -> fmt::Result { - write!( - f, - "NotifyType::{}", - match *self { - Self::Ancestor => "Ancestor", - Self::Virtual => "Virtual", - Self::Inferior => "Inferior", - Self::Nonlinear => "Nonlinear", - Self::NonlinearVirtual => "NonlinearVirtual", - Self::Unknown => "Unknown", - _ => "Unknown", - } - ) - } -} - #[doc(hidden)] impl IntoGlib for NotifyType { type GlibType = ffi::GdkNotifyType; @@ -2062,23 +1760,6 @@ pub enum ScrollDirection { __Unknown(i32), } -impl fmt::Display for ScrollDirection { - fn fmt(&self, f: &mut fmt::Formatter) -> fmt::Result { - write!( - f, - "ScrollDirection::{}", - match *self { - Self::Up => "Up", - Self::Down => "Down", - Self::Left => "Left", - Self::Right => "Right", - Self::Smooth => "Smooth", - _ => "Unknown", - } - ) - } -} - #[doc(hidden)] impl IntoGlib for ScrollDirection { type GlibType = ffi::GdkScrollDirection; @@ -2182,22 +1863,6 @@ pub enum ScrollUnit { __Unknown(i32), } -#[cfg(feature = "v4_8")] -#[cfg_attr(docsrs, doc(cfg(feature = "v4_8")))] -impl fmt::Display for ScrollUnit { - fn fmt(&self, f: &mut fmt::Formatter) -> fmt::Result { - write!( - f, - "ScrollUnit::{}", - match *self { - Self::Wheel => "Wheel", - Self::Surface => "Surface", - _ => "Unknown", - } - ) - } -} - #[cfg(feature = "v4_8")] #[cfg_attr(docsrs, doc(cfg(feature = "v4_8")))] #[doc(hidden)] @@ -2317,24 +1982,6 @@ pub enum SubpixelLayout { __Unknown(i32), } -impl fmt::Display for SubpixelLayout { - fn fmt(&self, f: &mut fmt::Formatter) -> fmt::Result { - write!( - f, - "SubpixelLayout::{}", - match *self { - Self::Unknown => "Unknown", - Self::None => "None", - Self::HorizontalRgb => "HorizontalRgb", - Self::HorizontalBgr => "HorizontalBgr", - Self::VerticalRgb => "VerticalRgb", - Self::VerticalBgr => "VerticalBgr", - _ => "Unknown", - } - ) - } -} - #[doc(hidden)] impl IntoGlib for SubpixelLayout { type GlibType = ffi::GdkSubpixelLayout; @@ -2450,26 +2097,6 @@ pub enum SurfaceEdge { __Unknown(i32), } -impl fmt::Display for SurfaceEdge { - fn fmt(&self, f: &mut fmt::Formatter) -> fmt::Result { - write!( - f, - "SurfaceEdge::{}", - match *self { - Self::NorthWest => "NorthWest", - Self::North => "North", - Self::NorthEast => "NorthEast", - Self::West => "West", - Self::East => "East", - Self::SouthWest => "SouthWest", - Self::South => "South", - Self::SouthEast => "SouthEast", - _ => "Unknown", - } - ) - } -} - #[doc(hidden)] impl IntoGlib for SurfaceEdge { type GlibType = ffi::GdkSurfaceEdge; @@ -2583,24 +2210,6 @@ pub enum TextureError { __Unknown(i32), } -#[cfg(feature = "v4_6")] -#[cfg_attr(docsrs, doc(cfg(feature = "v4_6")))] -impl fmt::Display for TextureError { - fn fmt(&self, f: &mut fmt::Formatter) -> fmt::Result { - write!( - f, - "TextureError::{}", - match *self { - Self::TooLarge => "TooLarge", - Self::CorruptImage => "CorruptImage", - Self::UnsupportedContent => "UnsupportedContent", - Self::UnsupportedFormat => "UnsupportedFormat", - _ => "Unknown", - } - ) - } -} - #[cfg(feature = "v4_6")] #[cfg_attr(docsrs, doc(cfg(feature = "v4_6")))] #[doc(hidden)] @@ -2745,23 +2354,6 @@ pub enum TitlebarGesture { __Unknown(i32), } -#[cfg(feature = "v4_4")] -#[cfg_attr(docsrs, doc(cfg(feature = "v4_4")))] -impl fmt::Display for TitlebarGesture { - fn fmt(&self, f: &mut fmt::Formatter) -> fmt::Result { - write!( - f, - "TitlebarGesture::{}", - match *self { - Self::DoubleClick => "DoubleClick", - Self::RightClick => "RightClick", - Self::MiddleClick => "MiddleClick", - _ => "Unknown", - } - ) - } -} - #[cfg(feature = "v4_4")] #[cfg_attr(docsrs, doc(cfg(feature = "v4_4")))] #[doc(hidden)] @@ -2879,22 +2471,6 @@ pub enum TouchpadGesturePhase { __Unknown(i32), } -impl fmt::Display for TouchpadGesturePhase { - fn fmt(&self, f: &mut fmt::Formatter) -> fmt::Result { - write!( - f, - "TouchpadGesturePhase::{}", - match *self { - Self::Begin => "Begin", - Self::Update => "Update", - Self::End => "End", - Self::Cancel => "Cancel", - _ => "Unknown", - } - ) - } -} - #[doc(hidden)] impl IntoGlib for TouchpadGesturePhase { type GlibType = ffi::GdkTouchpadGesturePhase; @@ -2994,20 +2570,6 @@ pub enum VulkanError { __Unknown(i32), } -impl fmt::Display for VulkanError { - fn fmt(&self, f: &mut fmt::Formatter) -> fmt::Result { - write!( - f, - "VulkanError::{}", - match *self { - Self::Unsupported => "Unsupported", - Self::NotAvailable => "NotAvailable", - _ => "Unknown", - } - ) - } -} - #[doc(hidden)] impl IntoGlib for VulkanError { type GlibType = ffi::GdkVulkanError; diff --git a/gdk4/src/auto/event.rs b/gdk4/src/auto/event.rs index faf17386e971..fdb33d0d0b30 100644 --- a/gdk4/src/auto/event.rs +++ b/gdk4/src/auto/event.rs @@ -7,7 +7,7 @@ use crate::{ TimeCoord, }; use glib::translate::*; -use std::{fmt, mem, ptr}; +use std::{mem, ptr}; glib::wrapper! { #[doc(alias = "GdkEvent")] @@ -192,9 +192,3 @@ impl Event { } } } - -impl fmt::Display for Event { - fn fmt(&self, f: &mut fmt::Formatter) -> fmt::Result { - f.write_str("Event") - } -} diff --git a/gdk4/src/auto/flags.rs b/gdk4/src/auto/flags.rs index 40cbc075d68c..9435ac90334b 100644 --- a/gdk4/src/auto/flags.rs +++ b/gdk4/src/auto/flags.rs @@ -3,7 +3,6 @@ // DO NOT EDIT use glib::{bitflags::bitflags, prelude::*, translate::*}; -use std::fmt; bitflags! { #[derive(Clone, Copy, Debug, PartialEq, Eq, Hash)] @@ -30,12 +29,6 @@ bitflags! { } } -impl fmt::Display for AnchorHints { - fn fmt(&self, f: &mut fmt::Formatter) -> fmt::Result { - ::fmt(self, f) - } -} - #[doc(hidden)] impl IntoGlib for AnchorHints { type GlibType = ffi::GdkAnchorHints; @@ -139,12 +132,6 @@ bitflags! { } } -impl fmt::Display for AxisFlags { - fn fmt(&self, f: &mut fmt::Formatter) -> fmt::Result { - ::fmt(self, f) - } -} - #[doc(hidden)] impl IntoGlib for AxisFlags { type GlibType = ffi::GdkAxisFlags; @@ -242,12 +229,6 @@ impl DragAction { } } -impl fmt::Display for DragAction { - fn fmt(&self, f: &mut fmt::Formatter) -> fmt::Result { - ::fmt(self, f) - } -} - #[doc(hidden)] impl IntoGlib for DragAction { type GlibType = ffi::GdkDragAction; @@ -345,12 +326,6 @@ bitflags! { } } -impl fmt::Display for FrameClockPhase { - fn fmt(&self, f: &mut fmt::Formatter) -> fmt::Result { - ::fmt(self, f) - } -} - #[doc(hidden)] impl IntoGlib for FrameClockPhase { type GlibType = ffi::GdkFrameClockPhase; @@ -438,14 +413,6 @@ bitflags! { } } -#[cfg(feature = "v4_6")] -#[cfg_attr(docsrs, doc(cfg(feature = "v4_6")))] -impl fmt::Display for GLAPI { - fn fmt(&self, f: &mut fmt::Formatter) -> fmt::Result { - ::fmt(self, f) - } -} - #[cfg(feature = "v4_6")] #[cfg_attr(docsrs, doc(cfg(feature = "v4_6")))] #[doc(hidden)] @@ -567,12 +534,6 @@ bitflags! { } } -impl fmt::Display for ModifierType { - fn fmt(&self, f: &mut fmt::Formatter) -> fmt::Result { - ::fmt(self, f) - } -} - #[doc(hidden)] impl IntoGlib for ModifierType { type GlibType = ffi::GdkModifierType; @@ -658,12 +619,6 @@ bitflags! { } } -impl fmt::Display for PaintableFlags { - fn fmt(&self, f: &mut fmt::Formatter) -> fmt::Result { - ::fmt(self, f) - } -} - #[doc(hidden)] impl IntoGlib for PaintableFlags { type GlibType = ffi::GdkPaintableFlags; @@ -761,12 +716,6 @@ bitflags! { } } -impl fmt::Display for SeatCapabilities { - fn fmt(&self, f: &mut fmt::Formatter) -> fmt::Result { - ::fmt(self, f) - } -} - #[doc(hidden)] impl IntoGlib for SeatCapabilities { type GlibType = ffi::GdkSeatCapabilities; @@ -884,12 +833,6 @@ bitflags! { } } -impl fmt::Display for ToplevelState { - fn fmt(&self, f: &mut fmt::Formatter) -> fmt::Result { - ::fmt(self, f) - } -} - #[doc(hidden)] impl IntoGlib for ToplevelState { type GlibType = ffi::GdkToplevelState; diff --git a/gdk4/src/auto/focus_event.rs b/gdk4/src/auto/focus_event.rs index 40ba282e4893..eee5f4747cad 100644 --- a/gdk4/src/auto/focus_event.rs +++ b/gdk4/src/auto/focus_event.rs @@ -3,7 +3,6 @@ // DO NOT EDIT use glib::translate::*; -use std::fmt; glib::wrapper! { #[doc(alias = "GdkFocusEvent")] @@ -28,9 +27,3 @@ impl FocusEvent { unsafe { from_glib(ffi::gdk_focus_event_get_in(self.to_glib_none().0)) } } } - -impl fmt::Display for FocusEvent { - fn fmt(&self, f: &mut fmt::Formatter) -> fmt::Result { - f.write_str("FocusEvent") - } -} diff --git a/gdk4/src/auto/frame_clock.rs b/gdk4/src/auto/frame_clock.rs index e8c830b0c1d0..3e1f27020d2d 100644 --- a/gdk4/src/auto/frame_clock.rs +++ b/gdk4/src/auto/frame_clock.rs @@ -8,7 +8,7 @@ use glib::{ signal::{connect_raw, SignalHandlerId}, translate::*, }; -use std::{boxed::Box as Box_, fmt, mem, mem::transmute}; +use std::{boxed::Box as Box_, mem, mem::transmute}; glib::wrapper! { #[doc(alias = "GdkFrameClock")] @@ -259,9 +259,3 @@ impl FrameClock { } } } - -impl fmt::Display for FrameClock { - fn fmt(&self, f: &mut fmt::Formatter) -> fmt::Result { - f.write_str("FrameClock") - } -} diff --git a/gdk4/src/auto/gl_context.rs b/gdk4/src/auto/gl_context.rs index 59c9661e531d..a5f4ddb3bedf 100644 --- a/gdk4/src/auto/gl_context.rs +++ b/gdk4/src/auto/gl_context.rs @@ -14,7 +14,7 @@ use glib::{prelude::*, translate::*}; #[cfg(feature = "v4_6")] #[cfg_attr(docsrs, doc(cfg(feature = "v4_6")))] use std::{boxed::Box as Box_, mem::transmute}; -use std::{fmt, mem, ptr}; +use std::{mem, ptr}; glib::wrapper! { #[doc(alias = "GdkGLContext")] @@ -303,9 +303,3 @@ pub trait GLContextExt: IsA + sealed::Sealed + 'static { } impl> GLContextExt for O {} - -impl fmt::Display for GLContext { - fn fmt(&self, f: &mut fmt::Formatter) -> fmt::Result { - f.write_str("GLContext") - } -} diff --git a/gdk4/src/auto/gl_texture.rs b/gdk4/src/auto/gl_texture.rs index f8b936576d61..080789862f44 100644 --- a/gdk4/src/auto/gl_texture.rs +++ b/gdk4/src/auto/gl_texture.rs @@ -5,7 +5,6 @@ use crate::{Paintable, Texture}; use glib::translate::*; -use std::fmt; glib::wrapper! { #[doc(alias = "GdkGLTexture")] @@ -27,9 +26,3 @@ impl GLTexture { unsafe impl Send for GLTexture {} unsafe impl Sync for GLTexture {} - -impl fmt::Display for GLTexture { - fn fmt(&self, f: &mut fmt::Formatter) -> fmt::Result { - f.write_str("GLTexture") - } -} diff --git a/gdk4/src/auto/gl_texture_builder.rs b/gdk4/src/auto/gl_texture_builder.rs index 9fa11d646749..d1518d69cb48 100644 --- a/gdk4/src/auto/gl_texture_builder.rs +++ b/gdk4/src/auto/gl_texture_builder.rs @@ -4,7 +4,6 @@ use crate::{GLContext, MemoryFormat, Texture}; use glib::translate::*; -use std::fmt; glib::wrapper! { #[doc(alias = "GdkGLTextureBuilder")] @@ -101,9 +100,3 @@ impl Default for GLTextureBuilder { unsafe impl Send for GLTextureBuilder {} unsafe impl Sync for GLTextureBuilder {} - -impl fmt::Display for GLTextureBuilder { - fn fmt(&self, f: &mut fmt::Formatter) -> fmt::Result { - f.write_str("GLTextureBuilder") - } -} diff --git a/gdk4/src/auto/grab_broken_event.rs b/gdk4/src/auto/grab_broken_event.rs index 323123f6efa0..443dde798637 100644 --- a/gdk4/src/auto/grab_broken_event.rs +++ b/gdk4/src/auto/grab_broken_event.rs @@ -4,7 +4,6 @@ use crate::Surface; use glib::translate::*; -use std::fmt; glib::wrapper! { #[doc(alias = "GdkGrabBrokenEvent")] @@ -43,9 +42,3 @@ impl GrabBrokenEvent { } } } - -impl fmt::Display for GrabBrokenEvent { - fn fmt(&self, f: &mut fmt::Formatter) -> fmt::Result { - f.write_str("GrabBrokenEvent") - } -} diff --git a/gdk4/src/auto/key_event.rs b/gdk4/src/auto/key_event.rs index 388791947721..b8c88b528d53 100644 --- a/gdk4/src/auto/key_event.rs +++ b/gdk4/src/auto/key_event.rs @@ -4,7 +4,6 @@ use crate::ModifierType; use glib::translate::*; -use std::fmt; glib::wrapper! { #[doc(alias = "GdkKeyEvent")] @@ -56,9 +55,3 @@ impl KeyEvent { unsafe { from_glib(ffi::gdk_key_event_is_modifier(self.to_glib_none().0)) } } } - -impl fmt::Display for KeyEvent { - fn fmt(&self, f: &mut fmt::Formatter) -> fmt::Result { - f.write_str("KeyEvent") - } -} diff --git a/gdk4/src/auto/memory_texture.rs b/gdk4/src/auto/memory_texture.rs index 2780ce10398c..9b80ca781e6d 100644 --- a/gdk4/src/auto/memory_texture.rs +++ b/gdk4/src/auto/memory_texture.rs @@ -4,7 +4,6 @@ use crate::{MemoryFormat, Paintable, Texture}; use glib::translate::*; -use std::fmt; glib::wrapper! { #[doc(alias = "GdkMemoryTexture")] @@ -39,9 +38,3 @@ impl MemoryTexture { unsafe impl Send for MemoryTexture {} unsafe impl Sync for MemoryTexture {} - -impl fmt::Display for MemoryTexture { - fn fmt(&self, f: &mut fmt::Formatter) -> fmt::Result { - f.write_str("MemoryTexture") - } -} diff --git a/gdk4/src/auto/monitor.rs b/gdk4/src/auto/monitor.rs index 75c120871b20..874311d37371 100644 --- a/gdk4/src/auto/monitor.rs +++ b/gdk4/src/auto/monitor.rs @@ -8,7 +8,7 @@ use glib::{ signal::{connect_raw, SignalHandlerId}, translate::*, }; -use std::{boxed::Box as Box_, fmt, mem::transmute}; +use std::{boxed::Box as Box_, mem::transmute}; glib::wrapper! { #[doc(alias = "GdkMonitor")] @@ -416,9 +416,3 @@ pub trait MonitorExt: IsA + sealed::Sealed + 'static { } impl> MonitorExt for O {} - -impl fmt::Display for Monitor { - fn fmt(&self, f: &mut fmt::Formatter) -> fmt::Result { - f.write_str("Monitor") - } -} diff --git a/gdk4/src/auto/motion_event.rs b/gdk4/src/auto/motion_event.rs index 13a4bf75e9da..2ba274b36395 100644 --- a/gdk4/src/auto/motion_event.rs +++ b/gdk4/src/auto/motion_event.rs @@ -3,7 +3,6 @@ // DO NOT EDIT use glib::translate::*; -use std::fmt; glib::wrapper! { #[doc(alias = "GdkMotionEvent")] @@ -22,9 +21,3 @@ impl glib::StaticType for MotionEvent { } impl MotionEvent {} - -impl fmt::Display for MotionEvent { - fn fmt(&self, f: &mut fmt::Formatter) -> fmt::Result { - f.write_str("MotionEvent") - } -} diff --git a/gdk4/src/auto/pad_event.rs b/gdk4/src/auto/pad_event.rs index aaac649799d7..fc6b97bed101 100644 --- a/gdk4/src/auto/pad_event.rs +++ b/gdk4/src/auto/pad_event.rs @@ -3,7 +3,7 @@ // DO NOT EDIT use glib::translate::*; -use std::{fmt, mem}; +use std::mem; glib::wrapper! { #[doc(alias = "GdkPadEvent")] @@ -58,9 +58,3 @@ impl PadEvent { } } } - -impl fmt::Display for PadEvent { - fn fmt(&self, f: &mut fmt::Formatter) -> fmt::Result { - f.write_str("PadEvent") - } -} diff --git a/gdk4/src/auto/paintable.rs b/gdk4/src/auto/paintable.rs index 7a60635dcb44..c19b96ecfcd6 100644 --- a/gdk4/src/auto/paintable.rs +++ b/gdk4/src/auto/paintable.rs @@ -8,7 +8,7 @@ use glib::{ signal::{connect_raw, SignalHandlerId}, translate::*, }; -use std::{boxed::Box as Box_, fmt, mem, mem::transmute}; +use std::{boxed::Box as Box_, mem, mem::transmute}; glib::wrapper! { #[doc(alias = "GdkPaintable")] @@ -174,9 +174,3 @@ pub trait PaintableExt: IsA + sealed::Sealed + 'static { } impl> PaintableExt for O {} - -impl fmt::Display for Paintable { - fn fmt(&self, f: &mut fmt::Formatter) -> fmt::Result { - f.write_str("Paintable") - } -} diff --git a/gdk4/src/auto/popup.rs b/gdk4/src/auto/popup.rs index a9ddc58cd65f..81494ae94283 100644 --- a/gdk4/src/auto/popup.rs +++ b/gdk4/src/auto/popup.rs @@ -4,7 +4,6 @@ use crate::{Gravity, PopupLayout, Surface}; use glib::{prelude::*, translate::*}; -use std::fmt; glib::wrapper! { #[doc(alias = "GdkPopup")] @@ -83,9 +82,3 @@ pub trait PopupExt: IsA + sealed::Sealed + 'static { } impl> PopupExt for O {} - -impl fmt::Display for Popup { - fn fmt(&self, f: &mut fmt::Formatter) -> fmt::Result { - f.write_str("Popup") - } -} diff --git a/gdk4/src/auto/proximity_event.rs b/gdk4/src/auto/proximity_event.rs index e7d04458016a..766c6754e088 100644 --- a/gdk4/src/auto/proximity_event.rs +++ b/gdk4/src/auto/proximity_event.rs @@ -3,7 +3,6 @@ // DO NOT EDIT use glib::translate::*; -use std::fmt; glib::wrapper! { #[doc(alias = "GdkProximityEvent")] @@ -22,9 +21,3 @@ impl glib::StaticType for ProximityEvent { } impl ProximityEvent {} - -impl fmt::Display for ProximityEvent { - fn fmt(&self, f: &mut fmt::Formatter) -> fmt::Result { - f.write_str("ProximityEvent") - } -} diff --git a/gdk4/src/auto/scroll_event.rs b/gdk4/src/auto/scroll_event.rs index 696947dbce99..8658ceefa35d 100644 --- a/gdk4/src/auto/scroll_event.rs +++ b/gdk4/src/auto/scroll_event.rs @@ -7,7 +7,7 @@ use crate::ScrollDirection; #[cfg_attr(docsrs, doc(cfg(feature = "v4_8")))] use crate::ScrollUnit; use glib::translate::*; -use std::{fmt, mem}; +use std::mem; glib::wrapper! { #[doc(alias = "GdkScrollEvent")] @@ -60,9 +60,3 @@ impl ScrollEvent { unsafe { from_glib(ffi::gdk_scroll_event_is_stop(self.to_glib_none().0)) } } } - -impl fmt::Display for ScrollEvent { - fn fmt(&self, f: &mut fmt::Formatter) -> fmt::Result { - f.write_str("ScrollEvent") - } -} diff --git a/gdk4/src/auto/seat.rs b/gdk4/src/auto/seat.rs index c51732df1986..d7c4a89990b1 100644 --- a/gdk4/src/auto/seat.rs +++ b/gdk4/src/auto/seat.rs @@ -8,7 +8,7 @@ use glib::{ signal::{connect_raw, SignalHandlerId}, translate::*, }; -use std::{boxed::Box as Box_, fmt, mem::transmute}; +use std::{boxed::Box as Box_, mem::transmute}; glib::wrapper! { #[doc(alias = "GdkSeat")] @@ -193,9 +193,3 @@ pub trait SeatExt: IsA + sealed::Sealed + 'static { } impl> SeatExt for O {} - -impl fmt::Display for Seat { - fn fmt(&self, f: &mut fmt::Formatter) -> fmt::Result { - f.write_str("Seat") - } -} diff --git a/gdk4/src/auto/snapshot.rs b/gdk4/src/auto/snapshot.rs index 3846feeb267a..1579a656cc94 100644 --- a/gdk4/src/auto/snapshot.rs +++ b/gdk4/src/auto/snapshot.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 = "GdkSnapshot")] pub struct Snapshot(Object); @@ -16,9 +14,3 @@ glib::wrapper! { impl Snapshot { pub const NONE: Option<&'static Snapshot> = None; } - -impl fmt::Display for Snapshot { - fn fmt(&self, f: &mut fmt::Formatter) -> fmt::Result { - f.write_str("Snapshot") - } -} diff --git a/gdk4/src/auto/surface.rs b/gdk4/src/auto/surface.rs index f1d7fc7ddcde..ea52f3c747f6 100644 --- a/gdk4/src/auto/surface.rs +++ b/gdk4/src/auto/surface.rs @@ -12,7 +12,7 @@ use glib::{ signal::{connect_raw, SignalHandlerId}, translate::*, }; -use std::{boxed::Box as Box_, fmt, mem, mem::transmute, ptr}; +use std::{boxed::Box as Box_, mem, mem::transmute, ptr}; glib::wrapper! { #[doc(alias = "GdkSurface")] @@ -558,9 +558,3 @@ pub trait SurfaceExt: IsA + sealed::Sealed + 'static { } impl> SurfaceExt for O {} - -impl fmt::Display for Surface { - fn fmt(&self, f: &mut fmt::Formatter) -> fmt::Result { - f.write_str("Surface") - } -} diff --git a/gdk4/src/auto/texture.rs b/gdk4/src/auto/texture.rs index cc8bda1c06bb..48df1ce03c7d 100644 --- a/gdk4/src/auto/texture.rs +++ b/gdk4/src/auto/texture.rs @@ -7,7 +7,7 @@ use crate::MemoryFormat; use crate::Paintable; use glib::{prelude::*, translate::*}; -use std::{fmt, ptr}; +use std::ptr; glib::wrapper! { #[doc(alias = "GdkTexture")] @@ -177,9 +177,3 @@ pub trait TextureExt: IsA + sealed::Sealed + 'static { } impl> TextureExt for O {} - -impl fmt::Display for Texture { - fn fmt(&self, f: &mut fmt::Formatter) -> fmt::Result { - f.write_str("Texture") - } -} diff --git a/gdk4/src/auto/toplevel.rs b/gdk4/src/auto/toplevel.rs index c0374123da3a..8e995cf602f0 100644 --- a/gdk4/src/auto/toplevel.rs +++ b/gdk4/src/auto/toplevel.rs @@ -13,7 +13,7 @@ use glib::{ signal::{connect_raw, SignalHandlerId}, translate::*, }; -use std::{boxed::Box as Box_, fmt, mem::transmute}; +use std::{boxed::Box as Box_, mem::transmute}; glib::wrapper! { #[doc(alias = "GdkToplevel")] @@ -494,9 +494,3 @@ pub trait ToplevelExt: IsA + sealed::Sealed + 'static { } impl> ToplevelExt for O {} - -impl fmt::Display for Toplevel { - fn fmt(&self, f: &mut fmt::Formatter) -> fmt::Result { - f.write_str("Toplevel") - } -} diff --git a/gdk4/src/auto/touch_event.rs b/gdk4/src/auto/touch_event.rs index 3e8819b72fba..ebfbd5a85e95 100644 --- a/gdk4/src/auto/touch_event.rs +++ b/gdk4/src/auto/touch_event.rs @@ -3,7 +3,6 @@ // DO NOT EDIT use glib::translate::*; -use std::fmt; glib::wrapper! { #[doc(alias = "GdkTouchEvent")] @@ -32,9 +31,3 @@ impl TouchEvent { } } } - -impl fmt::Display for TouchEvent { - fn fmt(&self, f: &mut fmt::Formatter) -> fmt::Result { - f.write_str("TouchEvent") - } -} diff --git a/gdk4/src/auto/touchpad_event.rs b/gdk4/src/auto/touchpad_event.rs index cf835b6ac490..52a2d184d070 100644 --- a/gdk4/src/auto/touchpad_event.rs +++ b/gdk4/src/auto/touchpad_event.rs @@ -4,7 +4,7 @@ use crate::TouchpadGesturePhase; use glib::translate::*; -use std::{fmt, mem}; +use std::mem; glib::wrapper! { #[doc(alias = "GdkTouchpadEvent")] @@ -66,9 +66,3 @@ impl TouchpadEvent { unsafe { ffi::gdk_touchpad_event_get_pinch_scale(self.to_glib_none().0) } } } - -impl fmt::Display for TouchpadEvent { - fn fmt(&self, f: &mut fmt::Formatter) -> fmt::Result { - f.write_str("TouchpadEvent") - } -} diff --git a/gdk4/src/auto/versions.txt b/gdk4/src/auto/versions.txt index 17a2d3ead99b..b317bfad4458 100644 --- a/gdk4/src/auto/versions.txt +++ b/gdk4/src/auto/versions.txt @@ -1,2 +1,2 @@ -Generated by gir (https://github.com/gtk-rs/gir @ 76bbe9b90aaa) +Generated by gir (https://github.com/gtk-rs/gir @ f477238c6579) from gir-files (https://github.com/gtk-rs/gir-files @ 307566e1ab58) diff --git a/gdk4/src/auto/vulkan_context.rs b/gdk4/src/auto/vulkan_context.rs index 9eba7f07babe..39d59e032d4f 100644 --- a/gdk4/src/auto/vulkan_context.rs +++ b/gdk4/src/auto/vulkan_context.rs @@ -8,7 +8,7 @@ use glib::{ signal::{connect_raw, SignalHandlerId}, translate::*, }; -use std::{boxed::Box as Box_, fmt, mem::transmute}; +use std::{boxed::Box as Box_, mem::transmute}; glib::wrapper! { #[doc(alias = "GdkVulkanContext")] @@ -42,9 +42,3 @@ impl VulkanContext { } } } - -impl fmt::Display for VulkanContext { - fn fmt(&self, f: &mut fmt::Formatter) -> fmt::Result { - f.write_str("VulkanContext") - } -} diff --git a/gdk4/sys/tests/abi.rs b/gdk4/sys/tests/abi.rs index 09d888a431f3..52595403cf2f 100644 --- a/gdk4/sys/tests/abi.rs +++ b/gdk4/sys/tests/abi.rs @@ -10,7 +10,7 @@ use std::error::Error; use std::ffi::OsString; use std::mem::{align_of, size_of}; use std::path::Path; -use std::process::Command; +use std::process::{Command, Stdio}; use std::str; use tempfile::Builder; @@ -70,9 +70,11 @@ fn pkg_config_cflags(packages: &[&str]) -> Result, Box> { let mut cmd = Command::new(pkg_config); cmd.arg("--cflags"); cmd.args(packages); + cmd.stderr(Stdio::inherit()); let out = cmd.output()?; if !out.status.success() { - return Err(format!("command {cmd:?} returned {}", out.status).into()); + let (status, stdout) = (out.status, String::from_utf8_lossy(&out.stdout)); + return Err(format!("command {cmd:?} failed, {status:?}\nstdout: {stdout}").into()); } let stdout = str::from_utf8(&out.stdout)?; Ok(shell_words::split(stdout.trim())?) @@ -187,13 +189,15 @@ fn get_c_output(name: &str) -> Result> { let cc = Compiler::new().expect("configured compiler"); cc.compile(&c_file, &exe)?; - let mut abi_cmd = Command::new(exe); - let output = abi_cmd.output()?; - if !output.status.success() { - return Err(format!("command {abi_cmd:?} failed, {output:?}").into()); + let mut cmd = Command::new(exe); + cmd.stderr(Stdio::inherit()); + let out = cmd.output()?; + if !out.status.success() { + let (status, stdout) = (out.status, String::from_utf8_lossy(&out.stdout)); + return Err(format!("command {cmd:?} failed, {status:?}\nstdout: {stdout}").into()); } - Ok(String::from_utf8(output.stdout)?) + Ok(String::from_utf8(out.stdout)?) } const RUST_LAYOUTS: &[(&str, Layout)] = &[ diff --git a/gdk4/sys/versions.txt b/gdk4/sys/versions.txt index 17a2d3ead99b..b317bfad4458 100644 --- a/gdk4/sys/versions.txt +++ b/gdk4/sys/versions.txt @@ -1,2 +1,2 @@ -Generated by gir (https://github.com/gtk-rs/gir @ 76bbe9b90aaa) +Generated by gir (https://github.com/gtk-rs/gir @ f477238c6579) from gir-files (https://github.com/gtk-rs/gir-files @ 307566e1ab58) diff --git a/gir b/gir index 76bbe9b90aaa..f477238c6579 160000 --- a/gir +++ b/gir @@ -1 +1 @@ -Subproject commit 76bbe9b90aaa741770b3698afd33c499000bebc9 +Subproject commit f477238c6579c9a84db9ed6d2f7ff48acbed2fd1 diff --git a/gsk4/src/auto/blend_node.rs b/gsk4/src/auto/blend_node.rs index d641e37cb53c..62ba43908db2 100644 --- a/gsk4/src/auto/blend_node.rs +++ b/gsk4/src/auto/blend_node.rs @@ -4,7 +4,6 @@ use crate::{BlendMode, RenderNode}; use glib::translate::*; -use std::fmt; glib::wrapper! { #[doc(alias = "GskBlendNode")] @@ -57,9 +56,3 @@ impl BlendNode { unsafe { from_glib_none(ffi::gsk_blend_node_get_top_child(self.to_glib_none().0)) } } } - -impl fmt::Display for BlendNode { - fn fmt(&self, f: &mut fmt::Formatter) -> fmt::Result { - f.write_str("BlendNode") - } -} diff --git a/gsk4/src/auto/blur_node.rs b/gsk4/src/auto/blur_node.rs index 793e0c81cc8a..cae2db191fd1 100644 --- a/gsk4/src/auto/blur_node.rs +++ b/gsk4/src/auto/blur_node.rs @@ -4,7 +4,6 @@ use crate::RenderNode; use glib::translate::*; -use std::fmt; glib::wrapper! { #[doc(alias = "GskBlurNode")] @@ -46,9 +45,3 @@ impl BlurNode { unsafe { ffi::gsk_blur_node_get_radius(self.to_glib_none().0) } } } - -impl fmt::Display for BlurNode { - fn fmt(&self, f: &mut fmt::Formatter) -> fmt::Result { - f.write_str("BlurNode") - } -} diff --git a/gsk4/src/auto/border_node.rs b/gsk4/src/auto/border_node.rs index 8f89b2047971..35175285e2f0 100644 --- a/gsk4/src/auto/border_node.rs +++ b/gsk4/src/auto/border_node.rs @@ -4,7 +4,6 @@ use crate::RoundedRect; use glib::translate::*; -use std::fmt; glib::wrapper! { #[doc(alias = "GskBorderNode")] @@ -29,9 +28,3 @@ impl BorderNode { unsafe { from_glib_none(ffi::gsk_border_node_get_outline(self.to_glib_none().0)) } } } - -impl fmt::Display for BorderNode { - fn fmt(&self, f: &mut fmt::Formatter) -> fmt::Result { - f.write_str("BorderNode") - } -} diff --git a/gsk4/src/auto/broadway_renderer.rs b/gsk4/src/auto/broadway_renderer.rs index 1fe493b06bda..6fbcf1ee65e7 100644 --- a/gsk4/src/auto/broadway_renderer.rs +++ b/gsk4/src/auto/broadway_renderer.rs @@ -4,7 +4,6 @@ use crate::Renderer; use glib::{prelude::*, translate::*}; -use std::fmt; glib::wrapper! { #[doc(alias = "GskBroadwayRenderer")] @@ -28,9 +27,3 @@ impl Default for BroadwayRenderer { Self::new() } } - -impl fmt::Display for BroadwayRenderer { - fn fmt(&self, f: &mut fmt::Formatter) -> fmt::Result { - f.write_str("BroadwayRenderer") - } -} diff --git a/gsk4/src/auto/cairo_node.rs b/gsk4/src/auto/cairo_node.rs index 3d51c3d35f69..03622f438d73 100644 --- a/gsk4/src/auto/cairo_node.rs +++ b/gsk4/src/auto/cairo_node.rs @@ -3,7 +3,6 @@ // DO NOT EDIT use glib::translate::*; -use std::fmt; glib::wrapper! { #[doc(alias = "GskCairoNode")] @@ -40,9 +39,3 @@ impl CairoNode { unsafe { from_glib_none(ffi::gsk_cairo_node_get_surface(self.to_glib_none().0)) } } } - -impl fmt::Display for CairoNode { - fn fmt(&self, f: &mut fmt::Formatter) -> fmt::Result { - f.write_str("CairoNode") - } -} diff --git a/gsk4/src/auto/cairo_renderer.rs b/gsk4/src/auto/cairo_renderer.rs index bd5bc62ff654..ed53efa815e1 100644 --- a/gsk4/src/auto/cairo_renderer.rs +++ b/gsk4/src/auto/cairo_renderer.rs @@ -4,7 +4,6 @@ use crate::Renderer; use glib::{prelude::*, translate::*}; -use std::fmt; glib::wrapper! { #[doc(alias = "GskCairoRenderer")] @@ -28,9 +27,3 @@ impl Default for CairoRenderer { Self::new() } } - -impl fmt::Display for CairoRenderer { - fn fmt(&self, f: &mut fmt::Formatter) -> fmt::Result { - f.write_str("CairoRenderer") - } -} diff --git a/gsk4/src/auto/clip_node.rs b/gsk4/src/auto/clip_node.rs index ee7af65d02c0..58f8416666b1 100644 --- a/gsk4/src/auto/clip_node.rs +++ b/gsk4/src/auto/clip_node.rs @@ -4,7 +4,6 @@ use crate::RenderNode; use glib::translate::*; -use std::fmt; glib::wrapper! { #[doc(alias = "GskClipNode")] @@ -46,9 +45,3 @@ impl ClipNode { unsafe { from_glib_none(ffi::gsk_clip_node_get_clip(self.to_glib_none().0)) } } } - -impl fmt::Display for ClipNode { - fn fmt(&self, f: &mut fmt::Formatter) -> fmt::Result { - f.write_str("ClipNode") - } -} diff --git a/gsk4/src/auto/color_matrix_node.rs b/gsk4/src/auto/color_matrix_node.rs index 00ba5ee7fc8e..fca6fe1723e3 100644 --- a/gsk4/src/auto/color_matrix_node.rs +++ b/gsk4/src/auto/color_matrix_node.rs @@ -4,7 +4,6 @@ use crate::RenderNode; use glib::translate::*; -use std::fmt; glib::wrapper! { #[doc(alias = "GskColorMatrixNode")] @@ -65,9 +64,3 @@ impl ColorMatrixNode { } } } - -impl fmt::Display for ColorMatrixNode { - fn fmt(&self, f: &mut fmt::Formatter) -> fmt::Result { - f.write_str("ColorMatrixNode") - } -} diff --git a/gsk4/src/auto/color_node.rs b/gsk4/src/auto/color_node.rs index 88e2a9b841be..bac1617cd914 100644 --- a/gsk4/src/auto/color_node.rs +++ b/gsk4/src/auto/color_node.rs @@ -3,7 +3,6 @@ // DO NOT EDIT use glib::translate::*; -use std::fmt; glib::wrapper! { #[doc(alias = "GskColorNode")] @@ -39,9 +38,3 @@ impl ColorNode { unsafe { from_glib_none(ffi::gsk_color_node_get_color(self.to_glib_none().0)) } } } - -impl fmt::Display for ColorNode { - fn fmt(&self, f: &mut fmt::Formatter) -> fmt::Result { - f.write_str("ColorNode") - } -} diff --git a/gsk4/src/auto/conic_gradient_node.rs b/gsk4/src/auto/conic_gradient_node.rs index 84932c1c0040..2e9684b25311 100644 --- a/gsk4/src/auto/conic_gradient_node.rs +++ b/gsk4/src/auto/conic_gradient_node.rs @@ -4,7 +4,7 @@ use crate::ColorStop; use glib::translate::*; -use std::{fmt, mem}; +use std::mem; glib::wrapper! { #[doc(alias = "GskConicGradientNode")] @@ -89,9 +89,3 @@ impl ConicGradientNode { unsafe { ffi::gsk_conic_gradient_node_get_rotation(self.to_glib_none().0) } } } - -impl fmt::Display for ConicGradientNode { - fn fmt(&self, f: &mut fmt::Formatter) -> fmt::Result { - f.write_str("ConicGradientNode") - } -} diff --git a/gsk4/src/auto/container_node.rs b/gsk4/src/auto/container_node.rs index a897f632d9a5..a42180b4caeb 100644 --- a/gsk4/src/auto/container_node.rs +++ b/gsk4/src/auto/container_node.rs @@ -4,7 +4,6 @@ use crate::RenderNode; use glib::translate::*; -use std::fmt; glib::wrapper! { #[doc(alias = "GskContainerNode")] @@ -41,9 +40,3 @@ impl ContainerNode { unsafe { ffi::gsk_container_node_get_n_children(self.to_glib_none().0) } } } - -impl fmt::Display for ContainerNode { - fn fmt(&self, f: &mut fmt::Formatter) -> fmt::Result { - f.write_str("ContainerNode") - } -} diff --git a/gsk4/src/auto/cross_fade_node.rs b/gsk4/src/auto/cross_fade_node.rs index 1a88acadc793..83335470ef10 100644 --- a/gsk4/src/auto/cross_fade_node.rs +++ b/gsk4/src/auto/cross_fade_node.rs @@ -4,7 +4,6 @@ use crate::RenderNode; use glib::translate::*; -use std::fmt; glib::wrapper! { #[doc(alias = "GskCrossFadeNode")] @@ -65,9 +64,3 @@ impl CrossFadeNode { } } } - -impl fmt::Display for CrossFadeNode { - fn fmt(&self, f: &mut fmt::Formatter) -> fmt::Result { - f.write_str("CrossFadeNode") - } -} diff --git a/gsk4/src/auto/debug_node.rs b/gsk4/src/auto/debug_node.rs index 0b626348df02..7fdd45b75afa 100644 --- a/gsk4/src/auto/debug_node.rs +++ b/gsk4/src/auto/debug_node.rs @@ -4,7 +4,6 @@ use crate::RenderNode; use glib::translate::*; -use std::fmt; glib::wrapper! { #[doc(alias = "GskDebugNode")] @@ -46,9 +45,3 @@ impl DebugNode { unsafe { from_glib_none(ffi::gsk_debug_node_get_message(self.to_glib_none().0)) } } } - -impl fmt::Display for DebugNode { - fn fmt(&self, f: &mut fmt::Formatter) -> fmt::Result { - f.write_str("DebugNode") - } -} diff --git a/gsk4/src/auto/enums.rs b/gsk4/src/auto/enums.rs index 767d64db23a9..fdaf8a696daf 100644 --- a/gsk4/src/auto/enums.rs +++ b/gsk4/src/auto/enums.rs @@ -3,7 +3,6 @@ // DO NOT EDIT use glib::{prelude::*, translate::*}; -use std::fmt; #[derive(Debug, Eq, PartialEq, Ord, PartialOrd, Hash, Clone, Copy)] #[non_exhaustive] @@ -45,34 +44,6 @@ pub enum BlendMode { __Unknown(i32), } -impl fmt::Display for BlendMode { - fn fmt(&self, f: &mut fmt::Formatter) -> fmt::Result { - write!( - f, - "BlendMode::{}", - match *self { - Self::Default => "Default", - Self::Multiply => "Multiply", - Self::Screen => "Screen", - Self::Overlay => "Overlay", - Self::Darken => "Darken", - Self::Lighten => "Lighten", - Self::ColorDodge => "ColorDodge", - Self::ColorBurn => "ColorBurn", - Self::HardLight => "HardLight", - Self::SoftLight => "SoftLight", - Self::Difference => "Difference", - Self::Exclusion => "Exclusion", - Self::Color => "Color", - Self::Hue => "Hue", - Self::Saturation => "Saturation", - Self::Luminosity => "Luminosity", - _ => "Unknown", - } - ) - } -} - #[doc(hidden)] impl IntoGlib for BlendMode { type GlibType = ffi::GskBlendMode; @@ -198,22 +169,6 @@ pub enum Corner { __Unknown(i32), } -impl fmt::Display for Corner { - fn fmt(&self, f: &mut fmt::Formatter) -> fmt::Result { - write!( - f, - "Corner::{}", - match *self { - Self::TopLeft => "TopLeft", - Self::TopRight => "TopRight", - Self::BottomRight => "BottomRight", - Self::BottomLeft => "BottomLeft", - _ => "Unknown", - } - ) - } -} - #[doc(hidden)] impl IntoGlib for Corner { type GlibType = ffi::GskCorner; @@ -315,22 +270,6 @@ pub enum FillRule { __Unknown(i32), } -#[cfg(feature = "v4_14")] -#[cfg_attr(docsrs, doc(cfg(feature = "v4_14")))] -impl fmt::Display for FillRule { - fn fmt(&self, f: &mut fmt::Formatter) -> fmt::Result { - write!( - f, - "FillRule::{}", - match *self { - Self::Winding => "Winding", - Self::EvenOdd => "EvenOdd", - _ => "Unknown", - } - ) - } -} - #[cfg(feature = "v4_14")] #[cfg_attr(docsrs, doc(cfg(feature = "v4_14")))] #[doc(hidden)] @@ -454,26 +393,6 @@ pub enum GLUniformType { __Unknown(i32), } -impl fmt::Display for GLUniformType { - fn fmt(&self, f: &mut fmt::Formatter) -> fmt::Result { - write!( - f, - "GLUniformType::{}", - match *self { - Self::None => "None", - Self::Float => "Float", - Self::Int => "Int", - Self::Uint => "Uint", - Self::Bool => "Bool", - Self::Vec2 => "Vec2", - Self::Vec3 => "Vec3", - Self::Vec4 => "Vec4", - _ => "Unknown", - } - ) - } -} - #[doc(hidden)] impl IntoGlib for GLUniformType { type GlibType = ffi::GskGLUniformType; @@ -585,23 +504,6 @@ pub enum LineCap { __Unknown(i32), } -#[cfg(feature = "v4_14")] -#[cfg_attr(docsrs, doc(cfg(feature = "v4_14")))] -impl fmt::Display for LineCap { - fn fmt(&self, f: &mut fmt::Formatter) -> fmt::Result { - write!( - f, - "LineCap::{}", - match *self { - Self::Butt => "Butt", - Self::Round => "Round", - Self::Square => "Square", - _ => "Unknown", - } - ) - } -} - #[cfg(feature = "v4_14")] #[cfg_attr(docsrs, doc(cfg(feature = "v4_14")))] #[doc(hidden)] @@ -719,23 +621,6 @@ pub enum LineJoin { __Unknown(i32), } -#[cfg(feature = "v4_14")] -#[cfg_attr(docsrs, doc(cfg(feature = "v4_14")))] -impl fmt::Display for LineJoin { - fn fmt(&self, f: &mut fmt::Formatter) -> fmt::Result { - write!( - f, - "LineJoin::{}", - match *self { - Self::Miter => "Miter", - Self::Round => "Round", - Self::Bevel => "Bevel", - _ => "Unknown", - } - ) - } -} - #[cfg(feature = "v4_14")] #[cfg_attr(docsrs, doc(cfg(feature = "v4_14")))] #[doc(hidden)] @@ -855,24 +740,6 @@ pub enum MaskMode { __Unknown(i32), } -#[cfg(feature = "v4_10")] -#[cfg_attr(docsrs, doc(cfg(feature = "v4_10")))] -impl fmt::Display for MaskMode { - fn fmt(&self, f: &mut fmt::Formatter) -> fmt::Result { - write!( - f, - "MaskMode::{}", - match *self { - Self::Alpha => "Alpha", - Self::InvertedAlpha => "InvertedAlpha", - Self::Luminance => "Luminance", - Self::InvertedLuminance => "InvertedLuminance", - _ => "Unknown", - } - ) - } -} - #[cfg(feature = "v4_10")] #[cfg_attr(docsrs, doc(cfg(feature = "v4_10")))] #[doc(hidden)] @@ -990,22 +857,6 @@ pub enum PathDirection { __Unknown(i32), } -#[cfg(feature = "v4_14")] -#[cfg_attr(docsrs, doc(cfg(feature = "v4_14")))] -impl fmt::Display for PathDirection { - fn fmt(&self, f: &mut fmt::Formatter) -> fmt::Result { - write!( - f, - "PathDirection::{}", - match *self { - Self::Start => "Start", - Self::End => "End", - _ => "Unknown", - } - ) - } -} - #[cfg(feature = "v4_14")] #[cfg_attr(docsrs, doc(cfg(feature = "v4_14")))] #[doc(hidden)] @@ -1125,25 +976,6 @@ pub enum PathOperation { __Unknown(i32), } -#[cfg(feature = "v4_14")] -#[cfg_attr(docsrs, doc(cfg(feature = "v4_14")))] -impl fmt::Display for PathOperation { - fn fmt(&self, f: &mut fmt::Formatter) -> fmt::Result { - write!( - f, - "PathOperation::{}", - match *self { - Self::Move => "Move", - Self::Close => "Close", - Self::Line => "Line", - Self::Quad => "Quad", - Self::Cubic => "Cubic", - _ => "Unknown", - } - ) - } -} - #[cfg(feature = "v4_14")] #[cfg_attr(docsrs, doc(cfg(feature = "v4_14")))] #[doc(hidden)] @@ -1321,50 +1153,6 @@ pub enum RenderNodeType { __Unknown(i32), } -impl fmt::Display for RenderNodeType { - fn fmt(&self, f: &mut fmt::Formatter) -> fmt::Result { - write!( - f, - "RenderNodeType::{}", - match *self { - Self::NotARenderNode => "NotARenderNode", - Self::ContainerNode => "ContainerNode", - Self::CairoNode => "CairoNode", - Self::ColorNode => "ColorNode", - Self::LinearGradientNode => "LinearGradientNode", - Self::RepeatingLinearGradientNode => "RepeatingLinearGradientNode", - Self::RadialGradientNode => "RadialGradientNode", - Self::RepeatingRadialGradientNode => "RepeatingRadialGradientNode", - Self::ConicGradientNode => "ConicGradientNode", - Self::BorderNode => "BorderNode", - Self::TextureNode => "TextureNode", - Self::InsetShadowNode => "InsetShadowNode", - Self::OutsetShadowNode => "OutsetShadowNode", - Self::TransformNode => "TransformNode", - Self::OpacityNode => "OpacityNode", - Self::ColorMatrixNode => "ColorMatrixNode", - Self::RepeatNode => "RepeatNode", - Self::ClipNode => "ClipNode", - Self::RoundedClipNode => "RoundedClipNode", - Self::ShadowNode => "ShadowNode", - Self::BlendNode => "BlendNode", - Self::CrossFadeNode => "CrossFadeNode", - Self::TextNode => "TextNode", - Self::BlurNode => "BlurNode", - Self::DebugNode => "DebugNode", - Self::GlShaderNode => "GlShaderNode", - Self::TextureScaleNode => "TextureScaleNode", - Self::MaskNode => "MaskNode", - #[cfg(feature = "v4_14")] - Self::FillNode => "FillNode", - #[cfg(feature = "v4_14")] - Self::StrokeNode => "StrokeNode", - _ => "Unknown", - } - ) - } -} - #[doc(hidden)] impl IntoGlib for RenderNodeType { type GlibType = ffi::GskRenderNodeType; @@ -1520,21 +1308,6 @@ pub enum ScalingFilter { __Unknown(i32), } -impl fmt::Display for ScalingFilter { - fn fmt(&self, f: &mut fmt::Formatter) -> fmt::Result { - write!( - f, - "ScalingFilter::{}", - match *self { - Self::Linear => "Linear", - Self::Nearest => "Nearest", - Self::Trilinear => "Trilinear", - _ => "Unknown", - } - ) - } -} - #[doc(hidden)] impl IntoGlib for ScalingFilter { type GlibType = ffi::GskScalingFilter; @@ -1634,21 +1407,6 @@ pub enum SerializationError { __Unknown(i32), } -impl fmt::Display for SerializationError { - fn fmt(&self, f: &mut fmt::Formatter) -> fmt::Result { - write!( - f, - "SerializationError::{}", - match *self { - Self::UnsupportedFormat => "UnsupportedFormat", - Self::UnsupportedVersion => "UnsupportedVersion", - Self::InvalidData => "InvalidData", - _ => "Unknown", - } - ) - } -} - #[doc(hidden)] impl IntoGlib for SerializationError { type GlibType = ffi::GskSerializationError; @@ -1779,25 +1537,6 @@ pub enum TransformCategory { __Unknown(i32), } -impl fmt::Display for TransformCategory { - fn fmt(&self, f: &mut fmt::Formatter) -> fmt::Result { - write!( - f, - "TransformCategory::{}", - match *self { - Self::Unknown => "Unknown", - Self::Any => "Any", - Self::_3d => "_3d", - Self::_2d => "_2d", - Self::_2dAffine => "_2dAffine", - Self::_2dTranslate => "_2dTranslate", - Self::Identity => "Identity", - _ => "Unknown", - } - ) - } -} - #[doc(hidden)] impl IntoGlib for TransformCategory { type GlibType = ffi::GskTransformCategory; diff --git a/gsk4/src/auto/fill_node.rs b/gsk4/src/auto/fill_node.rs index 0578937bdd81..dec6b9c0eeb1 100644 --- a/gsk4/src/auto/fill_node.rs +++ b/gsk4/src/auto/fill_node.rs @@ -4,7 +4,6 @@ use crate::{FillRule, Path, RenderNode}; use glib::translate::*; -use std::fmt; glib::wrapper! { #[doc(alias = "GskFillNode")] @@ -53,9 +52,3 @@ impl FillNode { unsafe { from_glib_none(ffi::gsk_fill_node_get_path(self.to_glib_none().0)) } } } - -impl fmt::Display for FillNode { - fn fmt(&self, f: &mut fmt::Formatter) -> fmt::Result { - f.write_str("FillNode") - } -} diff --git a/gsk4/src/auto/flags.rs b/gsk4/src/auto/flags.rs index 32069836e849..882ef79ce65c 100644 --- a/gsk4/src/auto/flags.rs +++ b/gsk4/src/auto/flags.rs @@ -5,9 +5,6 @@ #[cfg(feature = "v4_14")] #[cfg_attr(docsrs, doc(cfg(feature = "v4_14")))] use glib::{bitflags::bitflags, prelude::*, translate::*}; -#[cfg(feature = "v4_14")] -#[cfg_attr(docsrs, doc(cfg(feature = "v4_14")))] -use std::fmt; #[cfg(feature = "v4_14")] bitflags! { @@ -24,14 +21,6 @@ bitflags! { } } -#[cfg(feature = "v4_14")] -#[cfg_attr(docsrs, doc(cfg(feature = "v4_14")))] -impl fmt::Display for PathForeachFlags { - fn fmt(&self, f: &mut fmt::Formatter) -> fmt::Result { - ::fmt(self, f) - } -} - #[cfg(feature = "v4_14")] #[cfg_attr(docsrs, doc(cfg(feature = "v4_14")))] #[doc(hidden)] diff --git a/gsk4/src/auto/gl_renderer.rs b/gsk4/src/auto/gl_renderer.rs index 158a18387117..b0bb5f53dd60 100644 --- a/gsk4/src/auto/gl_renderer.rs +++ b/gsk4/src/auto/gl_renderer.rs @@ -6,7 +6,6 @@ use crate::Renderer; #[cfg(feature = "v4_2")] #[cfg_attr(docsrs, doc(cfg(feature = "v4_2")))] use glib::{prelude::*, translate::*}; -use std::fmt; glib::wrapper! { #[doc(alias = "GskGLRenderer")] @@ -34,9 +33,3 @@ impl Default for GLRenderer { Self::new() } } - -impl fmt::Display for GLRenderer { - fn fmt(&self, f: &mut fmt::Formatter) -> fmt::Result { - f.write_str("GLRenderer") - } -} diff --git a/gsk4/src/auto/gl_shader.rs b/gsk4/src/auto/gl_shader.rs index 9c031c105bdf..87c0ea0e7c0a 100644 --- a/gsk4/src/auto/gl_shader.rs +++ b/gsk4/src/auto/gl_shader.rs @@ -4,7 +4,7 @@ use crate::{GLUniformType, Renderer}; use glib::{prelude::*, translate::*}; -use std::{fmt, ptr}; +use std::ptr; glib::wrapper! { #[doc(alias = "GskGLShader")] @@ -199,9 +199,3 @@ impl GLShaderBuilder { self.builder.build() } } - -impl fmt::Display for GLShader { - fn fmt(&self, f: &mut fmt::Formatter) -> fmt::Result { - f.write_str("GLShader") - } -} diff --git a/gsk4/src/auto/gl_shader_node.rs b/gsk4/src/auto/gl_shader_node.rs index 5720408f0f4a..1ebd159a3625 100644 --- a/gsk4/src/auto/gl_shader_node.rs +++ b/gsk4/src/auto/gl_shader_node.rs @@ -4,7 +4,6 @@ use crate::{GLShader, RenderNode}; use glib::translate::*; -use std::fmt; glib::wrapper! { #[doc(alias = "GskGLShaderNode")] @@ -61,9 +60,3 @@ impl GLShaderNode { unsafe { from_glib_none(ffi::gsk_gl_shader_node_get_shader(self.to_glib_none().0)) } } } - -impl fmt::Display for GLShaderNode { - fn fmt(&self, f: &mut fmt::Formatter) -> fmt::Result { - f.write_str("GLShaderNode") - } -} diff --git a/gsk4/src/auto/inset_shadow_node.rs b/gsk4/src/auto/inset_shadow_node.rs index 33e1e6b308fa..419071370cc4 100644 --- a/gsk4/src/auto/inset_shadow_node.rs +++ b/gsk4/src/auto/inset_shadow_node.rs @@ -4,7 +4,6 @@ use crate::RoundedRect; use glib::translate::*; -use std::fmt; glib::wrapper! { #[doc(alias = "GskInsetShadowNode")] @@ -85,9 +84,3 @@ impl InsetShadowNode { unsafe { ffi::gsk_inset_shadow_node_get_spread(self.to_glib_none().0) } } } - -impl fmt::Display for InsetShadowNode { - fn fmt(&self, f: &mut fmt::Formatter) -> fmt::Result { - f.write_str("InsetShadowNode") - } -} diff --git a/gsk4/src/auto/linear_gradient_node.rs b/gsk4/src/auto/linear_gradient_node.rs index e440a05cba18..233f8a7a3999 100644 --- a/gsk4/src/auto/linear_gradient_node.rs +++ b/gsk4/src/auto/linear_gradient_node.rs @@ -4,7 +4,7 @@ use crate::ColorStop; use glib::translate::*; -use std::{fmt, mem}; +use std::mem; glib::wrapper! { #[doc(alias = "GskLinearGradientNode")] @@ -81,9 +81,3 @@ impl LinearGradientNode { } } } - -impl fmt::Display for LinearGradientNode { - fn fmt(&self, f: &mut fmt::Formatter) -> fmt::Result { - f.write_str("LinearGradientNode") - } -} diff --git a/gsk4/src/auto/mask_node.rs b/gsk4/src/auto/mask_node.rs index e9f5ff595b19..b98f98c726b6 100644 --- a/gsk4/src/auto/mask_node.rs +++ b/gsk4/src/auto/mask_node.rs @@ -4,7 +4,6 @@ use crate::{MaskMode, RenderNode}; use glib::translate::*; -use std::fmt; glib::wrapper! { #[doc(alias = "GskMaskNode")] @@ -57,9 +56,3 @@ impl MaskNode { unsafe { from_glib_none(ffi::gsk_mask_node_get_source(self.to_glib_none().0)) } } } - -impl fmt::Display for MaskNode { - fn fmt(&self, f: &mut fmt::Formatter) -> fmt::Result { - f.write_str("MaskNode") - } -} diff --git a/gsk4/src/auto/opacity_node.rs b/gsk4/src/auto/opacity_node.rs index a7da1909f58c..e2130b3c024a 100644 --- a/gsk4/src/auto/opacity_node.rs +++ b/gsk4/src/auto/opacity_node.rs @@ -4,7 +4,6 @@ use crate::RenderNode; use glib::translate::*; -use std::fmt; glib::wrapper! { #[doc(alias = "GskOpacityNode")] @@ -46,9 +45,3 @@ impl OpacityNode { unsafe { ffi::gsk_opacity_node_get_opacity(self.to_glib_none().0) } } } - -impl fmt::Display for OpacityNode { - fn fmt(&self, f: &mut fmt::Formatter) -> fmt::Result { - f.write_str("OpacityNode") - } -} diff --git a/gsk4/src/auto/outset_shadow_node.rs b/gsk4/src/auto/outset_shadow_node.rs index c12b76611671..c19da799d05c 100644 --- a/gsk4/src/auto/outset_shadow_node.rs +++ b/gsk4/src/auto/outset_shadow_node.rs @@ -4,7 +4,6 @@ use crate::RoundedRect; use glib::translate::*; -use std::fmt; glib::wrapper! { #[doc(alias = "GskOutsetShadowNode")] @@ -85,9 +84,3 @@ impl OutsetShadowNode { unsafe { ffi::gsk_outset_shadow_node_get_spread(self.to_glib_none().0) } } } - -impl fmt::Display for OutsetShadowNode { - fn fmt(&self, f: &mut fmt::Formatter) -> fmt::Result { - f.write_str("OutsetShadowNode") - } -} diff --git a/gsk4/src/auto/radial_gradient_node.rs b/gsk4/src/auto/radial_gradient_node.rs index e420dd1904f0..9d8216224c3e 100644 --- a/gsk4/src/auto/radial_gradient_node.rs +++ b/gsk4/src/auto/radial_gradient_node.rs @@ -4,7 +4,7 @@ use crate::ColorStop; use glib::translate::*; -use std::{fmt, mem}; +use std::mem; glib::wrapper! { #[doc(alias = "GskRadialGradientNode")] @@ -105,9 +105,3 @@ impl RadialGradientNode { unsafe { ffi::gsk_radial_gradient_node_get_vradius(self.to_glib_none().0) } } } - -impl fmt::Display for RadialGradientNode { - fn fmt(&self, f: &mut fmt::Formatter) -> fmt::Result { - f.write_str("RadialGradientNode") - } -} diff --git a/gsk4/src/auto/render_node.rs b/gsk4/src/auto/render_node.rs index 7ca6cd8563a6..001b33f14f62 100644 --- a/gsk4/src/auto/render_node.rs +++ b/gsk4/src/auto/render_node.rs @@ -4,7 +4,7 @@ use crate::RenderNodeType; use glib::translate::*; -use std::{fmt, ptr}; +use std::ptr; glib::wrapper! { #[doc(alias = "GskRenderNode")] @@ -85,9 +85,3 @@ impl RenderNode { } } } - -impl fmt::Display for RenderNode { - fn fmt(&self, f: &mut fmt::Formatter) -> fmt::Result { - f.write_str("RenderNode") - } -} diff --git a/gsk4/src/auto/renderer.rs b/gsk4/src/auto/renderer.rs index 959f4827e95f..1610454e5357 100644 --- a/gsk4/src/auto/renderer.rs +++ b/gsk4/src/auto/renderer.rs @@ -8,7 +8,7 @@ use glib::{ signal::{connect_raw, SignalHandlerId}, translate::*, }; -use std::{boxed::Box as Box_, fmt, mem::transmute, ptr}; +use std::{boxed::Box as Box_, mem::transmute, ptr}; glib::wrapper! { #[doc(alias = "GskRenderer")] @@ -154,9 +154,3 @@ pub trait GskRendererExt: IsA + sealed::Sealed + 'static { } impl> GskRendererExt for O {} - -impl fmt::Display for Renderer { - fn fmt(&self, f: &mut fmt::Formatter) -> fmt::Result { - f.write_str("Renderer") - } -} diff --git a/gsk4/src/auto/repeat_node.rs b/gsk4/src/auto/repeat_node.rs index b64c34d6172a..ecaab9e20b08 100644 --- a/gsk4/src/auto/repeat_node.rs +++ b/gsk4/src/auto/repeat_node.rs @@ -4,7 +4,6 @@ use crate::RenderNode; use glib::translate::*; -use std::fmt; glib::wrapper! { #[doc(alias = "GskRepeatNode")] @@ -51,9 +50,3 @@ impl RepeatNode { unsafe { from_glib_none(ffi::gsk_repeat_node_get_child_bounds(self.to_glib_none().0)) } } } - -impl fmt::Display for RepeatNode { - fn fmt(&self, f: &mut fmt::Formatter) -> fmt::Result { - f.write_str("RepeatNode") - } -} diff --git a/gsk4/src/auto/repeating_linear_gradient_node.rs b/gsk4/src/auto/repeating_linear_gradient_node.rs index f2bcd63e617e..f5a32da68139 100644 --- a/gsk4/src/auto/repeating_linear_gradient_node.rs +++ b/gsk4/src/auto/repeating_linear_gradient_node.rs @@ -4,7 +4,6 @@ use crate::ColorStop; use glib::translate::*; -use std::fmt; glib::wrapper! { #[doc(alias = "GskRepeatingLinearGradientNode")] @@ -43,9 +42,3 @@ impl RepeatingLinearGradientNode { } } } - -impl fmt::Display for RepeatingLinearGradientNode { - fn fmt(&self, f: &mut fmt::Formatter) -> fmt::Result { - f.write_str("RepeatingLinearGradientNode") - } -} diff --git a/gsk4/src/auto/repeating_radial_gradient_node.rs b/gsk4/src/auto/repeating_radial_gradient_node.rs index 27dbf0955776..8800c8aca16f 100644 --- a/gsk4/src/auto/repeating_radial_gradient_node.rs +++ b/gsk4/src/auto/repeating_radial_gradient_node.rs @@ -4,7 +4,6 @@ use crate::ColorStop; use glib::translate::*; -use std::fmt; glib::wrapper! { #[doc(alias = "GskRepeatingRadialGradientNode")] @@ -49,9 +48,3 @@ impl RepeatingRadialGradientNode { } } } - -impl fmt::Display for RepeatingRadialGradientNode { - fn fmt(&self, f: &mut fmt::Formatter) -> fmt::Result { - f.write_str("RepeatingRadialGradientNode") - } -} diff --git a/gsk4/src/auto/rounded_clip_node.rs b/gsk4/src/auto/rounded_clip_node.rs index 6150896f60d2..0b46781d8e55 100644 --- a/gsk4/src/auto/rounded_clip_node.rs +++ b/gsk4/src/auto/rounded_clip_node.rs @@ -4,7 +4,6 @@ use crate::{RenderNode, RoundedRect}; use glib::translate::*; -use std::fmt; glib::wrapper! { #[doc(alias = "GskRoundedClipNode")] @@ -46,9 +45,3 @@ impl RoundedClipNode { unsafe { from_glib_none(ffi::gsk_rounded_clip_node_get_clip(self.to_glib_none().0)) } } } - -impl fmt::Display for RoundedClipNode { - fn fmt(&self, f: &mut fmt::Formatter) -> fmt::Result { - f.write_str("RoundedClipNode") - } -} diff --git a/gsk4/src/auto/shadow_node.rs b/gsk4/src/auto/shadow_node.rs index 5b5274cd843c..4841044b8d7c 100644 --- a/gsk4/src/auto/shadow_node.rs +++ b/gsk4/src/auto/shadow_node.rs @@ -4,7 +4,6 @@ use crate::{RenderNode, Shadow}; use glib::translate::*; -use std::fmt; glib::wrapper! { #[doc(alias = "GskShadowNode")] @@ -48,9 +47,3 @@ impl ShadowNode { unsafe { ffi::gsk_shadow_node_get_n_shadows(self.to_glib_none().0) } } } - -impl fmt::Display for ShadowNode { - fn fmt(&self, f: &mut fmt::Formatter) -> fmt::Result { - f.write_str("ShadowNode") - } -} diff --git a/gsk4/src/auto/stroke_node.rs b/gsk4/src/auto/stroke_node.rs index dd9745e78bae..7e69ee7b7700 100644 --- a/gsk4/src/auto/stroke_node.rs +++ b/gsk4/src/auto/stroke_node.rs @@ -4,7 +4,6 @@ use crate::{Path, RenderNode, Stroke}; use glib::translate::*; -use std::fmt; glib::wrapper! { #[doc(alias = "GskStrokeNode")] @@ -53,9 +52,3 @@ impl StrokeNode { unsafe { from_glib_none(ffi::gsk_stroke_node_get_stroke(self.to_glib_none().0)) } } } - -impl fmt::Display for StrokeNode { - fn fmt(&self, f: &mut fmt::Formatter) -> fmt::Result { - f.write_str("StrokeNode") - } -} diff --git a/gsk4/src/auto/text_node.rs b/gsk4/src/auto/text_node.rs index 5a36196848aa..5f8628027f7b 100644 --- a/gsk4/src/auto/text_node.rs +++ b/gsk4/src/auto/text_node.rs @@ -3,7 +3,7 @@ // DO NOT EDIT use glib::{prelude::*, translate::*}; -use std::{fmt, mem}; +use std::mem; glib::wrapper! { #[doc(alias = "GskTextNode")] @@ -84,9 +84,3 @@ impl TextNode { unsafe { from_glib(ffi::gsk_text_node_has_color_glyphs(self.to_glib_none().0)) } } } - -impl fmt::Display for TextNode { - fn fmt(&self, f: &mut fmt::Formatter) -> fmt::Result { - f.write_str("TextNode") - } -} diff --git a/gsk4/src/auto/texture_node.rs b/gsk4/src/auto/texture_node.rs index 2aaa170d8b18..0e9f0a186121 100644 --- a/gsk4/src/auto/texture_node.rs +++ b/gsk4/src/auto/texture_node.rs @@ -3,7 +3,6 @@ // DO NOT EDIT use glib::{prelude::*, translate::*}; -use std::fmt; glib::wrapper! { #[doc(alias = "GskTextureNode")] @@ -39,9 +38,3 @@ impl TextureNode { unsafe { from_glib_none(ffi::gsk_texture_node_get_texture(self.to_glib_none().0)) } } } - -impl fmt::Display for TextureNode { - fn fmt(&self, f: &mut fmt::Formatter) -> fmt::Result { - f.write_str("TextureNode") - } -} diff --git a/gsk4/src/auto/texture_scale_node.rs b/gsk4/src/auto/texture_scale_node.rs index 83038046a4a0..0a63d57ce483 100644 --- a/gsk4/src/auto/texture_scale_node.rs +++ b/gsk4/src/auto/texture_scale_node.rs @@ -4,7 +4,6 @@ use crate::ScalingFilter; use glib::{prelude::*, translate::*}; -use std::fmt; glib::wrapper! { #[doc(alias = "GskTextureScaleNode")] @@ -59,9 +58,3 @@ impl TextureScaleNode { } } } - -impl fmt::Display for TextureScaleNode { - fn fmt(&self, f: &mut fmt::Formatter) -> fmt::Result { - f.write_str("TextureScaleNode") - } -} diff --git a/gsk4/src/auto/transform_node.rs b/gsk4/src/auto/transform_node.rs index fe7745868683..b7788d376577 100644 --- a/gsk4/src/auto/transform_node.rs +++ b/gsk4/src/auto/transform_node.rs @@ -4,7 +4,6 @@ use crate::{RenderNode, Transform}; use glib::translate::*; -use std::fmt; glib::wrapper! { #[doc(alias = "GskTransformNode")] @@ -46,9 +45,3 @@ impl TransformNode { unsafe { from_glib_none(ffi::gsk_transform_node_get_transform(self.to_glib_none().0)) } } } - -impl fmt::Display for TransformNode { - fn fmt(&self, f: &mut fmt::Formatter) -> fmt::Result { - f.write_str("TransformNode") - } -} diff --git a/gsk4/src/auto/versions.txt b/gsk4/src/auto/versions.txt index 17a2d3ead99b..b317bfad4458 100644 --- a/gsk4/src/auto/versions.txt +++ b/gsk4/src/auto/versions.txt @@ -1,2 +1,2 @@ -Generated by gir (https://github.com/gtk-rs/gir @ 76bbe9b90aaa) +Generated by gir (https://github.com/gtk-rs/gir @ f477238c6579) from gir-files (https://github.com/gtk-rs/gir-files @ 307566e1ab58) diff --git a/gsk4/src/auto/vulkan_renderer.rs b/gsk4/src/auto/vulkan_renderer.rs index dfde402d21b1..19317182d887 100644 --- a/gsk4/src/auto/vulkan_renderer.rs +++ b/gsk4/src/auto/vulkan_renderer.rs @@ -4,7 +4,6 @@ use crate::Renderer; use glib::{prelude::*, translate::*}; -use std::fmt; glib::wrapper! { #[doc(alias = "GskVulkanRenderer")] @@ -28,9 +27,3 @@ impl Default for VulkanRenderer { Self::new() } } - -impl fmt::Display for VulkanRenderer { - fn fmt(&self, f: &mut fmt::Formatter) -> fmt::Result { - f.write_str("VulkanRenderer") - } -} diff --git a/gsk4/sys/tests/abi.rs b/gsk4/sys/tests/abi.rs index 63d845b638c4..a1b64bf4869d 100644 --- a/gsk4/sys/tests/abi.rs +++ b/gsk4/sys/tests/abi.rs @@ -10,7 +10,7 @@ use std::error::Error; use std::ffi::OsString; use std::mem::{align_of, size_of}; use std::path::Path; -use std::process::Command; +use std::process::{Command, Stdio}; use std::str; use tempfile::Builder; @@ -70,9 +70,11 @@ fn pkg_config_cflags(packages: &[&str]) -> Result, Box> { let mut cmd = Command::new(pkg_config); cmd.arg("--cflags"); cmd.args(packages); + cmd.stderr(Stdio::inherit()); let out = cmd.output()?; if !out.status.success() { - return Err(format!("command {cmd:?} returned {}", out.status).into()); + let (status, stdout) = (out.status, String::from_utf8_lossy(&out.stdout)); + return Err(format!("command {cmd:?} failed, {status:?}\nstdout: {stdout}").into()); } let stdout = str::from_utf8(&out.stdout)?; Ok(shell_words::split(stdout.trim())?) @@ -187,13 +189,15 @@ fn get_c_output(name: &str) -> Result> { let cc = Compiler::new().expect("configured compiler"); cc.compile(&c_file, &exe)?; - let mut abi_cmd = Command::new(exe); - let output = abi_cmd.output()?; - if !output.status.success() { - return Err(format!("command {abi_cmd:?} failed, {output:?}").into()); + let mut cmd = Command::new(exe); + cmd.stderr(Stdio::inherit()); + let out = cmd.output()?; + if !out.status.success() { + let (status, stdout) = (out.status, String::from_utf8_lossy(&out.stdout)); + return Err(format!("command {cmd:?} failed, {status:?}\nstdout: {stdout}").into()); } - Ok(String::from_utf8(output.stdout)?) + Ok(String::from_utf8(out.stdout)?) } const RUST_LAYOUTS: &[(&str, Layout)] = &[ diff --git a/gsk4/sys/versions.txt b/gsk4/sys/versions.txt index 17a2d3ead99b..b317bfad4458 100644 --- a/gsk4/sys/versions.txt +++ b/gsk4/sys/versions.txt @@ -1,2 +1,2 @@ -Generated by gir (https://github.com/gtk-rs/gir @ 76bbe9b90aaa) +Generated by gir (https://github.com/gtk-rs/gir @ f477238c6579) from gir-files (https://github.com/gtk-rs/gir-files @ 307566e1ab58) diff --git a/gtk4/src/auto/about_dialog.rs b/gtk4/src/auto/about_dialog.rs index 843c4bf555e4..70edc9a3ff5b 100644 --- a/gtk4/src/auto/about_dialog.rs +++ b/gtk4/src/auto/about_dialog.rs @@ -11,7 +11,7 @@ use glib::{ signal::{connect_raw, SignalHandlerId}, translate::*, }; -use std::{boxed::Box as Box_, fmt, mem::transmute}; +use std::{boxed::Box as Box_, mem::transmute}; glib::wrapper! { #[doc(alias = "GtkAboutDialog")] @@ -1192,9 +1192,3 @@ impl AboutDialogBuilder { self.builder.build() } } - -impl fmt::Display for AboutDialog { - fn fmt(&self, f: &mut fmt::Formatter) -> fmt::Result { - f.write_str("AboutDialog") - } -} diff --git a/gtk4/src/auto/accessible.rs b/gtk4/src/auto/accessible.rs index 1dce5b71a7cd..e0d1970fcc70 100644 --- a/gtk4/src/auto/accessible.rs +++ b/gtk4/src/auto/accessible.rs @@ -14,7 +14,7 @@ use glib::{ #[cfg(feature = "v4_10")] #[cfg_attr(docsrs, doc(cfg(feature = "v4_10")))] use std::mem; -use std::{boxed::Box as Box_, fmt, mem::transmute}; +use std::{boxed::Box as Box_, mem::transmute}; glib::wrapper! { #[doc(alias = "GtkAccessible")] @@ -228,9 +228,3 @@ pub trait AccessibleExt: IsA + sealed::Sealed + 'static { } impl> AccessibleExt for O {} - -impl fmt::Display for Accessible { - fn fmt(&self, f: &mut fmt::Formatter) -> fmt::Result { - f.write_str("Accessible") - } -} diff --git a/gtk4/src/auto/accessible_range.rs b/gtk4/src/auto/accessible_range.rs index 90de941f8e9e..c648348e759a 100644 --- a/gtk4/src/auto/accessible_range.rs +++ b/gtk4/src/auto/accessible_range.rs @@ -4,7 +4,6 @@ use crate::Accessible; use glib::prelude::*; -use std::fmt; glib::wrapper! { #[doc(alias = "GtkAccessibleRange")] @@ -27,9 +26,3 @@ mod sealed { pub trait AccessibleRangeExt: IsA + sealed::Sealed + 'static {} impl> AccessibleRangeExt for O {} - -impl fmt::Display for AccessibleRange { - fn fmt(&self, f: &mut fmt::Formatter) -> fmt::Result { - f.write_str("AccessibleRange") - } -} diff --git a/gtk4/src/auto/action_bar.rs b/gtk4/src/auto/action_bar.rs index e1fd18b0e7b9..43a5ebc7744f 100644 --- a/gtk4/src/auto/action_bar.rs +++ b/gtk4/src/auto/action_bar.rs @@ -10,7 +10,7 @@ use glib::{ signal::{connect_raw, SignalHandlerId}, translate::*, }; -use std::{boxed::Box as Box_, fmt, mem::transmute}; +use std::{boxed::Box as Box_, mem::transmute}; glib::wrapper! { #[doc(alias = "GtkActionBar")] @@ -329,9 +329,3 @@ impl ActionBarBuilder { self.builder.build() } } - -impl fmt::Display for ActionBar { - fn fmt(&self, f: &mut fmt::Formatter) -> fmt::Result { - f.write_str("ActionBar") - } -} diff --git a/gtk4/src/auto/actionable.rs b/gtk4/src/auto/actionable.rs index a0630a59ba1a..b06c94787128 100644 --- a/gtk4/src/auto/actionable.rs +++ b/gtk4/src/auto/actionable.rs @@ -8,7 +8,7 @@ use glib::{ signal::{connect_raw, SignalHandlerId}, translate::*, }; -use std::{boxed::Box as Box_, fmt, mem::transmute}; +use std::{boxed::Box as Box_, mem::transmute}; glib::wrapper! { #[doc(alias = "GtkActionable")] @@ -133,9 +133,3 @@ pub trait ActionableExt: IsA + sealed::Sealed + 'static { } impl> ActionableExt for O {} - -impl fmt::Display for Actionable { - fn fmt(&self, f: &mut fmt::Formatter) -> fmt::Result { - f.write_str("Actionable") - } -} diff --git a/gtk4/src/auto/activate_action.rs b/gtk4/src/auto/activate_action.rs index feb2f74f6611..6fc08820a2ba 100644 --- a/gtk4/src/auto/activate_action.rs +++ b/gtk4/src/auto/activate_action.rs @@ -4,7 +4,6 @@ use crate::ShortcutAction; use glib::translate::*; -use std::fmt; glib::wrapper! { #[doc(alias = "GtkActivateAction")] @@ -22,9 +21,3 @@ impl ActivateAction { unsafe { from_glib_none(ffi::gtk_activate_action_get()) } } } - -impl fmt::Display for ActivateAction { - fn fmt(&self, f: &mut fmt::Formatter) -> fmt::Result { - f.write_str("ActivateAction") - } -} diff --git a/gtk4/src/auto/adjustment.rs b/gtk4/src/auto/adjustment.rs index 78f0f3fd4c91..1b44dc3144f9 100644 --- a/gtk4/src/auto/adjustment.rs +++ b/gtk4/src/auto/adjustment.rs @@ -7,7 +7,7 @@ use glib::{ signal::{connect_raw, SignalHandlerId}, translate::*, }; -use std::{boxed::Box as Box_, fmt, mem::transmute}; +use std::{boxed::Box as Box_, mem::transmute}; glib::wrapper! { #[doc(alias = "GtkAdjustment")] @@ -431,9 +431,3 @@ pub trait AdjustmentExt: IsA + sealed::Sealed + 'static { } impl> AdjustmentExt for O {} - -impl fmt::Display for Adjustment { - fn fmt(&self, f: &mut fmt::Formatter) -> fmt::Result { - f.write_str("Adjustment") - } -} diff --git a/gtk4/src/auto/alert_dialog.rs b/gtk4/src/auto/alert_dialog.rs index b98b127669fc..6759c4076ef8 100644 --- a/gtk4/src/auto/alert_dialog.rs +++ b/gtk4/src/auto/alert_dialog.rs @@ -8,7 +8,7 @@ use glib::{ signal::{connect_raw, SignalHandlerId}, translate::*, }; -use std::{boxed::Box as Box_, fmt, mem::transmute, pin::Pin, ptr}; +use std::{boxed::Box as Box_, mem::transmute, pin::Pin, ptr}; glib::wrapper! { #[doc(alias = "GtkAlertDialog")] @@ -420,9 +420,3 @@ impl AlertDialogBuilder { self.builder.build() } } - -impl fmt::Display for AlertDialog { - fn fmt(&self, f: &mut fmt::Formatter) -> fmt::Result { - f.write_str("AlertDialog") - } -} diff --git a/gtk4/src/auto/alternative_trigger.rs b/gtk4/src/auto/alternative_trigger.rs index eef5237a3bd4..873c948da8db 100644 --- a/gtk4/src/auto/alternative_trigger.rs +++ b/gtk4/src/auto/alternative_trigger.rs @@ -4,7 +4,6 @@ use crate::ShortcutTrigger; use glib::{prelude::*, translate::*}; -use std::fmt; glib::wrapper! { #[doc(alias = "GtkAlternativeTrigger")] @@ -101,9 +100,3 @@ impl AlternativeTriggerBuilder { self.builder.build() } } - -impl fmt::Display for AlternativeTrigger { - fn fmt(&self, f: &mut fmt::Formatter) -> fmt::Result { - f.write_str("AlternativeTrigger") - } -} diff --git a/gtk4/src/auto/any_filter.rs b/gtk4/src/auto/any_filter.rs index 60f1f53e17b8..9109d01d738f 100644 --- a/gtk4/src/auto/any_filter.rs +++ b/gtk4/src/auto/any_filter.rs @@ -4,7 +4,6 @@ use crate::{Buildable, Filter, MultiFilter}; use glib::translate::*; -use std::fmt; glib::wrapper! { #[doc(alias = "GtkAnyFilter")] @@ -28,9 +27,3 @@ impl Default for AnyFilter { Self::new() } } - -impl fmt::Display for AnyFilter { - fn fmt(&self, f: &mut fmt::Formatter) -> fmt::Result { - f.write_str("AnyFilter") - } -} diff --git a/gtk4/src/auto/app_chooser.rs b/gtk4/src/auto/app_chooser.rs index 852b865e2835..94b23754e916 100644 --- a/gtk4/src/auto/app_chooser.rs +++ b/gtk4/src/auto/app_chooser.rs @@ -5,7 +5,6 @@ use crate::{Accessible, Buildable, ConstraintTarget, Widget}; use glib::{prelude::*, translate::*}; -use std::fmt; glib::wrapper! { #[doc(alias = "GtkAppChooser")] @@ -61,9 +60,3 @@ pub trait AppChooserExt: IsA + sealed::Sealed + 'static { } impl> AppChooserExt for O {} - -impl fmt::Display for AppChooser { - fn fmt(&self, f: &mut fmt::Formatter) -> fmt::Result { - f.write_str("AppChooser") - } -} diff --git a/gtk4/src/auto/app_chooser_button.rs b/gtk4/src/auto/app_chooser_button.rs index a1736aa7ecd0..47f6e02dfa2b 100644 --- a/gtk4/src/auto/app_chooser_button.rs +++ b/gtk4/src/auto/app_chooser_button.rs @@ -12,7 +12,7 @@ use glib::{ signal::{connect_raw, SignalHandlerId}, translate::*, }; -use std::{boxed::Box as Box_, fmt, mem::transmute}; +use std::{boxed::Box as Box_, mem::transmute}; glib::wrapper! { #[doc(alias = "GtkAppChooserButton")] @@ -603,9 +603,3 @@ impl AppChooserButtonBuilder { self.builder.build() } } - -impl fmt::Display for AppChooserButton { - fn fmt(&self, f: &mut fmt::Formatter) -> fmt::Result { - f.write_str("AppChooserButton") - } -} diff --git a/gtk4/src/auto/app_chooser_dialog.rs b/gtk4/src/auto/app_chooser_dialog.rs index 6a4315d922ed..9259f875ff4b 100644 --- a/gtk4/src/auto/app_chooser_dialog.rs +++ b/gtk4/src/auto/app_chooser_dialog.rs @@ -12,7 +12,7 @@ use glib::{ signal::{connect_raw, SignalHandlerId}, translate::*, }; -use std::{boxed::Box as Box_, fmt, mem::transmute}; +use std::{boxed::Box as Box_, mem::transmute}; glib::wrapper! { #[doc(alias = "GtkAppChooserDialog")] @@ -126,9 +126,3 @@ impl AppChooserDialog { } } } - -impl fmt::Display for AppChooserDialog { - fn fmt(&self, f: &mut fmt::Formatter) -> fmt::Result { - f.write_str("AppChooserDialog") - } -} diff --git a/gtk4/src/auto/app_chooser_widget.rs b/gtk4/src/auto/app_chooser_widget.rs index 8e1dfe7a8d2b..347e58a2fb9e 100644 --- a/gtk4/src/auto/app_chooser_widget.rs +++ b/gtk4/src/auto/app_chooser_widget.rs @@ -12,7 +12,7 @@ use glib::{ signal::{connect_raw, SignalHandlerId}, translate::*, }; -use std::{boxed::Box as Box_, fmt, mem::transmute}; +use std::{boxed::Box as Box_, mem::transmute}; glib::wrapper! { #[doc(alias = "GtkAppChooserWidget")] @@ -635,9 +635,3 @@ impl AppChooserWidgetBuilder { self.builder.build() } } - -impl fmt::Display for AppChooserWidget { - fn fmt(&self, f: &mut fmt::Formatter) -> fmt::Result { - f.write_str("AppChooserWidget") - } -} diff --git a/gtk4/src/auto/application.rs b/gtk4/src/auto/application.rs index d86a0a9eb511..b065f54b4cf2 100644 --- a/gtk4/src/auto/application.rs +++ b/gtk4/src/auto/application.rs @@ -8,7 +8,7 @@ use glib::{ signal::{connect_raw, SignalHandlerId}, translate::*, }; -use std::{boxed::Box as Box_, fmt, mem::transmute}; +use std::{boxed::Box as Box_, mem::transmute}; glib::wrapper! { #[doc(alias = "GtkApplication")] @@ -461,9 +461,3 @@ pub trait GtkApplicationExt: IsA + sealed::Sealed + 'static { } impl> GtkApplicationExt for O {} - -impl fmt::Display for Application { - fn fmt(&self, f: &mut fmt::Formatter) -> fmt::Result { - f.write_str("Application") - } -} diff --git a/gtk4/src/auto/application_window.rs b/gtk4/src/auto/application_window.rs index b5081b328194..af32e46b654c 100644 --- a/gtk4/src/auto/application_window.rs +++ b/gtk4/src/auto/application_window.rs @@ -11,7 +11,7 @@ use glib::{ signal::{connect_raw, SignalHandlerId}, translate::*, }; -use std::{boxed::Box as Box_, fmt, mem::transmute}; +use std::{boxed::Box as Box_, mem::transmute}; glib::wrapper! { #[doc(alias = "GtkApplicationWindow")] @@ -501,9 +501,3 @@ pub trait ApplicationWindowExt: IsA + sealed::Sealed + 'stati } impl> ApplicationWindowExt for O {} - -impl fmt::Display for ApplicationWindow { - fn fmt(&self, f: &mut fmt::Formatter) -> fmt::Result { - f.write_str("ApplicationWindow") - } -} diff --git a/gtk4/src/auto/aspect_frame.rs b/gtk4/src/auto/aspect_frame.rs index 64f6a5be0293..3695795d29e4 100644 --- a/gtk4/src/auto/aspect_frame.rs +++ b/gtk4/src/auto/aspect_frame.rs @@ -10,7 +10,7 @@ use glib::{ signal::{connect_raw, SignalHandlerId}, translate::*, }; -use std::{boxed::Box as Box_, fmt, mem::transmute}; +use std::{boxed::Box as Box_, mem::transmute}; glib::wrapper! { #[doc(alias = "GtkAspectFrame")] @@ -471,9 +471,3 @@ impl AspectFrameBuilder { self.builder.build() } } - -impl fmt::Display for AspectFrame { - fn fmt(&self, f: &mut fmt::Formatter) -> fmt::Result { - f.write_str("AspectFrame") - } -} diff --git a/gtk4/src/auto/assistant.rs b/gtk4/src/auto/assistant.rs index 13de8ba7a3b2..9ba8855fea39 100644 --- a/gtk4/src/auto/assistant.rs +++ b/gtk4/src/auto/assistant.rs @@ -12,7 +12,7 @@ use glib::{ signal::{connect_raw, SignalHandlerId}, translate::*, }; -use std::{boxed::Box as Box_, fmt, mem::transmute}; +use std::{boxed::Box as Box_, mem::transmute}; glib::wrapper! { #[doc(alias = "GtkAssistant")] @@ -832,9 +832,3 @@ impl AssistantBuilder { self.builder.build() } } - -impl fmt::Display for Assistant { - fn fmt(&self, f: &mut fmt::Formatter) -> fmt::Result { - f.write_str("Assistant") - } -} diff --git a/gtk4/src/auto/assistant_page.rs b/gtk4/src/auto/assistant_page.rs index 197cbccefa55..c75964d55d58 100644 --- a/gtk4/src/auto/assistant_page.rs +++ b/gtk4/src/auto/assistant_page.rs @@ -9,7 +9,7 @@ use glib::{ signal::{connect_raw, SignalHandlerId}, translate::*, }; -use std::{boxed::Box as Box_, fmt, mem::transmute}; +use std::{boxed::Box as Box_, mem::transmute}; glib::wrapper! { #[doc(alias = "GtkAssistantPage")] @@ -133,9 +133,3 @@ impl AssistantPage { } } } - -impl fmt::Display for AssistantPage { - fn fmt(&self, f: &mut fmt::Formatter) -> fmt::Result { - f.write_str("AssistantPage") - } -} diff --git a/gtk4/src/auto/at_context.rs b/gtk4/src/auto/at_context.rs index c53867f69089..0c92cef95cf3 100644 --- a/gtk4/src/auto/at_context.rs +++ b/gtk4/src/auto/at_context.rs @@ -8,7 +8,7 @@ use glib::{ signal::{connect_raw, SignalHandlerId}, translate::*, }; -use std::{boxed::Box as Box_, fmt, mem::transmute}; +use std::{boxed::Box as Box_, mem::transmute}; glib::wrapper! { #[doc(alias = "GtkATContext")] @@ -133,9 +133,3 @@ impl ATContext { } } } - -impl fmt::Display for ATContext { - fn fmt(&self, f: &mut fmt::Formatter) -> fmt::Result { - f.write_str("ATContext") - } -} diff --git a/gtk4/src/auto/bin_layout.rs b/gtk4/src/auto/bin_layout.rs index d1a713b1e2c2..9f87b52aaec8 100644 --- a/gtk4/src/auto/bin_layout.rs +++ b/gtk4/src/auto/bin_layout.rs @@ -4,7 +4,6 @@ use crate::LayoutManager; use glib::{prelude::*, translate::*}; -use std::fmt; glib::wrapper! { #[doc(alias = "GtkBinLayout")] @@ -28,9 +27,3 @@ impl Default for BinLayout { Self::new() } } - -impl fmt::Display for BinLayout { - fn fmt(&self, f: &mut fmt::Formatter) -> fmt::Result { - f.write_str("BinLayout") - } -} diff --git a/gtk4/src/auto/bookmark_list.rs b/gtk4/src/auto/bookmark_list.rs index 6955bf283451..a76065c07f09 100644 --- a/gtk4/src/auto/bookmark_list.rs +++ b/gtk4/src/auto/bookmark_list.rs @@ -7,7 +7,7 @@ use glib::{ signal::{connect_raw, SignalHandlerId}, translate::*, }; -use std::{boxed::Box as Box_, fmt, mem::transmute}; +use std::{boxed::Box as Box_, mem::transmute}; glib::wrapper! { #[doc(alias = "GtkBookmarkList")] @@ -129,9 +129,3 @@ impl BookmarkList { } } } - -impl fmt::Display for BookmarkList { - fn fmt(&self, f: &mut fmt::Formatter) -> fmt::Result { - f.write_str("BookmarkList") - } -} diff --git a/gtk4/src/auto/bool_filter.rs b/gtk4/src/auto/bool_filter.rs index 7ff214a7a59a..d0ced56ade29 100644 --- a/gtk4/src/auto/bool_filter.rs +++ b/gtk4/src/auto/bool_filter.rs @@ -8,7 +8,7 @@ use glib::{ signal::{connect_raw, SignalHandlerId}, translate::*, }; -use std::{boxed::Box as Box_, fmt, mem::transmute}; +use std::{boxed::Box as Box_, mem::transmute}; glib::wrapper! { #[doc(alias = "GtkBoolFilter")] @@ -159,9 +159,3 @@ impl BoolFilterBuilder { self.builder.build() } } - -impl fmt::Display for BoolFilter { - fn fmt(&self, f: &mut fmt::Formatter) -> fmt::Result { - f.write_str("BoolFilter") - } -} diff --git a/gtk4/src/auto/box_.rs b/gtk4/src/auto/box_.rs index f1fb8738178f..78d2df3339e0 100644 --- a/gtk4/src/auto/box_.rs +++ b/gtk4/src/auto/box_.rs @@ -11,7 +11,7 @@ use glib::{ signal::{connect_raw, SignalHandlerId}, translate::*, }; -use std::{boxed::Box as Box_, fmt, mem::transmute}; +use std::{boxed::Box as Box_, mem::transmute}; glib::wrapper! { #[doc(alias = "GtkBox")] @@ -510,9 +510,3 @@ pub trait BoxExt: IsA + sealed::Sealed + 'static { } impl> BoxExt for O {} - -impl fmt::Display for Box { - fn fmt(&self, f: &mut fmt::Formatter) -> fmt::Result { - f.write_str("Box") - } -} diff --git a/gtk4/src/auto/box_layout.rs b/gtk4/src/auto/box_layout.rs index ed090abaf2cb..c2d53629ff85 100644 --- a/gtk4/src/auto/box_layout.rs +++ b/gtk4/src/auto/box_layout.rs @@ -8,7 +8,7 @@ use glib::{ signal::{connect_raw, SignalHandlerId}, translate::*, }; -use std::{boxed::Box as Box_, fmt, mem::transmute}; +use std::{boxed::Box as Box_, mem::transmute}; glib::wrapper! { #[doc(alias = "GtkBoxLayout")] @@ -258,9 +258,3 @@ impl BoxLayoutBuilder { self.builder.build() } } - -impl fmt::Display for BoxLayout { - fn fmt(&self, f: &mut fmt::Formatter) -> fmt::Result { - f.write_str("BoxLayout") - } -} diff --git a/gtk4/src/auto/buildable.rs b/gtk4/src/auto/buildable.rs index 781bcdf124af..2bcaa943145a 100644 --- a/gtk4/src/auto/buildable.rs +++ b/gtk4/src/auto/buildable.rs @@ -3,7 +3,6 @@ // DO NOT EDIT use glib::{prelude::*, translate::*}; -use std::fmt; glib::wrapper! { #[doc(alias = "GtkBuildable")] @@ -36,9 +35,3 @@ pub trait BuildableExt: IsA + sealed::Sealed + 'static { } impl> BuildableExt for O {} - -impl fmt::Display for Buildable { - fn fmt(&self, f: &mut fmt::Formatter) -> fmt::Result { - f.write_str("Buildable") - } -} diff --git a/gtk4/src/auto/builder.rs b/gtk4/src/auto/builder.rs index a0c1e8007e04..4c4cd7db0b3f 100644 --- a/gtk4/src/auto/builder.rs +++ b/gtk4/src/auto/builder.rs @@ -8,7 +8,7 @@ use glib::{ signal::{connect_raw, SignalHandlerId}, translate::*, }; -use std::{boxed::Box as Box_, fmt, mem::transmute, ptr}; +use std::{boxed::Box as Box_, mem::transmute, ptr}; glib::wrapper! { #[doc(alias = "GtkBuilder")] @@ -413,9 +413,3 @@ impl Default for Builder { Self::new() } } - -impl fmt::Display for Builder { - fn fmt(&self, f: &mut fmt::Formatter) -> fmt::Result { - f.write_str("Builder") - } -} diff --git a/gtk4/src/auto/builder_list_item_factory.rs b/gtk4/src/auto/builder_list_item_factory.rs index c99e6b2ae763..c49f0313a4ba 100644 --- a/gtk4/src/auto/builder_list_item_factory.rs +++ b/gtk4/src/auto/builder_list_item_factory.rs @@ -4,7 +4,6 @@ use crate::{BuilderScope, ListItemFactory}; use glib::{prelude::*, translate::*}; -use std::fmt; glib::wrapper! { #[doc(alias = "GtkBuilderListItemFactory")] @@ -78,9 +77,3 @@ impl BuilderListItemFactory { } } } - -impl fmt::Display for BuilderListItemFactory { - fn fmt(&self, f: &mut fmt::Formatter) -> fmt::Result { - f.write_str("BuilderListItemFactory") - } -} diff --git a/gtk4/src/auto/builder_scope.rs b/gtk4/src/auto/builder_scope.rs index a0b5112c019b..0f3d2d78e9f4 100644 --- a/gtk4/src/auto/builder_scope.rs +++ b/gtk4/src/auto/builder_scope.rs @@ -3,7 +3,6 @@ // DO NOT EDIT use glib::prelude::*; -use std::fmt; glib::wrapper! { #[doc(alias = "GtkBuilderScope")] @@ -26,9 +25,3 @@ mod sealed { pub trait BuilderScopeExt: IsA + sealed::Sealed + 'static {} impl> BuilderScopeExt for O {} - -impl fmt::Display for BuilderScope { - fn fmt(&self, f: &mut fmt::Formatter) -> fmt::Result { - f.write_str("BuilderScope") - } -} diff --git a/gtk4/src/auto/button.rs b/gtk4/src/auto/button.rs index 58520b4a8870..6a102823f2b0 100644 --- a/gtk4/src/auto/button.rs +++ b/gtk4/src/auto/button.rs @@ -11,7 +11,7 @@ use glib::{ signal::{connect_raw, SignalHandlerId}, translate::*, }; -use std::{boxed::Box as Box_, fmt, mem::transmute}; +use std::{boxed::Box as Box_, mem::transmute}; glib::wrapper! { #[doc(alias = "GtkButton")] @@ -648,9 +648,3 @@ pub trait ButtonExt: IsA