Update examples for the latest regen

.travis.yml

@@ -3,7 +3,7 @@ language: rust
 rust:
 - nightly
 - beta
-- 1.36.0 # stable
+- 1.39.0 # stable
 - stable
 addons:
   apt:

Cargo.toml

@@ -7,7 +7,7 @@ autobins = false
 [dependencies]
 chrono = "0.4"
 url = "1.4"
-futures-preview = { version = "0.3.0-alpha.15", optional = true}
+futures = "0.3"
 
 [dependencies.atk]
 git = "https://github.com/gtk-rs/atk"
@@ -42,9 +42,6 @@ git = "https://github.com/gtk-rs/gdk4"
 package = "gtk4"
 git = "https://github.com/gtk-rs/gtk4"
 
-[features]
-futures = ["futures-preview", "glib/futures", "gio/futures"]
-
 [[bin]]
 name = "accessibility"
 
@@ -86,11 +83,9 @@ name = "drag_and_drop_textview"
 
 [[bin]]
 name = "gio_futures"
-required-features = ["futures"]
 
 [[bin]]
 name = "gio_futures_await"
-required-features = ["futures"]
 edition = "2018"
 
 [[bin]]

build_travis.sh

@@ -5,11 +5,7 @@ set -e
 
 if [ "$GTK" = latest -o "$GTK" = "3.96" ]; then
 	BUNDLE="gtk-3.96.0-1"
-	if [ "$TRAVIS_RUST_VERSION" = "nightly" ]; then
-		FEATURES=futures,gio/v2_44
-	else
-		FEATURES=gio/v2_44
-	fi
+	FEATURES=gio/v2_44
 fi
 
 if [ -n "$BUNDLE" ]; then

src/bin/css.rs

@@ -52,11 +52,11 @@ fn build_ui(application: &gtk::Application) {
     let label = gtk::Button::new_with_label("hover me!");
     // We need to name it in order to be able to use its name as a CSS label to
     // apply CSS on it.
-    gtk::WidgetExtManual::set_name(&label, "label1");
+    WidgetExtManual::set_name(&label, "label1");
 
     let entry = gtk::Entry::new();
     // We need to name it in order to apply CSS on it.
-    gtk::WidgetExtManual::set_name(&entry, "entry1");
+    WidgetExtManual::set_name(&entry, "entry1");
     entry.set_text("Some text");
 
     let combo = gtk::ComboBoxText::new();

src/bin/gio_futures_await.rs

@@ -1,5 +1,3 @@
-#![feature(async_await)]
-
 extern crate gio;
 extern crate glib;
 use gio::prelude::*;

src/bin/overlay.rs

@@ -8,7 +8,6 @@ extern crate glib;
 extern crate gtk;
 
 use gio::prelude::*;
-use glib::prelude::*;
 use gtk::prelude::*;
 
 use std::env::args;
@@ -52,7 +51,7 @@ fn build_ui(application: &gtk::Application) {
     // The overlay label.
     let overlay_text = gtk::Label::new(Some("0"));
     // We need to name it in order to apply CSS on it.
-    gtk::WidgetExtManual::set_name(&overlay_text, "overlay-label");
+    WidgetExtManual::set_name(&overlay_text, "overlay-label");
     // We put the overlay in the top-right corner of the window.
     overlay_text.set_halign(gtk::Align::End);
     overlay_text.set_valign(gtk::Align::Start);

src/bin/progress_tracker.rs

@@ -7,7 +7,7 @@ extern crate gtk;
 use gio::prelude::*;
 use gtk::prelude::*;
 
-use gio::signal::Inhibit;
+use glib::signal::Inhibit;
 use std::cell::{Cell, RefCell};
 use std::env::args;
 use std::rc::Rc;

src/bin/tree_model_sort.rs

@@ -7,8 +7,8 @@ extern crate gio;
 extern crate glib;
 extern crate gtk;
 
+use gio::prelude::ApplicationExtManual;
 use gio::ApplicationExt;
-use gio::ApplicationExtManual;
 use gtk::prelude::*;
 use std::env::args;