Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Regenerate with no more display impls #1471

Closed
wants to merge 1 commit into from
Closed

Regenerate with no more display impls #1471

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
The table of contents is too big for display.
Diff view
Diff view
  •  
  •  
  •  
2 changes: 1 addition & 1 deletion gdk4-wayland/src/auto/versions.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -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)
7 changes: 0 additions & 7 deletions gdk4-wayland/src/auto/wayland_device.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,6 @@
// DO NOT EDIT

use glib::translate::*;
use std::fmt;

glib::wrapper! {
#[doc(alias = "GdkWaylandDevice")]
Expand All @@ -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")
}
}
7 changes: 0 additions & 7 deletions gdk4-wayland/src/auto/wayland_display.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,6 @@
#![allow(deprecated)]

use glib::translate::*;
use std::fmt;

glib::wrapper! {
#[doc(alias = "GdkWaylandDisplay")]
Expand Down Expand Up @@ -61,9 +60,3 @@
}
}
}

impl fmt::Display for WaylandDisplay {
fn fmt(&self, f: &mut fmt::Formatter) -> fmt::Result {
f.write_str("WaylandDisplay")
}
}
8 changes: 0 additions & 8 deletions gdk4-wayland/src/auto/wayland_gl_context.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,8 +2,6 @@
// from gir-files (https://github.com/gtk-rs/gir-files)
// DO NOT EDIT

use std::fmt;

glib::wrapper! {
#[doc(alias = "GdkWaylandGLContext")]
pub struct WaylandGLContext(Object<ffi::GdkWaylandGLContext, ffi::GdkWaylandGLContextClass>) @extends gdk::GLContext, gdk::DrawContext;
Expand All @@ -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")
}
}
8 changes: 0 additions & 8 deletions gdk4-wayland/src/auto/wayland_monitor.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,8 +2,6 @@
// from gir-files (https://github.com/gtk-rs/gir-files)
// DO NOT EDIT

use std::fmt;

glib::wrapper! {
#[doc(alias = "GdkWaylandMonitor")]
pub struct WaylandMonitor(Object<ffi::GdkWaylandMonitor, ffi::GdkWaylandMonitorClass>) @extends gdk::Monitor;
Expand All @@ -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")
}
}
7 changes: 0 additions & 7 deletions gdk4-wayland/src/auto/wayland_popup.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,6 @@
// DO NOT EDIT

use crate::WaylandSurface;
use std::fmt;

glib::wrapper! {
#[doc(alias = "GdkWaylandPopup")]
Expand All @@ -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")
}
}
8 changes: 0 additions & 8 deletions gdk4-wayland/src/auto/wayland_seat.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,8 +2,6 @@
// from gir-files (https://github.com/gtk-rs/gir-files)
// DO NOT EDIT

use std::fmt;

glib::wrapper! {
#[doc(alias = "GdkWaylandSeat")]
pub struct WaylandSeat(Object<ffi::GdkWaylandSeat, ffi::GdkWaylandSeatClass>) @extends gdk::Seat;
Expand All @@ -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")
}
}
8 changes: 0 additions & 8 deletions gdk4-wayland/src/auto/wayland_surface.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,8 +2,6 @@
// from gir-files (https://github.com/gtk-rs/gir-files)
// DO NOT EDIT

use std::fmt;

glib::wrapper! {
#[doc(alias = "GdkWaylandSurface")]
pub struct WaylandSurface(Object<ffi::GdkWaylandSurface>) @extends gdk::Surface;
Expand All @@ -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")
}
}
8 changes: 1 addition & 7 deletions gdk4-wayland/src/auto/wayland_toplevel.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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")]
Expand Down Expand Up @@ -89,9 +89,3 @@ impl WaylandToplevel {
}
}
}

impl fmt::Display for WaylandToplevel {
fn fmt(&self, f: &mut fmt::Formatter) -> fmt::Result {
f.write_str("WaylandToplevel")
}
}
2 changes: 1 addition & 1 deletion gdk4-wayland/sys/versions.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -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)
15 changes: 0 additions & 15 deletions gdk4-win32/src/auto/enums.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,6 @@
// DO NOT EDIT

use glib::translate::*;
use std::fmt;

#[derive(Debug, Eq, PartialEq, Ord, PartialOrd, Hash, Clone, Copy)]
#[non_exhaustive]
Expand All @@ -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;
Expand Down
2 changes: 1 addition & 1 deletion gdk4-win32/src/auto/versions.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -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)
8 changes: 1 addition & 7 deletions gdk4-win32/src/auto/win32_display.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@

use crate::Win32HCursor;
use glib::{prelude::*, translate::*};
use std::{fmt, mem};
use std::mem;

glib::wrapper! {
#[doc(alias = "GdkWin32Display")]
Expand Down Expand Up @@ -69,9 +69,3 @@ impl Win32Display {
}
}
}

