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

Remove callback guard #78

Merged
merged 3 commits into from
Jun 23, 2018
Merged

Remove callback guard #78

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
4d53815
Update submodules
EPashkin Jun 23, 2018
4a88fd2
Remove callback_guard in manual part
EPashkin Jun 23, 2018
71aa1ca
Regen
EPashkin Jun 23, 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
2 changes: 1 addition & 1 deletion gir
Open in desktop
Submodule gir updated 41 files
+140 −211 Cargo.lock
+5 −6 Cargo.toml
+20 −1 README.md
+35 −18 src/analysis/bounds.rs
+1 −0 src/analysis/conversion_type.rs
+4 −4 src/analysis/ffi_type.rs
+26 −24 src/analysis/function_parameters.rs
+94 −50 src/analysis/functions.rs
+3 −4 src/analysis/mod.rs
+35 −11 src/analysis/out_parameters.rs
+74 −0 src/analysis/override_string_type.rs
+3 −2 src/analysis/ref_mode.rs
+10 −6 src/analysis/return_value.rs
+9 −1 src/analysis/rust_type.rs
+2 −1 src/analysis/trampolines.rs
+2 −1 src/codegen/enums.rs
+2 −1 src/codegen/flags.rs
+4 −11 src/codegen/function.rs
+3 −5 src/codegen/function_body_chunk.rs
+27 −10 src/codegen/general.rs
+10 −12 src/codegen/mod.rs
+1 −0 src/codegen/sys/ffi_type.rs
+3 −1 src/codegen/sys/mod.rs
+1 −0 src/codegen/sys/statics.rs
+15 −6 src/codegen/sys/tests.rs
+0 −1 src/codegen/trampoline.rs
+1 −0 src/codegen/trampoline_from_glib.rs
+57 −3 src/config/config.rs
+39 −0 src/config/derives.rs
+51 −14 src/config/functions.rs
+12 −6 src/config/gobjects.rs
+3 −0 src/config/mod.rs
+1 −2 src/config/parsable.rs
+20 −0 src/config/string_type.rs
+11 −1 src/lib.rs
+49 −15 src/library.rs
+1 −1 src/library_postprocessing.rs
+1 −0 src/main.rs
+0 −1 src/nameutil.rs
+4 −4 src/version.rs
+5 −0 tests/sys/gir-secret.toml
2 changes: 1 addition & 1 deletion gir-files
Open in desktop
Submodule gir-files updated 33 files
+734 −2,751 Atk-1.0.gir
+4 −15 DBus-1.0.gir
+2 −8 DBusGLib-1.0.gir
+235 −588 GIRepository-2.0.gir
+2 −6 GL-1.0.gir
+828 −368 GLib-2.0.gir
+9 −35 GModule-2.0.gir
+729 −2,444 GObject-2.0.gir
+16 −15 Gdk-3.0.gir
+189 −723 GdkPixbuf-2.0.gir
+110 −374 GdkX11-3.0.gir
+5,731 −19,594 Gio-2.0.gir
+410 −204 Gtk-3.0.gir
+971 −3,243 GtkSource-3.0.gir
+2 −7 JavaScriptCore-4.0.gir
+751 −2,967 Pango-1.0.gir
+21 −63 PangoFT2-1.0.gir
+32 −123 PangoXft-1.0.gir
+495 −1,868 Secret-1.gir
+1,251 −4,342 Soup-2.4.gir
+448 −734 Vte-2.91.gir
+1,548 −3,711 WebKit2-4.0.gir
+2,345 −5,876 WebKit2WebExtension-4.0.gir
+4 −2 dl.sh
+26 −8 fix.sh
+2 −6 fontconfig-2.0.gir
+2 −6 libxml2-2.0.gir
+6 −0 reformat.sh
+2 −7 win32-1.0.gir
+2 −6 xfixes-4.0.gir
+2 −6 xft-2.0.gir
+2 −6 xlib-2.0.gir
+2 −6 xrandr-1.3.gir
9 changes: 0 additions & 9 deletions src/auto/pixbuf.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -533,63 +533,54 @@ impl<O: IsA<Pixbuf> + IsA<glib::object::Object>> PixbufExt for O {

unsafe extern "C" fn notify_bits_per_sample_trampoline<P>(this: *mut ffi::GdkPixbuf, _param_spec: glib_ffi::gpointer, f: glib_ffi::gpointer)
where P: IsA<Pixbuf> {
callback_guard!();
let f: &&(Fn(&P) + 'static) = transmute(f);
f(&Pixbuf::from_glib_borrow(this).downcast_unchecked())
}

unsafe extern "C" fn notify_colorspace_trampoline<P>(this: *mut ffi::GdkPixbuf, _param_spec: glib_ffi::gpointer, f: glib_ffi::gpointer)
where P: IsA<Pixbuf> {
callback_guard!();
let f: &&(Fn(&P) + 'static) = transmute(f);
f(&Pixbuf::from_glib_borrow(this).downcast_unchecked())
}

unsafe extern "C" fn notify_has_alpha_trampoline<P>(this: *mut ffi::GdkPixbuf, _param_spec: glib_ffi::gpointer, f: glib_ffi::gpointer)
where P: IsA<Pixbuf> {
callback_guard!();
let f: &&(Fn(&P) + 'static) = transmute(f);
f(&Pixbuf::from_glib_borrow(this).downcast_unchecked())
}

unsafe extern "C" fn notify_height_trampoline<P>(this: *mut ffi::GdkPixbuf, _param_spec: glib_ffi::gpointer, f: glib_ffi::gpointer)
where P: IsA<Pixbuf> {
callback_guard!();
let f: &&(Fn(&P) + 'static) = transmute(f);
f(&Pixbuf::from_glib_borrow(this).downcast_unchecked())
}

unsafe extern "C" fn notify_n_channels_trampoline<P>(this: *mut ffi::GdkPixbuf, _param_spec: glib_ffi::gpointer, f: glib_ffi::gpointer)
where P: IsA<Pixbuf> {
callback_guard!();
let f: &&(Fn(&P) + 'static) = transmute(f);
f(&Pixbuf::from_glib_borrow(this).downcast_unchecked())
}

unsafe extern "C" fn notify_pixel_bytes_trampoline<P>(this: *mut ffi::GdkPixbuf, _param_spec: glib_ffi::gpointer, f: glib_ffi::gpointer)
where P: IsA<Pixbuf> {
callback_guard!();
let f: &&(Fn(&P) + 'static) = transmute(f);
f(&Pixbuf::from_glib_borrow(this).downcast_unchecked())
}

unsafe extern "C" fn notify_pixels_trampoline<P>(this: *mut ffi::GdkPixbuf, _param_spec: glib_ffi::gpointer, f: glib_ffi::gpointer)
where P: IsA<Pixbuf> {
callback_guard!();
let f: &&(Fn(&P) + 'static) = transmute(f);
f(&Pixbuf::from_glib_borrow(this).downcast_unchecked())
}

unsafe extern "C" fn notify_rowstride_trampoline<P>(this: *mut ffi::GdkPixbuf, _param_spec: glib_ffi::gpointer, f: glib_ffi::gpointer)
where P: IsA<Pixbuf> {
callback_guard!();
let f: &&(Fn(&P) + 'static) = transmute(f);
f(&Pixbuf::from_glib_borrow(this).downcast_unchecked())
}

unsafe extern "C" fn notify_width_trampoline<P>(this: *mut ffi::GdkPixbuf, _param_spec: glib_ffi::gpointer, f: glib_ffi::gpointer)
where P: IsA<Pixbuf> {
callback_guard!();
let f: &&(Fn(&P) + 'static) = transmute(f);
f(&Pixbuf::from_glib_borrow(this).downcast_unchecked())
}
4 changes: 0 additions & 4 deletions src/auto/pixbuf_loader.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -170,28 +170,24 @@ impl<O: IsA<PixbufLoader> + IsA<glib::object::Object>> PixbufLoaderExt for O {

unsafe extern "C" fn area_prepared_trampoline<P>(this: *mut ffi::GdkPixbufLoader, f: glib_ffi::gpointer)
where P: IsA<PixbufLoader> {
callback_guard!();
let f: &&(Fn(&P) + 'static) = transmute(f);
f(&PixbufLoader::from_glib_borrow(this).downcast_unchecked())
}

unsafe extern "C" fn area_updated_trampoline<P>(this: *mut ffi::GdkPixbufLoader, x: libc::c_int, y: libc::c_int, width: libc::c_int, height: libc::c_int, f: glib_ffi::gpointer)
where P: IsA<PixbufLoader> {
callback_guard!();
let f: &&(Fn(&P, i32, i32, i32, i32) + 'static) = transmute(f);
f(&PixbufLoader::from_glib_borrow(this).downcast_unchecked(), x, y, width, height)
}

unsafe extern "C" fn closed_trampoline<P>(this: *mut ffi::GdkPixbufLoader, f: glib_ffi::gpointer)
where P: IsA<PixbufLoader> {
callback_guard!();
let f: &&(Fn(&P) + 'static) = transmute(f);
f(&PixbufLoader::from_glib_borrow(this).downcast_unchecked())
}

unsafe extern "C" fn size_prepared_trampoline<P>(this: *mut ffi::GdkPixbufLoader, width: libc::c_int, height: libc::c_int, f: glib_ffi::gpointer)
where P: IsA<PixbufLoader> {
callback_guard!();
let f: &&(Fn(&P, i32, i32) + 'static) = transmute(f);
f(&PixbufLoader::from_glib_borrow(this).downcast_unchecked(), width, height)
}
1 change: 0 additions & 1 deletion src/auto/pixbuf_simple_anim.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -74,7 +74,6 @@ impl<O: IsA<PixbufSimpleAnim> + IsA<glib::object::Object>> PixbufSimpleAnimExt f

unsafe extern "C" fn notify_loop_trampoline<P>(this: *mut ffi::GdkPixbufSimpleAnim, _param_spec: glib_ffi::gpointer, f: glib_ffi::gpointer)
where P: IsA<PixbufSimpleAnim> {
callback_guard!();
let f: &&(Fn(&P) + 'static) = transmute(f);
f(&PixbufSimpleAnim::from_glib_borrow(this).downcast_unchecked())
}
6 changes: 2 additions & 4 deletions src/auto/versions.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,4 +1,2 @@
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
Generated by gir (https://github.com/gtk-rs/gir @ 9eab494)
from gir-files (https://github.com/gtk-rs/gir-files @ 47c69e6)
3 changes: 0 additions & 3 deletions src/lib.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -29,9 +29,6 @@ pub use glib::{
Value,
};

#[macro_use]
mod rt;

mod auto;

mod animation;
Expand Down
4 changes: 0 additions & 4 deletions src/pixbuf.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -107,7 +107,6 @@ impl Pixbuf {
let user_data: Box<Box<R>> = Box::new(Box::new(callback));
unsafe extern "C" fn new_from_stream_async_trampoline<R: FnOnce(Result<Pixbuf, Error>) + Send + 'static>(_source_object: *mut gobject_ffi::GObject, res: *mut gio_ffi::GAsyncResult, user_data: glib_ffi::gpointer)
{
callback_guard!();
let mut error = ptr::null_mut();
let ptr = ffi::gdk_pixbuf_new_from_stream_finish(res, &mut error);
let result = if error.is_null() {
Expand Down Expand Up @@ -152,7 +151,6 @@ impl Pixbuf {
let user_data: Box<Box<R>> = Box::new(Box::new(callback));
unsafe extern "C" fn new_from_stream_at_scale_async_trampoline<R: FnOnce(Result<Pixbuf, Error>) + Send + 'static>(_source_object: *mut gobject_ffi::GObject, res: *mut gio_ffi::GAsyncResult, user_data: glib_ffi::gpointer)
{
callback_guard!();
let mut error = ptr::null_mut();
let ptr = ffi::gdk_pixbuf_new_from_stream_finish(res, &mut error);
let result = if error.is_null() {
Expand Down Expand Up @@ -237,7 +235,6 @@ impl Pixbuf {
let user_data: Box<Box<Q>> = Box::new(Box::new(callback));
unsafe extern "C" fn get_file_info_async_trampoline<Q: FnOnce(Result<Option<(PixbufFormat, i32, i32)>, Error>) + Send + 'static>(_source_object: *mut gobject_ffi::GObject, res: *mut gio_ffi::GAsyncResult, user_data: glib_ffi::gpointer)
{
callback_guard!();
let mut error = ptr::null_mut();
let mut width = mem::uninitialized();
let mut height = mem::uninitialized();
Expand Down Expand Up @@ -312,7 +309,6 @@ impl Pixbuf {
let user_data: Box<Box<R>> = Box::new(Box::new(callback));
unsafe extern "C" fn save_to_streamv_async_trampoline<R: FnOnce(Result<(), Error>) + Send + 'static>(_source_object: *mut gobject_ffi::GObject, res: *mut gio_ffi::GAsyncResult, user_data: glib_ffi::gpointer)
{
callback_guard!();
let mut error = ptr::null_mut();
let _ = ffi::gdk_pixbuf_save_to_stream_finish(res, &mut error);
let result = if error.is_null() {
Expand Down
17 changes: 0 additions & 17 deletions src/rt.rs
View file
Open in desktop

This file was deleted.