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

Apply last gir #130

Merged
merged 2 commits into from
Nov 5, 2016
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
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
2 changes: 1 addition & 1 deletion gir
Submodule gir updated 51 files
+179 −76 Cargo.lock
+2 −0 Cargo.toml
+26 −3 Gir_Gtk.toml
+2 −2 appveyor.yml
+8 −0 src/analysis/c_type.rs
+1 −0 src/analysis/conversion_type.rs
+162 −0 src/analysis/ffi_type.rs
+4 −7 src/analysis/functions.rs
+36 −0 src/analysis/imports.rs
+42 −0 src/analysis/mod.rs
+5 −1 src/analysis/namespaces.rs
+34 −4 src/analysis/object.rs
+3 −0 src/analysis/record.rs
+5 −0 src/analysis/ref_mode.rs
+5 −2 src/analysis/return_value.rs
+4 −1 src/analysis/rust_type.rs
+76 −0 src/analysis/signals.rs
+168 −0 src/analysis/trampolines.rs
+3 −2 src/chunk/chunk.rs
+34 −31 src/codegen/doc/mod.rs
+32 −14 src/codegen/enums.rs
+17 −7 src/codegen/flags.rs
+9 −4 src/codegen/function_body_chunk.rs
+1 −2 src/codegen/general.rs
+5 −0 src/codegen/mod.rs
+22 −2 src/codegen/object.rs
+2 −10 src/codegen/objects.rs
+2 −8 src/codegen/records.rs
+94 −0 src/codegen/signal.rs
+66 −0 src/codegen/signal_body.rs
+2 −7 src/codegen/sys/ffi_type.rs
+1 −1 src/codegen/sys/mod.rs
+13 −2 src/codegen/trait_impls.rs
+157 −0 src/codegen/trampoline.rs
+58 −0 src/codegen/trampoline_from_glib.rs
+27 −0 src/codegen/trampoline_to_glib.rs
+16 −0 src/config/config.rs
+4 −4 src/config/functions.rs
+5 −0 src/config/gobjects.rs
+1 −1 src/config/ident.rs
+2 −2 src/config/members.rs
+1 −0 src/config/mod.rs
+90 −0 src/config/signals.rs
+12 −1 src/env.rs
+20 −0 src/library.rs
+110 −0 src/library_postprocessing.rs
+30 −2 src/main.rs
+10 −0 src/nameutil.rs
+107 −12 src/parser.rs
+47 −25 src/version.rs
+15 −3 src/writer/to_code.rs
36 changes: 22 additions & 14 deletions src/auto/enums.rs
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
// This file was generated by gir (26020e8) from gir-files (11e0e6d)
// This file was generated by gir (3b3585f) from gir-files (11e0e6d)
// DO NOT EDIT

use ffi;
Expand Down Expand Up @@ -89,7 +89,7 @@ pub enum CursorType {
BlankCursor,
CursorIsPixmap,
#[doc(hidden)]
__Nonexhaustive,
__Nonexhaustive(()),
}

#[doc(hidden)]
Expand Down Expand Up @@ -178,14 +178,15 @@ impl ToGlib for CursorType {
CursorType::LastCursor => ffi::GDK_LAST_CURSOR,
CursorType::BlankCursor => ffi::GDK_BLANK_CURSOR,
CursorType::CursorIsPixmap => ffi::GDK_CURSOR_IS_PIXMAP,
CursorType::__Nonexhaustive => panic!(),
CursorType::__Nonexhaustive(_) => panic!(),
}
}
}

