Merge pull request #805 from GuillaumeGomez/regen

Regen

Author: GuillaumeGomez

atk/src/auto/versions.txt

@@ -1,2 +1,2 @@
-Generated by gir (https://github.com/gtk-rs/gir @ 047f55810b96)
+Generated by gir (https://github.com/gtk-rs/gir @ 425f84d5af7f)
 from gir-files (https://github.com/gtk-rs/gir-files @ 4eaad6a722bf)

atk/sys/versions.txt

@@ -1,2 +1,2 @@
-Generated by gir (https://github.com/gtk-rs/gir @ 047f55810b96)
+Generated by gir (https://github.com/gtk-rs/gir @ 425f84d5af7f)
 from gir-files (https://github.com/gtk-rs/gir-files @ 4eaad6a722bf)

gdk/src/auto/seat.rs

@@ -124,7 +124,7 @@ impl<O: IsA<Seat>> SeatExt for O {
                 callback(&seat, &window)
             } else {
                 panic!("cannot get closure...")
-            };
+            }
         }
         let prepare_func = if prepare_func_data.is_some() {
             Some(prepare_func_func as _)

gdk/src/auto/versions.txt

@@ -1,2 +1,2 @@
-Generated by gir (https://github.com/gtk-rs/gir @ 047f55810b96)
+Generated by gir (https://github.com/gtk-rs/gir @ 425f84d5af7f)
 from gir-files (https://github.com/gtk-rs/gir-files @ 4eaad6a722bf)

gdk/src/auto/window.rs

@@ -688,12 +688,12 @@ impl Window {
             let window = from_glib_borrow(window);
             let callback: *mut Option<&mut dyn (FnMut(&Window) -> bool)> =
                 user_data as *const _ as usize as *mut Option<&mut dyn (FnMut(&Window) -> bool)>;
-            let res = if let Some(ref mut callback) = *callback {
+            if let Some(ref mut callback) = *callback {
                 callback(&window)
             } else {
                 panic!("cannot get closure...")
-            };
-            res.into_glib()
+            }
+            .into_glib()
         }
         let child_func = if child_func_data.is_some() {
             Some(child_func_func as _)

gdk/sys/versions.txt

@@ -1,2 +1,2 @@
-Generated by gir (https://github.com/gtk-rs/gir @ 047f55810b96)
+Generated by gir (https://github.com/gtk-rs/gir @ 425f84d5af7f)
 from gir-files (https://github.com/gtk-rs/gir-files @ 4eaad6a722bf)

gdkx11/src/auto/versions.txt

@@ -1,2 +1,2 @@
-Generated by gir (https://github.com/gtk-rs/gir @ 047f55810b96)
+Generated by gir (https://github.com/gtk-rs/gir @ 425f84d5af7f)
 from gir-files (https://github.com/gtk-rs/gir-files @ 4eaad6a722bf)

gdkx11/sys/versions.txt

@@ -1,2 +1,2 @@
-Generated by gir (https://github.com/gtk-rs/gir @ 047f55810b96)
+Generated by gir (https://github.com/gtk-rs/gir @ 425f84d5af7f)
 from gir-files (https://github.com/gtk-rs/gir-files @ 4eaad6a722bf)

gir

@@ -725,12 +725,11 @@ impl<O: IsA<Assistant>> AssistantExt for O {
             data: glib::ffi::gpointer,
         ) -> libc::c_int {
             let callback: &Option<Box_<dyn Fn(i32) -> i32 + 'static>> = &*(data as *mut _);
-            let res = if let Some(ref callback) = *callback {
+            if let Some(ref callback) = *callback {
                 callback(current_page)
             } else {
                 panic!("cannot get closure...")
-            };
-            res
+            }
         }
         let page_func = if page_func_data.is_some() {
             Some(page_func_func as _)