impl fmt::Display for Win32Display {
fn fmt(&self, f: &mut fmt::Formatter) -> fmt::Result {
f.write_str("Win32Display")
}
}
8 changes: 0 additions & 8 deletions gdk4-win32/src/auto/win32_display_manager.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,8 +2,6 @@
// from gir-files (https://github.com/gtk-rs/gir-files)
// DO NOT EDIT

use std::fmt;

glib::wrapper! {
#[doc(alias = "GdkWin32DisplayManager")]
pub struct Win32DisplayManager(Object<ffi::GdkWin32DisplayManager, ffi::GdkWin32DisplayManagerClass>) @extends gdk::DisplayManager;
Expand All @@ -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")
}
}
8 changes: 0 additions & 8 deletions gdk4-win32/src/auto/win32_drag.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,8 +2,6 @@
// from gir-files (https://github.com/gtk-rs/gir-files)
// DO NOT EDIT

use std::fmt;

glib::wrapper! {
#[doc(alias = "GdkWin32Drag")]
pub struct Win32Drag(Object<ffi::GdkWin32Drag, ffi::GdkWin32DragClass>) @extends gdk::Drag;
Expand All @@ -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")
}
}
8 changes: 0 additions & 8 deletions gdk4-win32/src/auto/win32_gl_context.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,8 +2,6 @@
// from gir-files (https://github.com/gtk-rs/gir-files)
// DO NOT EDIT

use std::fmt;

glib::wrapper! {
#[doc(alias = "GdkWin32GLContext")]
pub struct Win32GLContext(Object<ffi::GdkWin32GLContext, ffi::GdkWin32GLContextClass>) @extends gdk::GLContext, gdk::DrawContext;
Expand All @@ -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")
}
}
7 changes: 0 additions & 7 deletions gdk4-win32/src/auto/win32_hcursor.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,8 +2,7 @@
// from gir-files (https://github.com/gtk-rs/gir-files)
// DO NOT EDIT

use glib::{prelude::*, translate::*};

Check warning on line 5 in gdk4-win32/src/auto/win32_hcursor.rs

View workflow job for this annotation

GitHub Actions / Windows MSVC 

unused import: `translate`

Check warning on line 5 in gdk4-win32/src/auto/win32_hcursor.rs

View workflow job for this annotation

GitHub Actions / Windows MSVC 

unused import: `translate`

Check warning on line 5 in gdk4-win32/src/auto/win32_hcursor.rs

View workflow job for this annotation

GitHub Actions / Windows MSVC 

unused import: `translate`
use std::fmt;

glib::wrapper! {
#[doc(alias = "GdkWin32HCursor")]
Expand All @@ -23,9 +22,3 @@
ObjectExt::property(self, "display")
}
}

impl fmt::Display for Win32HCursor {
fn fmt(&self, f: &mut fmt::Formatter) -> fmt::Result {
f.write_str("Win32HCursor")
}
}
7 changes: 0 additions & 7 deletions gdk4-win32/src/auto/win32_monitor.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,6 @@
// DO NOT EDIT

use glib::{prelude::*, translate::*};
use std::fmt;

glib::wrapper! {
#[doc(alias = "GdkWin32Monitor")]
Expand All @@ -29,9 +28,3 @@ impl Win32Monitor {
}
}
}

impl fmt::Display for Win32Monitor {
fn fmt(&self, f: &mut fmt::Formatter) -> fmt::Result {
f.write_str("Win32Monitor")
}
}
8 changes: 0 additions & 8 deletions gdk4-win32/src/auto/win32_screen.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,8 +2,6 @@
// from gir-files (https://github.com/gtk-rs/gir-files)
// DO NOT EDIT

use std::fmt;

glib::wrapper! {
#[doc(alias = "GdkWin32Screen")]
pub struct Win32Screen(Object<ffi::GdkWin32Screen, ffi::GdkWin32ScreenClass>);
Expand All @@ -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")
}
}
7 changes: 0 additions & 7 deletions gdk4-win32/src/auto/win32_surface.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,6 @@
#![allow(deprecated)]

use glib::{prelude::*, translate::*};
use std::fmt;

glib::wrapper! {
#[doc(alias = "GdkWin32Surface")]
Expand Down Expand Up @@ -35,9 +34,3 @@ impl Win32Surface {
}
}
}

impl fmt::Display for Win32Surface {
fn fmt(&self, f: &mut fmt::Formatter) -> fmt::Result {
f.write_str("Win32Surface")
}
}
18 changes: 11 additions & 7 deletions gdk4-win32/sys/tests/abi.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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;

Expand Down Expand Up @@ -70,9 +70,11 @@ fn pkg_config_cflags(packages: &[&str]) -> Result<Vec<String>, Box<dyn Error>> {
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())?)
Expand Down Expand Up @@ -187,13 +189,15 @@ fn get_c_output(name: &str) -> Result<String, Box<dyn Error>> {
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)] = &[(
Expand Down
2 changes: 1 addition & 1 deletion gdk4-win32/sys/versions.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -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)
Loading
Loading