#[doc(hidden)]
impl FromGlib<ffi::GdkCursorType> for CursorType {
fn from_glib(value: ffi::GdkCursorType) -> Self {
skip_assert_initialized!();
match value {
ffi::GDK_X_CURSOR => CursorType::XCursor,
ffi::GDK_ARROW => CursorType::Arrow,
Expand Down Expand Up @@ -278,7 +279,7 @@ pub enum GLError {
UnsupportedFormat,
UnsupportedProfile,
#[doc(hidden)]
__Nonexhaustive,
__Nonexhaustive(()),
}

#[cfg(feature = "v3_16")]
Expand All @@ -291,7 +292,7 @@ impl ToGlib for GLError {
GLError::NotAvailable => ffi::GDK_GL_ERROR_NOT_AVAILABLE,
GLError::UnsupportedFormat => ffi::GDK_GL_ERROR_UNSUPPORTED_FORMAT,
GLError::UnsupportedProfile => ffi::GDK_GL_ERROR_UNSUPPORTED_PROFILE,
GLError::__Nonexhaustive => panic!(),
GLError::__Nonexhaustive(_) => panic!(),
}
}
}
Expand All @@ -300,6 +301,7 @@ impl ToGlib for GLError {
#[doc(hidden)]
impl FromGlib<ffi::GdkGLError> for GLError {
fn from_glib(value: ffi::GdkGLError) -> Self {
skip_assert_initialized!();
match value {
ffi::GDK_GL_ERROR_NOT_AVAILABLE => GLError::NotAvailable,
ffi::GDK_GL_ERROR_UNSUPPORTED_FORMAT => GLError::UnsupportedFormat,
Expand All @@ -311,6 +313,7 @@ impl FromGlib<ffi::GdkGLError> for GLError {
#[cfg(feature = "v3_16")]
impl ErrorDomain for GLError {
fn domain() -> glib_ffi::GQuark {
skip_assert_initialized!();
unsafe { ffi::gdk_gl_error_quark() }
}

Expand All @@ -319,11 +322,12 @@ impl ErrorDomain for GLError {
}

fn from(code: i32) -> Option<Self> {
skip_assert_initialized!();
match code {
x if x == ffi::GDK_GL_ERROR_NOT_AVAILABLE as i32 => Some(GLError::NotAvailable),
x if x == ffi::GDK_GL_ERROR_UNSUPPORTED_FORMAT as i32 => Some(GLError::UnsupportedFormat),
x if x == ffi::GDK_GL_ERROR_UNSUPPORTED_PROFILE as i32 => Some(GLError::UnsupportedProfile),
_ => Some(GLError::__Nonexhaustive),
_ => Some(GLError::__Nonexhaustive(())),
}
}
}
Expand All @@ -341,7 +345,7 @@ pub enum Gravity {
SouthEast,
Static,
#[doc(hidden)]
__Nonexhaustive,
__Nonexhaustive(()),
}

#[doc(hidden)]
Expand All @@ -360,14 +364,15 @@ impl ToGlib for Gravity {
Gravity::South => ffi::GDK_GRAVITY_SOUTH,
Gravity::SouthEast => ffi::GDK_GRAVITY_SOUTH_EAST,
Gravity::Static => ffi::GDK_GRAVITY_STATIC,
Gravity::__Nonexhaustive => panic!(),
Gravity::__Nonexhaustive(_) => panic!(),
}
}
}

#[doc(hidden)]
impl FromGlib<ffi::GdkGravity> for Gravity {
fn from_glib(value: ffi::GdkGravity) -> Self {
skip_assert_initialized!();
match value {
ffi::GDK_GRAVITY_NORTH_WEST => Gravity::NorthWest,
ffi::GDK_GRAVITY_NORTH => Gravity::North,
Expand All @@ -392,7 +397,7 @@ pub enum ModifierIntent {
NoTextInput,
ShiftGroup,
#[doc(hidden)]
__Nonexhaustive,
__Nonexhaustive(()),
}

#[doc(hidden)]
Expand All @@ -407,14 +412,15 @@ impl ToGlib for ModifierIntent {
ModifierIntent::ModifySelection => ffi::GDK_MODIFIER_INTENT_MODIFY_SELECTION,
ModifierIntent::NoTextInput => ffi::GDK_MODIFIER_INTENT_NO_TEXT_INPUT,
ModifierIntent::ShiftGroup => ffi::GDK_MODIFIER_INTENT_SHIFT_GROUP,
ModifierIntent::__Nonexhaustive => panic!(),
ModifierIntent::__Nonexhaustive(_) => panic!(),
}
}
}

#[doc(hidden)]
impl FromGlib<ffi::GdkModifierIntent> for ModifierIntent {
fn from_glib(value: ffi::GdkModifierIntent) -> Self {
skip_assert_initialized!();
match value {
ffi::GDK_MODIFIER_INTENT_PRIMARY_ACCELERATOR => ModifierIntent::PrimaryAccelerator,
ffi::GDK_MODIFIER_INTENT_CONTEXT_MENU => ModifierIntent::ContextMenu,
Expand All @@ -437,7 +443,7 @@ pub enum WindowEdge {
South,
SouthEast,
#[doc(hidden)]
__Nonexhaustive,
__Nonexhaustive(()),
}

#[doc(hidden)]
Expand All @@ -454,14 +460,15 @@ impl ToGlib for WindowEdge {
WindowEdge::SouthWest => ffi::GDK_WINDOW_EDGE_SOUTH_WEST,
WindowEdge::South => ffi::GDK_WINDOW_EDGE_SOUTH,
WindowEdge::SouthEast => ffi::GDK_WINDOW_EDGE_SOUTH_EAST,
WindowEdge::__Nonexhaustive => panic!(),
WindowEdge::__Nonexhaustive(_) => panic!(),
}
}
}

#[doc(hidden)]
impl FromGlib<ffi::GdkWindowEdge> for WindowEdge {
fn from_glib(value: ffi::GdkWindowEdge) -> Self {
skip_assert_initialized!();
match value {
ffi::GDK_WINDOW_EDGE_NORTH_WEST => WindowEdge::NorthWest,
ffi::GDK_WINDOW_EDGE_NORTH => WindowEdge::North,
Expand Down Expand Up @@ -492,7 +499,7 @@ pub enum WindowTypeHint {
Combo,
Dnd,
#[doc(hidden)]
__Nonexhaustive,
__Nonexhaustive(()),
}

#[doc(hidden)]
Expand All @@ -515,14 +522,15 @@ impl ToGlib for WindowTypeHint {
WindowTypeHint::Notification => ffi::GDK_WINDOW_TYPE_HINT_NOTIFICATION,
WindowTypeHint::Combo => ffi::GDK_WINDOW_TYPE_HINT_COMBO,
WindowTypeHint::Dnd => ffi::GDK_WINDOW_TYPE_HINT_DND,
WindowTypeHint::__Nonexhaustive => panic!(),
WindowTypeHint::__Nonexhaustive(_) => panic!(),
}
}
}

#[doc(hidden)]
impl FromGlib<ffi::GdkWindowTypeHint> for WindowTypeHint {
fn from_glib(value: ffi::GdkWindowTypeHint) -> Self {
skip_assert_initialized!();
match value {
ffi::GDK_WINDOW_TYPE_HINT_NORMAL => WindowTypeHint::Normal,
ffi::GDK_WINDOW_TYPE_HINT_DIALOG => WindowTypeHint::Dialog,
Expand Down
3 changes: 2 additions & 1 deletion src/auto/flags.rs
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
// This file was generated by gir (26020e8) from gir-files (11e0e6d)
// This file was generated by gir (3b3585f) from gir-files (11e0e6d)
// DO NOT EDIT

use ffi;
Expand Down Expand Up @@ -53,6 +53,7 @@ impl ToGlib for ModifierType {
#[doc(hidden)]
impl FromGlib<ffi::GdkModifierType> for ModifierType {
fn from_glib(value: ffi::GdkModifierType) -> ModifierType {
skip_assert_initialized!();
ModifierType::from_bits_truncate(value.bits())
}
}
Expand Down
2 changes: 1 addition & 1 deletion src/auto/mod.rs
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
// This file was generated by gir (26020e8) from gir-files (11e0e6d)
// This file was generated by gir (3b3585f) from gir-files (11e0e6d)
// DO NOT EDIT

mod enums;
Expand Down