Merge pull request gtk-rs#11 from sdroege/gio-futures-without-fragile

Regenerate with latest gir

Author: GuillaumeGomez

Cargo.toml

@@ -39,7 +39,6 @@ git = "https://github.com/gtk-rs/lgpl-docs"
 libc = "0.2"
 bitflags = "1.0"
 lazy_static = "1.0"
-fragile = { version = "0.3" }
 atk = { git = "https://github.com/gtk-rs/atk" }
 atk-sys = { git = "https://github.com/gtk-rs/sys" }
 cairo-sys-rs = { git = "https://github.com/gtk-rs/cairo" }

gir

@@ -114,18 +114,14 @@ impl IconInfo {
     ) -> Pin<
         Box_<dyn std::future::Future<Output = Result<gdk_pixbuf::Pixbuf, glib::Error>> + 'static>,
     > {
-        use fragile::Fragile;
-        use gio::GioFuture;
-
-        GioFuture::new(self, move |obj, send| {
+        Box_::pin(gio::GioFuture::new(self, move |obj, send| {
             let cancellable = gio::Cancellable::new();
-            let send = Fragile::new(send);
             obj.load_icon_async(Some(&cancellable), move |res| {
-                let _ = send.into_inner().send(res);
+                send.resolve(res);
             });
 
             cancellable
-        })
+        }))
     }
 
     pub fn load_symbolic(
@@ -220,29 +216,25 @@ impl IconInfo {
                 + 'static,
         >,
     > {
-        use fragile::Fragile;
-        use gio::GioFuture;
-
         let fg = fg.clone();
         let success_color = success_color.map(ToOwned::to_owned);
         let warning_color = warning_color.map(ToOwned::to_owned);
         let error_color = error_color.map(ToOwned::to_owned);
-        GioFuture::new(self, move |obj, send| {
+        Box_::pin(gio::GioFuture::new(self, move |obj, send| {
             let cancellable = gio::Cancellable::new();
-            let send = Fragile::new(send);
             obj.load_symbolic_async(
                 &fg,
                 success_color.as_ref().map(::std::borrow::Borrow::borrow),
                 warning_color.as_ref().map(::std::borrow::Borrow::borrow),
                 error_color.as_ref().map(::std::borrow::Borrow::borrow),
                 Some(&cancellable),
                 move |res| {
-                    let _ = send.into_inner().send(res);
+                    send.resolve(res);
                 },
             );
 
             cancellable
-        })
+        }))
     }
 
     pub fn load_symbolic_for_context<P: IsA<StyleContext>>(
@@ -323,19 +315,15 @@ impl IconInfo {
                 + 'static,
         >,
     > {
-        use fragile::Fragile;
-        use gio::GioFuture;
-
         let context = context.clone();
-        GioFuture::new(self, move |obj, send| {
+        Box_::pin(gio::GioFuture::new(self, move |obj, send| {
             let cancellable = gio::Cancellable::new();
-            let send = Fragile::new(send);
             obj.load_symbolic_for_context_async(&context, Some(&cancellable), move |res| {
-                let _ = send.into_inner().send(res);
+                send.resolve(res);
             });
 
             cancellable
-        })
+        }))
     }
 
     pub fn load_texture(&self) -> Option<gdk::Texture> {

src/auto/icon_info.rs

@@ -1,2 +1,2 @@
-Generated by gir (https://github.com/gtk-rs/gir @ 6c8c7c4)
+Generated by gir (https://github.com/gtk-rs/gir @ 8335272)
 from gir-files (https://github.com/gtk-rs/gir-files @ 22748fa)

src/auto/versions.txt

@@ -40,8 +40,6 @@ extern crate graphene;
 extern crate gsk4 as gsk;
 extern crate pango;
 
-extern crate fragile;
-
 pub const STYLE_PROVIDER_PRIORITY_FALLBACK: u32 =
     gtk_sys::GTK_STYLE_PROVIDER_PRIORITY_FALLBACK as u32;
 pub const STYLE_PROVIDER_PRIORITY_THEME: u32 = gtk_sys::GTK_STYLE_PROVIDER_PRIORITY_THEME as u32;