Merge pull request tauri-apps#27 from antoyo/master

Regenerate code
antoyo · Jan 5, 2018 · 6bb613f · 6bb613f
2 parents d1e31c2 + 3c02287
commit 6bb613f
Show file tree

Hide file tree

Showing 56 changed files with 2,423 additions and 1,570 deletions.
diff --git a/Cargo.toml b/Cargo.toml
@@ -1,6 +1,6 @@
 [package]
 name = "webkit2gtk"
-version = "0.2.2"
+version = "0.3.0"
 authors = ["The Gtk-rs Project Developers"]
 
 categories = ["api-bindings", "gui"]
@@ -29,54 +29,54 @@ v2_14 = ["v2_12", "webkit2gtk-sys/v2_14"]
 v2_16 = ["v2_14", "webkit2gtk-sys/v2_16"]
 
 [dependencies]
-bitflags = "^0.9"
+bitflags = "^1.0"
 libc = "^0.2"
 
 [dependencies.cairo-rs]
 git = "https://github.com/gtk-rs/cairo"
-version = "^0.2.0"
+version = "^0.3.0"
 
 [dependencies.gdk]
 git = "https://github.com/gtk-rs/gdk"
-version = "^0.6.0"
+version = "^0.7.0"
 
 [dependencies.gdk-sys]
 git = "https://github.com/gtk-rs/sys"
-version = "^0.4.0"
+version = "^0.5.0"
 
 [dependencies.gio]
 git = "https://github.com/gtk-rs/gio"
-version = "^0.2.0"
+version = "^0.3.0"
 
 [dependencies.gio-sys]
 git = "https://github.com/gtk-rs/sys"
-version = "^0.4.0"
+version = "^0.5.0"
 
 [dependencies.glib]
 git = "https://github.com/gtk-rs/glib"
-version = "^0.3.0"
+version = "^0.4.0"
 
 [dependencies.glib-sys]
 git = "https://github.com/gtk-rs/sys"
-version = "^0.4.0"
+version = "^0.5.0"
 
 [dependencies.gobject-sys]
 git = "https://github.com/gtk-rs/sys"
-version = "^0.4.0"
+version = "^0.5.0"
 
 [dependencies.gtk]
 git = "https://github.com/gtk-rs/gtk"
-version = "^0.2.0"
+version = "^0.3.0"
 
 [dependencies.gtk-sys]
 git = "https://github.com/gtk-rs/sys"
-version = "^0.4.0"
+version = "^0.5.0"
 
 # TODO: regenerate the crate (not working with latest gir).
 [dependencies.javascriptcore-rs]
 git = "https://github.com/gtk-rs/javascriptcore-rs"
-version = "0.2.0"
+version = "0.3.0"
 
 [dependencies.webkit2gtk-sys]
-git = "https://github.com/guillaumegomez/webkit2gtk-rs"
-version = "^0.4.0"
+git = "https://github.com/gtk-rs/webkit2gtk-rs"
+version = "^0.5.0"
diff --git a/gir b/gir
diff --git a/src/auto/authentication_request.rs b/src/auto/authentication_request.rs
@@ -1,134 +1,134 @@
-// This file was generated by gir (7484d29) from gir-files (71d73f0)
+// This file was generated by gir (d50d839) from gir-files (469db10)
 // DO NOT EDIT
 
-#[cfg(feature = "v2_2")]
+#[cfg(any(feature = "v2_2", feature = "dox"))]
 use AuthenticationScheme;
-#[cfg(feature = "v2_2")]
+#[cfg(any(feature = "v2_2", feature = "dox"))]
 use Credential;
 use ffi;
 use glib;
-#[cfg(feature = "v2_2")]
+#[cfg(any(feature = "v2_2", feature = "dox"))]
 use glib::object::Downcast;
 use glib::object::IsA;
-#[cfg(feature = "v2_2")]
+#[cfg(any(feature = "v2_2", feature = "dox"))]
 use glib::signal::SignalHandlerId;
