Fix merge conflicts on master

Author: cramertj

futures-util/src/stream/fuse.rs

@@ -14,7 +14,7 @@ pub struct Fuse<St> {
 
 impl<St: Unpin> Unpin for Fuse<St> {}
 
-impl<St: Stream> Fuse<St> {
+impl<St> Fuse<St> {
     unsafe_pinned!(stream: St);
     unsafe_unpinned!(done: bool);
 

futures-util/src/stream/select.rs

@@ -33,7 +33,9 @@ pub fn select<St1, St2>(stream1: St1, stream2: St2) -> Select<St1, St2>
         stream2: stream2.fuse(),
         flag: false,
     }
+}
 
+impl<St1, St2> Select<St1, St2> {
     /// Acquires a reference to the underlying streams that this combinator is
     /// pulling from.
     pub fn get_ref(&self) -> (&St1, &St2) {

futures/tests/future_obj.rs

@@ -1,6 +1,6 @@
 #![feature(async_await, futures_api)]
 
-use futures::future::{Future, FutureExt, FutureObj};
+use futures::future::{Future, FutureObj};
 use std::pin::Pin;
 use futures::task::{Context, Poll};