Merge pull request #477 from sdroege/futures-0.3-tests

Run futures code and tests when building with nightly

Author: GuillaumeGomez

.travis.yml

@@ -4,10 +4,10 @@ matrix:
   include:
     - os: linux
       rust: nightly
-      env: GTK=3.14 FEATURES=subclassing
+      env: GTK=3.14 FEATURES=subclassing,futures
     - os: linux
       rust: nightly
-      env: GTK=3.24 FEATURES=subclassing,v2_48
+      env: GTK=3.24 FEATURES=subclassing,v2_48,futures
     - os: linux
       rust: beta
       env: GTK=3.14 FEATURES=subclassing
@@ -22,10 +22,10 @@ matrix:
       env: GTK=3.24 FEATURES=subclassing,v2_48
     - os: osx
       rust: nightly
-      env: GTK=3.14 FEATURES=subclassing
+      env: GTK=3.14 FEATURES=subclassing,futures
     # - os: osx
     #   rust: nightly
-    #   env: GTK=3.24 FEATURES=subclassing,v2_48
+    #   env: GTK=3.24 FEATURES=subclassing,v2_48,futures
     - os: osx
       rust: beta
       env: GTK=3.14 FEATURES=subclassing
@@ -40,10 +40,10 @@ matrix:
     #   env: GTK=3.24 FEATURES=subclassing,v2_48
     - os: linux
       rust: nightly
-      env: GTK=3.14 FEATURES=subclassing ARM=1 OTHER_TARGET="--target armv7-unknown-linux-gnueabihf"
+      env: GTK=3.14 FEATURES=subclassing,futures ARM=1 OTHER_TARGET="--target armv7-unknown-linux-gnueabihf"
     - os: linux
       rust: nightly
-      env: GTK=3.24 FEATURES=subclassing,v2_48 ARM=1 OTHER_TARGET="--target armv7-unknown-linux-gnueabihf"
+      env: GTK=3.24 FEATURES=subclassing,v2_48,futures ARM=1 OTHER_TARGET="--target armv7-unknown-linux-gnueabihf"
 addons:
   apt:
     packages:

src/lib.rs

@@ -77,7 +77,6 @@
 
 #![allow(clippy::doc_markdown)]
 #![allow(clippy::unreadable_literal)]
-#![cfg_attr(feature = "futures", feature(futures_api, arbitrary_self_types))]
 
 #[macro_use]
 extern crate bitflags;

src/main_context_futures.rs

@@ -204,7 +204,7 @@ impl TaskSource {
         let waker = self.as_waker();
         let source = &self.source as *const _;
         if let Some(ref mut future) = self.future {
-            let mut executor: MainContext =
+            let executor: MainContext =
                 unsafe { from_glib_none(glib_sys::g_source_get_context(mut_override(source))) };
 
             assert!(