-#[cfg(feature = "v2_2")]
+#[cfg(any(feature = "v2_2", feature = "dox"))]
 use glib::signal::connect;
 use glib::translate::*;
 use glib_ffi;
 use gobject_ffi;
-#[cfg(feature = "v2_2")]
+#[cfg(any(feature = "v2_2", feature = "dox"))]
 use std::boxed::Box as Box_;
 use std::mem;
-#[cfg(feature = "v2_2")]
+#[cfg(any(feature = "v2_2", feature = "dox"))]
 use std::mem::transmute;
 use std::ptr;
 
 glib_wrapper! {
-    pub struct AuthenticationRequest(Object<ffi::WebKitAuthenticationRequest>);
+    pub struct AuthenticationRequest(Object<ffi::WebKitAuthenticationRequest, ffi::WebKitAuthenticationRequestClass>);
 
     match fn {
         get_type => || ffi::webkit_authentication_request_get_type(),
     }
 }
 
 pub trait AuthenticationRequestExt {
-    #[cfg(feature = "v2_2")]
+    #[cfg(any(feature = "v2_2", feature = "dox"))]
     fn can_save_credentials(&self) -> bool;
 
-    #[cfg(feature = "v2_2")]
+    #[cfg(any(feature = "v2_2", feature = "dox"))]
     fn cancel(&self);
 
-    #[cfg(feature = "v2_2")]
+    #[cfg(any(feature = "v2_2", feature = "dox"))]
     fn get_host(&self) -> Option<String>;
 
-    #[cfg(feature = "v2_2")]
+    #[cfg(any(feature = "v2_2", feature = "dox"))]
     fn get_port(&self) -> u32;
 
-    #[cfg(feature = "v2_2")]
+    #[cfg(any(feature = "v2_2", feature = "dox"))]
     fn get_proposed_credential(&self) -> Option<Credential>;
 
-    #[cfg(feature = "v2_2")]
+    #[cfg(any(feature = "v2_2", feature = "dox"))]
     fn get_realm(&self) -> Option<String>;
 
-    #[cfg(feature = "v2_2")]
+    #[cfg(any(feature = "v2_2", feature = "dox"))]
     fn get_scheme(&self) -> AuthenticationScheme;
 
-    #[cfg(feature = "v2_2")]
+    #[cfg(any(feature = "v2_2", feature = "dox"))]
     fn is_for_proxy(&self) -> bool;
 
-    #[cfg(feature = "v2_2")]
+    #[cfg(any(feature = "v2_2", feature = "dox"))]
     fn is_retry(&self) -> bool;
 
-    #[cfg(feature = "v2_2")]
+    #[cfg(any(feature = "v2_2", feature = "dox"))]
     fn connect_cancelled<F: Fn(&Self) + 'static>(&self, f: F) -> SignalHandlerId;
 }
 
 impl<O: IsA<AuthenticationRequest> + IsA<glib::object::Object>> AuthenticationRequestExt for O {
-    #[cfg(feature = "v2_2")]
+    #[cfg(any(feature = "v2_2", feature = "dox"))]
     fn can_save_credentials(&self) -> bool {
         unsafe {
             from_glib(ffi::webkit_authentication_request_can_save_credentials(self.to_glib_none().0))
         }
     }
 
-    #[cfg(feature = "v2_2")]
+    #[cfg(any(feature = "v2_2", feature = "dox"))]
     fn cancel(&self) {
         unsafe {
             ffi::webkit_authentication_request_cancel(self.to_glib_none().0);
         }
     }
 
-    #[cfg(feature = "v2_2")]
+    #[cfg(any(feature = "v2_2", feature = "dox"))]
     fn get_host(&self) -> Option<String> {
         unsafe {
             from_glib_none(ffi::webkit_authentication_request_get_host(self.to_glib_none().0))
         }
     }
 
-    #[cfg(feature = "v2_2")]
+    #[cfg(any(feature = "v2_2", feature = "dox"))]
     fn get_port(&self) -> u32 {
         unsafe {
             ffi::webkit_authentication_request_get_port(self.to_glib_none().0)
         }
     }
 
-    #[cfg(feature = "v2_2")]
+    #[cfg(any(feature = "v2_2", feature = "dox"))]
     fn get_proposed_credential(&self) -> Option<Credential> {
         unsafe {
             from_glib_full(ffi::webkit_authentication_request_get_proposed_credential(self.to_glib_none().0))
         }
     }
 
-    #[cfg(feature = "v2_2")]
+    #[cfg(any(feature = "v2_2", feature = "dox"))]
     fn get_realm(&self) -> Option<String> {
         unsafe {
             from_glib_none(ffi::webkit_authentication_request_get_realm(self.to_glib_none().0))
         }
     }
 
-    #[cfg(feature = "v2_2")]
+    #[cfg(any(feature = "v2_2", feature = "dox"))]
     fn get_scheme(&self) -> AuthenticationScheme {
         unsafe {
             from_glib(ffi::webkit_authentication_request_get_scheme(self.to_glib_none().0))
         }
     }
 
-    #[cfg(feature = "v2_2")]
+    #[cfg(any(feature = "v2_2", feature = "dox"))]
     fn is_for_proxy(&self) -> bool {
         unsafe {
             from_glib(ffi::webkit_authentication_request_is_for_proxy(self.to_glib_none().0))
         }
     }
 
-    #[cfg(feature = "v2_2")]
+    #[cfg(any(feature = "v2_2", feature = "dox"))]
     fn is_retry(&self) -> bool {
         unsafe {
             from_glib(ffi::webkit_authentication_request_is_retry(self.to_glib_none().0))
         }
     }
 
-    #[cfg(feature = "v2_2")]
+    #[cfg(any(feature = "v2_2", feature = "dox"))]
     fn connect_cancelled<F: Fn(&Self) + 'static>(&self, f: F) -> SignalHandlerId {
         unsafe {
             let f: Box_<Box_<Fn(&Self) + 'static>> = Box_::new(Box_::new(f));
@@ -138,7 +138,7 @@ impl<O: IsA<AuthenticationRequest> + IsA<glib::object::Object>> AuthenticationRe
     }
 }
 
