Skip to content
This repository was archived by the owner on Jun 8, 2021. It is now read-only.

Regen #81

Merged
merged 4 commits into from
Mar 13, 2018
Merged

Regen #81

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
5dc3254
Update submodules
EPashkin Mar 1, 2018
35e8be7
Ignore all C related or not portable constants
EPashkin Mar 9, 2018
7a8e39c
Make GPid and GPollFD manual
EPashkin Mar 9, 2018
1285a1d
Regen
EPashkin Mar 11, 2018
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
10 changes: 2 additions & 8 deletions atk-sys/src/lib.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
// This file was generated by gir (https://github.com/gtk-rs/gir @ 6114d1c)
// from gir-files (https://github.com/gtk-rs/gir-files @ 77d1f70)
// This file was generated by gir (https://github.com/gtk-rs/gir @ 6704a1c)
// from gir-files (https://github.com/gtk-rs/gir-files @ 4740f5e)
// DO NOT EDIT

#![allow(non_camel_case_types, non_upper_case_globals, non_snake_case)]
Expand Down Expand Up @@ -309,12 +309,6 @@ pub const ATK_VALUE_BEST: AtkValueType = 14;
pub const ATK_VALUE_LAST_DEFINED: AtkValueType = 15;

// Constants
pub const ATK_BINARY_AGE: c_int = 22611;
pub const ATK_INTERFACE_AGE: c_int = 1;
pub const ATK_MAJOR_VERSION: c_int = 2;
pub const ATK_MICRO_VERSION: c_int = 1;
pub const ATK_MINOR_VERSION: c_int = 26;
pub const ATK_VERSION_MIN_REQUIRED: c_int = 2;

