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

Commit

Permalink
Merge pull request #219 from sdroege/regen
Browse files Browse the repository at this point in the history 
Regenerate
  • Loading branch information
@GuillaumeGomez
GuillaumeGomez committed Apr 22, 2018
2 parents 61bd079 + e0db738 commit 2e0994d
Show file tree
Hide file tree
Showing 29 changed files with 64 additions and 51 deletions.
3 changes: 3 additions & 0 deletions .travis.yml
View file
Expand Up @@ -12,6 +12,9 @@ addons:
- libgtk-3-dev
script:
- rustc --version
- if [ "$TRAVIS_RUST_VERSION" == "nightly" ] && [ "$GTK" == "3.4" ]; then
make regen_check;
fi
- ./check_init_asserts
- cargo test --features embed-lgpl-docs --jobs 1
# catch any sneaked in lgpl docs
Expand Down
1 change: 1 addition & 0 deletions Gir.toml
View file
Expand Up @@ -6,6 +6,7 @@ min_cfg_version = "3.4"
target_path = "."
work_mode = "normal"
generate_safety_asserts = true
single_version_file = true

generate = [
"Gdk.AnchorHints",
Expand Down
5 changes: 5 additions & 0 deletions Makefile
View file
Expand Up @@ -5,6 +5,11 @@ GIR_FILES = gir-files/Gdk-3.0.gir
# Run `gir` generating the bindings
gir : src/auto/mod.rs

regen_check: $(GIR) $(GIR_FILES)
rm src/auto/*
$(GIR) -c Gir.toml
git diff -R --exit-code

src/auto/mod.rs : Gir.toml $(GIR) $(GIR_FILES)
$(GIR) -c Gir.toml

Expand Down
2 changes: 1 addition & 1 deletion gir
Submodule gir updated 38 files
+0 −14 Cargo.lock
+8 −2 Cargo.toml
+4 −4 src/analysis/bounds.rs
+1 −1 src/analysis/child_properties.rs
+74 −21 src/analysis/functions.rs
+34 −5 src/analysis/imports.rs
+6 −1 src/analysis/object.rs
+3 −1 src/analysis/properties.rs
+109 −0 src/case.rs
+2 −2 src/codegen/alias.rs
+1 −1 src/codegen/child_properties.rs
+1 −1 src/codegen/constants.rs
+1 −1 src/codegen/doc/mod.rs
+5 −5 src/codegen/enums.rs
+5 −5 src/codegen/flags.rs
+230 −7 src/codegen/function.rs
+1 −1 src/codegen/functions.rs
+18 −12 src/codegen/general.rs
+1 −1 src/codegen/mod.rs
+19 −6 src/codegen/object.rs
+1 −1 src/codegen/properties.rs
+2 −2 src/codegen/record.rs
+2 −2 src/codegen/signal.rs
+1 −1 src/codegen/sys/ffi_type.rs
+2 −2 src/codegen/sys/functions.rs
+13 −13 src/codegen/sys/lib_.rs
+1 −5 src/codegen/sys/statics.rs
+4 −4 src/codegen/sys/tests.rs
+1 −1 src/codegen/trampoline.rs
+76 −76 src/config/config.rs
+13 −36 src/config/error.rs
+3 −5 src/config/external_libraries.rs
+4 −4 src/config/gobjects.rs
+47 −0 src/lib.rs
+44 −1 src/library.rs
+51 −65 src/main.rs
+65 −50 src/parser.rs
+81 −43 src/xmlparser.rs
2 changes: 1 addition & 1 deletion gir-files
Submodule gir-files updated 2 files
+9,152 −29,484 Gtk-3.0.gir
+5 −0 fix.sh
4 changes: 2 additions & 2 deletions src/auto/app_launch_context.rs
View file
@@ -1,5 +1,5 @@
// This file was generated by gir (https://github.com/gtk-rs/gir @ 6855214)
// from gir-files (https://github.com/gtk-rs/gir-files @ cf55bdc)
// This file was generated by gir (https://github.com/gtk-rs/gir)
// from gir-files (https://github.com/gtk-rs/gir-files)
// DO NOT EDIT

use Display;
Expand Down
4 changes: 2 additions & 2 deletions src/auto/cursor.rs
View file
@@ -1,5 +1,5 @@
// This file was generated by gir (https://github.com/gtk-rs/gir @ 6855214)
// from gir-files (https://github.com/gtk-rs/gir-files @ cf55bdc)
// This file was generated by gir (https://github.com/gtk-rs/gir)
// from gir-files (https://github.com/gtk-rs/gir-files)
// DO NOT EDIT

use CursorType;
Expand Down
4 changes: 2 additions & 2 deletions src/auto/device.rs
View file
@@ -1,5 +1,5 @@
// This file was generated by gir (https://github.com/gtk-rs/gir @ 6855214)
// from gir-files (https://github.com/gtk-rs/gir-files @ cf55bdc)
// This file was generated by gir (https://github.com/gtk-rs/gir)
// from gir-files (https://github.com/gtk-rs/gir-files)
// DO NOT EDIT

use Atom;
Expand Down
4 changes: 2 additions & 2 deletions src/auto/device_manager.rs
View file
@@ -1,5 +1,5 @@
// This file was generated by gir (https://github.com/gtk-rs/gir @ 6855214)
// from gir-files (https://github.com/gtk-rs/gir-files @ cf55bdc)
// This file was generated by gir (https://github.com/gtk-rs/gir)
// from gir-files (https://github.com/gtk-rs/gir-files)
// DO NOT EDIT

use Device;
Expand Down
4 changes: 2 additions & 2 deletions src/auto/device_pad.rs
View file
@@ -1,5 +1,5 @@
// This file was generated by gir (https://github.com/gtk-rs/gir @ 6855214)
// from gir-files (https://github.com/gtk-rs/gir-files @ cf55bdc)
// This file was generated by gir (https://github.com/gtk-rs/gir)
// from gir-files (https://github.com/gtk-rs/gir-files)
// DO NOT EDIT

use Device;
Expand Down
4 changes: 2 additions & 2 deletions src/auto/device_tool.rs
View file
@@ -1,5 +1,5 @@
// This file was generated by gir (https://github.com/gtk-rs/gir @ 6855214)
// from gir-files (https://github.com/gtk-rs/gir-files @ cf55bdc)
// This file was generated by gir (https://github.com/gtk-rs/gir)
// from gir-files (https://github.com/gtk-rs/gir-files)
// DO NOT EDIT

use AxisFlags;
Expand Down
4 changes: 2 additions & 2 deletions src/auto/display.rs
View file
@@ -1,5 +1,5 @@
// This file was generated by gir (https://github.com/gtk-rs/gir @ 6855214)
// from gir-files (https://github.com/gtk-rs/gir-files @ cf55bdc)
// This file was generated by gir (https://github.com/gtk-rs/gir)
// from gir-files (https://github.com/gtk-rs/gir-files)
// DO NOT EDIT

use AppLaunchContext;
Expand Down
4 changes: 2 additions & 2 deletions src/auto/display_manager.rs
View file
@@ -1,5 +1,5 @@
// This file was generated by gir (https://github.com/gtk-rs/gir @ 6855214)
// from gir-files (https://github.com/gtk-rs/gir-files @ cf55bdc)
// This file was generated by gir (https://github.com/gtk-rs/gir)
// from gir-files (https://github.com/gtk-rs/gir-files)
// DO NOT EDIT

use Display;
Expand Down
4 changes: 2 additions & 2 deletions src/auto/drag_context.rs
View file
@@ -1,5 +1,5 @@
// This file was generated by gir (https://github.com/gtk-rs/gir @ 6855214)
// from gir-files (https://github.com/gtk-rs/gir-files @ cf55bdc)
// This file was generated by gir (https://github.com/gtk-rs/gir)
// from gir-files (https://github.com/gtk-rs/gir-files)
// DO NOT EDIT

use Atom;
Expand Down
4 changes: 2 additions & 2 deletions src/auto/drawing_context.rs
View file
@@ -1,5 +1,5 @@
// This file was generated by gir (https://github.com/gtk-rs/gir @ 6855214)
// from gir-files (https://github.com/gtk-rs/gir-files @ cf55bdc)
// This file was generated by gir (https://github.com/gtk-rs/gir)
// from gir-files (https://github.com/gtk-rs/gir-files)
// DO NOT EDIT

#[cfg(any(feature = "v3_22", feature = "dox"))]
Expand Down
4 changes: 2 additions & 2 deletions src/auto/enums.rs
View file
@@ -1,5 +1,5 @@
// This file was generated by gir (https://github.com/gtk-rs/gir @ 6855214)
// from gir-files (https://github.com/gtk-rs/gir-files @ cf55bdc)
// This file was generated by gir (https://github.com/gtk-rs/gir)
// from gir-files (https://github.com/gtk-rs/gir-files)
// DO NOT EDIT

use ffi;
Expand Down
4 changes: 2 additions & 2 deletions src/auto/event_sequence.rs
View file
@@ -1,5 +1,5 @@
// This file was generated by gir (https://github.com/gtk-rs/gir @ 6855214)
// from gir-files (https://github.com/gtk-rs/gir-files @ cf55bdc)
// This file was generated by gir (https://github.com/gtk-rs/gir)
// from gir-files (https://github.com/gtk-rs/gir-files)
// DO NOT EDIT

use ffi;
Expand Down
4 changes: 2 additions & 2 deletions src/auto/flags.rs
View file
@@ -1,5 +1,5 @@
// This file was generated by gir (https://github.com/gtk-rs/gir @ 6855214)
// from gir-files (https://github.com/gtk-rs/gir-files @ cf55bdc)
// This file was generated by gir (https://github.com/gtk-rs/gir)
// from gir-files (https://github.com/gtk-rs/gir-files)
// DO NOT EDIT

use ffi;
Expand Down
4 changes: 2 additions & 2 deletions src/auto/frame_clock.rs
View file
@@ -1,5 +1,5 @@
// This file was generated by gir (https://github.com/gtk-rs/gir @ 6855214)
// from gir-files (https://github.com/gtk-rs/gir-files @ cf55bdc)
// This file was generated by gir (https://github.com/gtk-rs/gir)
// from gir-files (https://github.com/gtk-rs/gir-files)
// DO NOT EDIT

#[cfg(any(feature = "v3_8", feature = "dox"))]
Expand Down
4 changes: 2 additions & 2 deletions src/auto/frame_timings.rs
View file
@@ -1,5 +1,5 @@
// This file was generated by gir (https://github.com/gtk-rs/gir @ 6855214)
// from gir-files (https://github.com/gtk-rs/gir-files @ cf55bdc)
// This file was generated by gir (https://github.com/gtk-rs/gir)
// from gir-files (https://github.com/gtk-rs/gir-files)
// DO NOT EDIT

use ffi;
Expand Down
4 changes: 2 additions & 2 deletions src/auto/functions.rs
View file
@@ -1,5 +1,5 @@
// This file was generated by gir (https://github.com/gtk-rs/gir @ 6855214)
// from gir-files (https://github.com/gtk-rs/gir-files @ cf55bdc)
// This file was generated by gir (https://github.com/gtk-rs/gir)
// from gir-files (https://github.com/gtk-rs/gir-files)
// DO NOT EDIT

use Atom;
Expand Down
4 changes: 2 additions & 2 deletions src/auto/g_l_context.rs → src/auto/gl_context.rs
View file
@@ -1,5 +1,5 @@
// This file was generated by gir (https://github.com/gtk-rs/gir @ 6855214)
// from gir-files (https://github.com/gtk-rs/gir-files @ cf55bdc)
// This file was generated by gir (https://github.com/gtk-rs/gir)
// from gir-files (https://github.com/gtk-rs/gir-files)
// DO NOT EDIT

#[cfg(any(feature = "v3_16", feature = "dox"))]
Expand Down
10 changes: 5 additions & 5 deletions src/auto/mod.rs
View file
@@ -1,5 +1,5 @@
// This file was generated by gir (https://github.com/gtk-rs/gir @ 6855214)
// from gir-files (https://github.com/gtk-rs/gir-files @ cf55bdc)
// This file was generated by gir (https://github.com/gtk-rs/gir)
// from gir-files (https://github.com/gtk-rs/gir-files)
// DO NOT EDIT

mod app_launch_context;
Expand Down Expand Up @@ -59,11 +59,11 @@ pub use self::frame_clock::FrameClock;
pub use self::frame_clock::FrameClockExt;

#[cfg(any(feature = "v3_16", feature = "dox"))]
mod g_l_context;
mod gl_context;
#[cfg(any(feature = "v3_16", feature = "dox"))]
pub use self::g_l_context::GLContext;
pub use self::gl_context::GLContext;
#[cfg(any(feature = "v3_16", feature = "dox"))]
pub use self::g_l_context::GLContextExt;
pub use self::gl_context::GLContextExt;

#[cfg(any(feature = "v3_22", feature = "dox"))]
mod monitor;
Expand Down
4 changes: 2 additions & 2 deletions src/auto/monitor.rs
View file
@@ -1,5 +1,5 @@
// This file was generated by gir (https://github.com/gtk-rs/gir @ 6855214)
// from gir-files (https://github.com/gtk-rs/gir-files @ cf55bdc)
// This file was generated by gir (https://github.com/gtk-rs/gir)
// from gir-files (https://github.com/gtk-rs/gir-files)
// DO NOT EDIT

use Display;
Expand Down
4 changes: 2 additions & 2 deletions src/auto/screen.rs
View file
@@ -1,5 +1,5 @@
// This file was generated by gir (https://github.com/gtk-rs/gir @ 6855214)
// from gir-files (https://github.com/gtk-rs/gir-files @ cf55bdc)
// This file was generated by gir (https://github.com/gtk-rs/gir)
// from gir-files (https://github.com/gtk-rs/gir-files)
// DO NOT EDIT

use Display;
Expand Down
4 changes: 2 additions & 2 deletions src/auto/seat.rs
View file
@@ -1,5 +1,5 @@
// This file was generated by gir (https://github.com/gtk-rs/gir @ 6855214)
// from gir-files (https://github.com/gtk-rs/gir-files @ cf55bdc)
// This file was generated by gir (https://github.com/gtk-rs/gir)
// from gir-files (https://github.com/gtk-rs/gir-files)
// DO NOT EDIT

#[cfg(any(feature = "v3_20", feature = "dox"))]
Expand Down
4 changes: 4 additions & 0 deletions src/auto/versions.txt
View file
@@ -0,0 +1,4 @@
All files in this directory
were generated by gir (https://github.com/gtk-rs/gir @ 5ec9961)
from gir-files (https://github.com/gtk-rs/gir-files @ 3fde76b)
DO NOT EDIT THEM
4 changes: 2 additions & 2 deletions src/auto/visual.rs
View file
@@ -1,5 +1,5 @@
// This file was generated by gir (https://github.com/gtk-rs/gir @ 6855214)
// from gir-files (https://github.com/gtk-rs/gir-files @ cf55bdc)
// This file was generated by gir (https://github.com/gtk-rs/gir)
// from gir-files (https://github.com/gtk-rs/gir-files)
// DO NOT EDIT

use ByteOrder;
Expand Down
4 changes: 2 additions & 2 deletions src/auto/window.rs
View file
@@ -1,5 +1,5 @@
// This file was generated by gir (https://github.com/gtk-rs/gir @ 6855214)
// from gir-files (https://github.com/gtk-rs/gir-files @ cf55bdc)
// This file was generated by gir (https://github.com/gtk-rs/gir)
// from gir-files (https://github.com/gtk-rs/gir-files)
// DO NOT EDIT

use Cursor;
Expand Down

0 comments on commit 2e0994d

Please sign in to comment.