-#[cfg(feature = "v2_2")]
+#[cfg(any(feature = "v2_2", feature = "dox"))]
 unsafe extern "C" fn cancelled_trampoline<P>(this: *mut ffi::WebKitAuthenticationRequest, f: glib_ffi::gpointer)
 where P: IsA<AuthenticationRequest> {
     callback_guard!();

diff --git a/src/auto/back_forward_list.rs b/src/auto/back_forward_list.rs
@@ -1,4 +1,4 @@
-// This file was generated by gir (7484d29) from gir-files (71d73f0)
+// This file was generated by gir (d50d839) from gir-files (469db10)
 // DO NOT EDIT
 
 use BackForwardListItem;
@@ -11,7 +11,7 @@ use std::mem;
 use std::ptr;
 
 glib_wrapper! {
-    pub struct BackForwardList(Object<ffi::WebKitBackForwardList>);
+    pub struct BackForwardList(Object<ffi::WebKitBackForwardList, ffi::WebKitBackForwardListClass>);
 
     match fn {
         get_type => || ffi::webkit_back_forward_list_get_type(),

diff --git a/src/auto/back_forward_list_item.rs b/src/auto/back_forward_list_item.rs
@@ -1,4 +1,4 @@
-// This file was generated by gir (7484d29) from gir-files (71d73f0)
+// This file was generated by gir (d50d839) from gir-files (469db10)
 // DO NOT EDIT
 
 use ffi;
@@ -10,7 +10,7 @@ use std::mem;
 use std::ptr;
 
 glib_wrapper! {
-    pub struct BackForwardListItem(Object<ffi::WebKitBackForwardListItem>);
+    pub struct BackForwardListItem(Object<ffi::WebKitBackForwardListItem, ffi::WebKitBackForwardListItemClass>);
 
     match fn {
         get_type => || ffi::webkit_back_forward_list_item_get_type(),
+103 −149		Cargo.lock
+3 −3		Cargo.toml
+1 −0		Gir_Gtk.toml
+29 −4		README.md
+102 −36		src/analysis/bounds.rs
+2 −21		src/analysis/child_properties.rs
+2 −0		src/analysis/class_hierarchy.rs
+49 −37		src/analysis/conversion_type.rs
+36 −39		src/analysis/ffi_type.rs
+46 −10		src/analysis/function_parameters.rs
+125 −23		src/analysis/functions.rs
+1 −0		src/analysis/general.rs
+12 −8		src/analysis/info_base.rs
+10 −16		src/analysis/mod.rs
+41 −10		src/analysis/object.rs
+7 −15		src/analysis/out_parameters.rs
+85 −92		src/analysis/properties.rs
+3 −3		src/analysis/record.rs
+24 −26		src/analysis/ref_mode.rs
+6 −9		src/analysis/return_value.rs
+61 −71		src/analysis/rust_type.rs
+2 −1		src/analysis/safety_assertion_mode.rs
+15 −0		src/analysis/signals.rs
+2 −3		src/analysis/symbols.rs
+19 −14		src/analysis/trampoline_parameters.rs
+40 −6		src/analysis/trampolines.rs
+33 −3		src/chunk/chunk.rs
+2 −1		src/chunk/mod.rs
+1 −1		src/chunk/parameter_ffi_call_out.rs
+8 −8		src/codegen/child_properties.rs
+1 −1		src/codegen/doc/format.rs
+161 −34		src/codegen/doc/mod.rs
+13 −8		src/codegen/enums.rs
+17 −23		src/codegen/flags.rs
+25 −11		src/codegen/function.rs
+222 −46		src/codegen/function_body_chunk.rs
+60 −8		src/codegen/general.rs
+124 −96		src/codegen/object.rs
+3 −2		src/codegen/parameter.rs
+8 −8		src/codegen/properties.rs
+24 −62		src/codegen/property_body.rs
+10 −6		src/codegen/record.rs
+12 −16		src/codegen/return_value.rs
+103 −32		src/codegen/signal.rs
+11 −2		src/codegen/sys/build.rs
+2 −1		src/codegen/sys/cargo_toml.rs
+42 −47		src/codegen/sys/ffi_type.rs
+5 −1		src/codegen/sys/functions.rs
+159 −46		src/codegen/sys/lib_.rs
+1 −0		src/codegen/sys/statics.rs
+45 −21		src/codegen/trait_impls.rs
+59 −44		src/codegen/trampoline.rs
+4 −3		src/codegen/trampoline_to_glib.rs
+35 −39		src/codegen/translate_from_glib.rs
+10 −10		src/codegen/translate_to_glib.rs
+5 −0		src/config/child_properties.rs
+1 −1		src/config/config.rs
+21 −0		src/config/error.rs
+10 −13		src/config/external_libraries.rs
+22 −1		src/config/functions.rs
+87 −14		src/config/gobjects.rs
+15 −19		src/config/ident.rs
+12 −0		src/config/members.rs
+1 −0		src/config/mod.rs
+6 −0		src/config/properties.rs
+37 −5		src/config/signals.rs
+1 −0		src/env.rs
+11 −2		src/library.rs
+104 −4		src/library_postprocessing.rs
+48 −27		src/main.rs
+1 −23		src/nameutil.rs
+388 −451		src/parser.rs
+5 −7		src/update_version.rs
+1 −1		src/writer/mod.rs
+36 −2		src/writer/to_code.rs