// Flags
bitflags! {
Expand Down
9 changes: 9 additions & 0 deletions conf/gir-atk.toml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -7,3 +7,12 @@ external_libraries = [
"GLib",
"GObject",
]

ignore = [
"Atk.BINARY_AGE",
"Atk.INTERFACE_AGE",
"Atk.MAJOR_VERSION",
"Atk.MICRO_VERSION",
"Atk.MINOR_VERSION",
"Atk.VERSION_MIN_REQUIRED",
]
8 changes: 8 additions & 0 deletions conf/gir-gdk-pixbuf.toml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -9,6 +9,14 @@ external_libraries = [
"Gio",
]

ignore = [
"GdkPixbuf.PIXBUF_FEATURES_H",
"GdkPixbuf.PIXBUF_MAJOR",
"GdkPixbuf.PIXBUF_MICRO",
"GdkPixbuf.PIXBUF_MINOR",
"GdkPixbuf.PIXBUF_VERSION",
]

[[object]]
name = "GdkPixbuf.Pixbuf"
status = "generate"
Expand Down
42 changes: 42 additions & 0 deletions conf/gir-glib.toml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,8 +4,19 @@ library = "GLib"
version = "2.0"
min_cfg_version = "2.32"
ignore = [
"GLib.ANALYZER_ANALYZING",
"GLib.DIR_SEPARATOR",
"GLib.DIR_SEPARATOR_S",
"GLib.GINT16_FORMAT",
"GLib.GINT16_MODIFIER",
"GLib.GINT32_FORMAT",
"GLib.GINT32_MODIFIER",
"GLib.GINT64_FORMAT",
"GLib.GINT64_MODIFIER",
"GLib.GNUC_FUNCTION",
"GLib.GNUC_PRETTY_FUNCTION",
"GLib.GUINT16_FORMAT",
"GLib.GUINT32_FORMAT",
"GLib.GUINT64_FORMAT",
"GLib.GUINT64_MODIFIER",
"GLib.GINTPTR_FORMAT",
Expand All @@ -16,14 +27,37 @@ ignore = [
"GLib.GSIZE_MODIFIER",
"GLib.GSSIZE_FORMAT",
"GLib.GSSIZE_MODIFIER",
"GLib.HAVE_GINT64",
"GLib.HAVE_GNUC_VARARGS",
"GLib.HAVE_GNUC_VISIBILITY",
"GLib.HAVE_GROWING_STACK",
"GLib.HAVE_ISO_VARARGS",
"GLib.MAJOR_VERSION",
"GLib.MAXINT8",
"GLib.MAXINT16",
"GLib.MAXINT32",
"GLib.MAXINT64",
"GLib.MAXUINT8",
"GLib.MAXUINT16",
"GLib.MAXUINT32",
"GLib.MAXUINT64",
"GLib.MICRO_VERSION",
"GLib.MININT8",
"GLib.MININT16",
"GLib.MININT32",
"GLib.MININT64",
"GLib.MINOR_VERSION",
"GLib.MODULE_SUFFIX",
"GLib.PID_FORMAT",
"GLib.POLLFD_FORMAT",
"GLib.SEARCHPATH_SEPARATOR",
"GLib.SEARCHPATH_SEPARATOR_S",
"GLib.SIZEOF_LONG",
"GLib.SIZEOF_SIZE_T",
"GLib.SIZEOF_SSIZE_T",
"GLib.SIZEOF_VOID_P",
"GLib.VA_COPY_AS_ARRAY",
"GLib.VERSION_MIN_REQUIRED",
]

[[object]]
Expand Down Expand Up @@ -91,3 +125,11 @@ status = "generate"
[[object.function]]
name = "new_file"
is_windows_utf8 = true

[[object]]
name = "GLib.Pid"
status = "manual"

[[object]]
name = "GLib.PollFD"
status = "manual"
8 changes: 8 additions & 0 deletions conf/gir-gtk.toml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -17,3 +17,11 @@ external_libraries = [
manual = [
"xlib.Window",
]

ignore = [
"Gtk.BINARY_AGE",
"Gtk.INTERFACE_AGE",
"Gtk.MAJOR_VERSION",
"Gtk.MICRO_VERSION",
"Gtk.MINOR_VERSION",
]
9 changes: 2 additions & 7 deletions gdk-pixbuf-sys/src/lib.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
// This file was generated by gir (https://github.com/gtk-rs/gir @ 6114d1c)
// from gir-files (https://github.com/gtk-rs/gir-files @ 77d1f70)
// This file was generated by gir (https://github.com/gtk-rs/gir @ 6704a1c)
// from gir-files (https://github.com/gtk-rs/gir-files @ 4740f5e)
// DO NOT EDIT

#![allow(non_camel_case_types, non_upper_case_globals, non_snake_case)]
Expand Down Expand Up @@ -49,12 +49,7 @@ pub const GDK_PIXBUF_ROTATE_UPSIDEDOWN: GdkPixbufRotation = 180;
pub const GDK_PIXBUF_ROTATE_CLOCKWISE: GdkPixbufRotation = 270;

// Constants
pub const GDK_PIXBUF_FEATURES_H: c_int = 1;
pub const GDK_PIXBUF_MAGIC_NUMBER: c_int = 1197763408;
pub const GDK_PIXBUF_MAJOR: c_int = 2;
pub const GDK_PIXBUF_MICRO: c_int = 11;
pub const GDK_PIXBUF_MINOR: c_int = 36;
pub const GDK_PIXBUF_VERSION: *const c_char = b"2.36.11\0" as *const u8 as *const c_char;
pub const GDK_PIXDATA_HEADER_LENGTH: c_int = 24;

// Flags
Expand Down
8 changes: 4 additions & 4 deletions gdk-sys/src/lib.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
// This file was generated by gir (https://github.com/gtk-rs/gir @ 6114d1c)
// from gir-files (https://github.com/gtk-rs/gir-files @ 77d1f70)
// This file was generated by gir (https://github.com/gtk-rs/gir @ 6704a1c)
// from gir-files (https://github.com/gtk-rs/gir-files @ 4740f5e)
// DO NOT EDIT

#![allow(non_camel_case_types, non_upper_case_globals, non_snake_case)]
Expand Down Expand Up @@ -3675,7 +3675,7 @@ pub struct GdkEventTouchpadPinch {
pub type_: GdkEventType,
pub window: *mut GdkWindow,
pub send_event: i8,
pub phase: GdkTouchpadGesturePhase,
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Is it normal?

pub phase: i8,
pub n_fingers: i8,
pub time: u32,
pub x: c_double,
Expand Down Expand Up @@ -3717,7 +3717,7 @@ pub struct GdkEventTouchpadSwipe {
pub type_: GdkEventType,
pub window: *mut GdkWindow,
pub send_event: i8,
pub phase: GdkTouchpadGesturePhase,
pub phase: i8,
pub n_fingers: i8,
pub time: u32,
pub x: c_double,
Expand Down
4 changes: 2 additions & 2 deletions gio-sys/src/lib.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
// This file was generated by gir (https://github.com/gtk-rs/gir @ 6114d1c)
// from gir-files (https://github.com/gtk-rs/gir-files @ 77d1f70)
// This file was generated by gir (https://github.com/gtk-rs/gir @ 6704a1c)
// from gir-files (https://github.com/gtk-rs/gir-files @ 4740f5e)
// DO NOT EDIT

#![allow(non_camel_case_types, non_upper_case_globals, non_snake_case)]
Expand Down
2 changes: 1 addition & 1 deletion gir
Open in desktop
Submodule gir updated 16 files
+28 −0 README.md
+69 −0 src/analysis/constants.rs
+24 −0 src/analysis/mod.rs
+57 −0 src/codegen/constants.rs
+1 −1 src/codegen/doc/mod.rs
+5 −1 src/codegen/function_body_chunk.rs
+26 −5 src/codegen/general.rs
+13 −0 src/codegen/mod.rs
+3 −3 src/codegen/sys/build.rs
+2 −2 src/codegen/sys/cargo_toml.rs
+42 −17 src/codegen/sys/lib_.rs
+1 −0 src/codegen/trampoline.rs
+20 −13 src/config/config.rs
+58 −0 src/config/constants.rs
+6 −0 src/config/gobjects.rs
+1 −0 src/config/mod.rs
2 changes: 1 addition & 1 deletion gir-files
Open in desktop
Submodule gir-files updated 2 files
+2,509 −8,143 Gdk-3.0.gir
+6 −0 fix.sh
79 changes: 6 additions & 73 deletions glib-sys/src/lib.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,12 +1,16 @@
// This file was generated by gir (https://github.com/gtk-rs/gir @ 6114d1c)
// from gir-files (https://github.com/gtk-rs/gir-files @ 77d1f70)
// This file was generated by gir (https://github.com/gtk-rs/gir @ 6704a1c)
// from gir-files (https://github.com/gtk-rs/gir-files @ 4740f5e)
// DO NOT EDIT

#![allow(non_camel_case_types, non_upper_case_globals, non_snake_case)]

extern crate libc;
#[macro_use] extern crate bitflags;

mod manual;

pub use manual::*;

#[allow(unused_imports)]
use libc::{c_int, c_char, c_uchar, c_float, c_uint, c_double,
c_short, c_ushort, c_long, c_ulong,
Expand All @@ -28,7 +32,6 @@ pub struct Volatile<T>(T);
pub type GDateDay = u8;
pub type GDateYear = u16;
pub type GMutexLocker = c_void;
pub type GPid = c_int;
pub type GQuark = u32;
pub type GStrv = *mut *mut c_char;
pub type GTime = i32;
Expand Down Expand Up @@ -635,7 +638,6 @@ pub const G_VARIANT_PARSE_ERROR_UNTERMINATED_STRING_CONSTANT: GVariantParseError
pub const G_VARIANT_PARSE_ERROR_VALUE_EXPECTED: GVariantParseError = 17;

// Constants
pub const G_ANALYZER_ANALYZING: c_int = 1;
pub const G_ASCII_DTOSTR_BUF_SIZE: c_int = 39;
pub const G_BIG_ENDIAN: c_int = 4321;
pub const G_CSET_A_2_Z: *const c_char = b"ABCDEFGHIJKLMNOPQRSTUVWXYZ\0" as *const u8 as *const c_char;
Expand All @@ -645,32 +647,7 @@ pub const G_DATALIST_FLAGS_MASK: c_int = 3;
pub const G_DATE_BAD_DAY: c_int = 0;
pub const G_DATE_BAD_JULIAN: c_int = 0;
pub const G_DATE_BAD_YEAR: c_int = 0;
pub const G_DIR_SEPARATOR: c_int = 92;
pub const G_DIR_SEPARATOR_S: *const c_char = b"\\\0" as *const u8 as *const c_char;
pub const G_E: c_double = 2.718282;
pub const G_GINT16_FORMAT: *const c_char = b"hi\0" as *const u8 as *const c_char;
pub const G_GINT16_MODIFIER: *const c_char = b"h\0" as *const u8 as *const c_char;
pub const G_GINT32_FORMAT: *const c_char = b"i\0" as *const u8 as *const c_char;
pub const G_GINT32_MODIFIER: *const c_char = b"\0" as *const u8 as *const c_char;
//pub const G_GINT64_FORMAT: *const c_char = b"li\0" as *const u8 as *const c_char;
//pub const G_GINT64_MODIFIER: *const c_char = b"l\0" as *const u8 as *const c_char;
//pub const G_GINTPTR_FORMAT: *const c_char = b"li\0" as *const u8 as *const c_char;
//pub const G_GINTPTR_MODIFIER: *const c_char = b"l\0" as *const u8 as *const c_char;
pub const G_GNUC_FUNCTION: *const c_char = b"\0" as *const u8 as *const c_char;
pub const G_GNUC_PRETTY_FUNCTION: *const c_char = b"\0" as *const u8 as *const c_char;
//pub const G_GSIZE_FORMAT: *const c_char = b"lu\0" as *const u8 as *const c_char;
//pub const G_GSIZE_MODIFIER: *const c_char = b"l\0" as *const u8 as *const c_char;
//pub const G_GSSIZE_FORMAT: *const c_char = b"li\0" as *const u8 as *const c_char;
//pub const G_GSSIZE_MODIFIER: *const c_char = b"l\0" as *const u8 as *const c_char;
pub const G_GUINT16_FORMAT: *const c_char = b"hu\0" as *const u8 as *const c_char;
pub const G_GUINT32_FORMAT: *const c_char = b"u\0" as *const u8 as *const c_char;
//pub const G_GUINT64_FORMAT: *const c_char = b"lu\0" as *const u8 as *const c_char;
//pub const G_GUINTPTR_FORMAT: *const c_char = b"lu\0" as *const u8 as *const c_char;
pub const G_HAVE_GINT64: c_int = 1;
pub const G_HAVE_GNUC_VARARGS: c_int = 1;
pub const G_HAVE_GNUC_VISIBILITY: c_int = 1;
pub const G_HAVE_GROWING_STACK: c_int = 0;
pub const G_HAVE_ISO_VARARGS: c_int = 1;
pub const G_HOOK_FLAG_USER_SHIFT: c_int = 4;
pub const G_IEEE754_DOUBLE_BIAS: c_int = 1023;
pub const G_IEEE754_FLOAT_BIAS: c_int = 127;
Expand Down Expand Up @@ -710,40 +687,16 @@ pub const G_LOG_2_BASE_10: c_double = 0.301030;
pub const G_LOG_DOMAIN: c_char = 0;
pub const G_LOG_FATAL_MASK: c_int = 0;
pub const G_LOG_LEVEL_USER_SHIFT: c_int = 8;
pub const GLIB_MAJOR_VERSION: c_int = 2;
pub const G_MAXINT16: i16 = 32767;
pub const G_MAXINT32: i32 = 2147483647;
pub const G_MAXINT64: i64 = 9223372036854775807;
pub const G_MAXINT8: i8 = 127;
pub const G_MAXUINT16: u16 = 65535;
pub const G_MAXUINT32: u32 = 4294967295;
pub const G_MAXUINT64: u64 = 18446744073709551615;
pub const G_MAXUINT8: u8 = 255;
pub const GLIB_MICRO_VERSION: c_int = 1;
//pub const G_MININT16: i16 = -32768;
//pub const G_MININT32: i32 = -2147483648;
pub const G_MININT64: i64 = -9223372036854775808;
//pub const G_MININT8: i8 = -128;
pub const GLIB_MINOR_VERSION: c_int = 54;
pub const G_MODULE_SUFFIX: *const c_char = b"so\0" as *const u8 as *const c_char;
pub const G_OPTION_REMAINING: *const c_char = b"\0" as *const u8 as *const c_char;
pub const G_PDP_ENDIAN: c_int = 3412;
pub const G_PI: c_double = 3.141593;
pub const G_PID_FORMAT: *const c_char = b"i\0" as *const u8 as *const c_char;
pub const G_PI_2: c_double = 1.570796;
pub const G_PI_4: c_double = 0.785398;
pub const G_POLLFD_FORMAT: *const c_char = b"%d\0" as *const u8 as *const c_char;
pub const G_PRIORITY_DEFAULT: c_int = 0;
pub const G_PRIORITY_DEFAULT_IDLE: c_int = 200;
pub const G_PRIORITY_HIGH: c_int = -100;
pub const G_PRIORITY_HIGH_IDLE: c_int = 100;
pub const G_PRIORITY_LOW: c_int = 300;
pub const G_SEARCHPATH_SEPARATOR: c_int = 59;
pub const G_SEARCHPATH_SEPARATOR_S: *const c_char = b";\0" as *const u8 as *const c_char;
//pub const GLIB_SIZEOF_LONG: c_int = 8;
//pub const GLIB_SIZEOF_SIZE_T: c_int = 8;
//pub const GLIB_SIZEOF_SSIZE_T: c_int = 8;
//pub const GLIB_SIZEOF_VOID_P: c_int = 8;
pub const G_SOURCE_CONTINUE: gboolean = GTRUE;
pub const G_SOURCE_REMOVE: gboolean = GFALSE;
pub const G_SQRT2: c_double = 1.414214;
Expand All @@ -763,8 +716,6 @@ pub const G_UNICHAR_MAX_DECOMPOSITION_LENGTH: c_int = 18;
pub const G_URI_RESERVED_CHARS_GENERIC_DELIMITERS: *const c_char = b":/?#[]@\0" as *const u8 as *const c_char;
pub const G_URI_RESERVED_CHARS_SUBCOMPONENT_DELIMITERS: *const c_char = b"!$&\'()*+,;=\0" as *const u8 as *const c_char;
pub const G_USEC_PER_SEC: c_int = 1000000;
//pub const G_VA_COPY_AS_ARRAY: c_int = 1;
pub const GLIB_VERSION_MIN_REQUIRED: c_int = 2;
pub const G_WIN32_MSG_HANDLE: c_int = 19981206;

// Flags
Expand Down Expand Up @@ -1832,24 +1783,6 @@ impl ::std::fmt::Debug for GPatternSpec {
}
}

#[repr(C)]
#[derive(Copy, Clone)]
pub struct GPollFD {
pub fd: c_int,
pub events: c_ushort,
pub revents: c_ushort,
}

impl ::std::fmt::Debug for GPollFD {
fn fmt(&self, f: &mut ::std::fmt::Formatter) -> ::std::fmt::Result {
f.debug_struct(&format!("GPollFD @ {:?}", self as *const _))
.field("fd", &self.fd)
.field("events", &self.events)
.field("revents", &self.revents)
.finish()
}
}

#[repr(C)]
#[derive(Copy, Clone)]
pub struct GPrivate {
Expand Down
30 changes: 30 additions & 0 deletions glib-sys/src/manual.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,30 @@
// Copyright 2013-2018, The Gtk-rs Project Developers.
// See the COPYRIGHT file at the top-level directory of this distribution.
// Licensed under the MIT license, see the LICENSE file or <http://opensource.org/licenses/MIT>

#[allow(unused_imports)]
use libc::{c_int, c_ushort, c_void};

#[cfg(windows)]
pub type GPid = *mut c_void;

#[cfg(not(windows))]
pub type GPid = c_int;
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

👍


#[repr(C)]
#[derive(Copy, Clone)]
#[cfg(all(windows,target_arch="x86_64"))]
pub struct GPollFD {
pub fd: i64,
pub events: c_ushort,
pub revents: c_ushort,
}

#[repr(C)]
#[derive(Copy, Clone)]
#[cfg(not(all(windows,target_arch="x86_64")))]
pub struct GPollFD {
pub fd: c_int,
pub events: c_ushort,
pub revents: c_ushort,
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

👍

}
5 changes: 2 additions & 3 deletions gobject-sys/src/lib.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
// This file was generated by gir (https://github.com/gtk-rs/gir @ 6114d1c)
// from gir-files (https://github.com/gtk-rs/gir-files @ 77d1f70)
// This file was generated by gir (https://github.com/gtk-rs/gir @ 6704a1c)
// from gir-files (https://github.com/gtk-rs/gir-files @ 4740f5e)
// DO NOT EDIT

#![allow(non_camel_case_types, non_upper_case_globals, non_snake_case)]
Expand Down Expand Up @@ -41,7 +41,6 @@ pub const G_TYPE_VARIANT: GType = 21 << G_TYPE_FUNDAMENTAL_SHIFT;

// Aliases
pub type GSignalCMarshaller = GClosureMarshal;
//pub type GSignalCVaMarshaller = /*Ignored*/GVaClosureMarshal;

// Constants
pub const G_PARAM_MASK: c_int = 255;
Expand Down
Loading