Fix warnings and rebase artifacts

Author: cramertj

futures-channel/src/mpsc/mod.rs

@@ -649,11 +649,7 @@ impl<T> Sender<T> {
     /// - `Err(SendError)` if the receiver has been dropped.
     pub fn poll_ready(
         &mut self,
-<<<<<<< HEAD
         waker: &Waker,
-=======
-        waker: &Waker
->>>>>>> Rename noop/panic waker and fix other compilation issue
     ) -> Poll<Result<(), SendError>> {
         let inner = self.0.as_mut().ok_or(SendError {
             kind: SendErrorKind::Disconnected,

futures-executor/src/local_pool.rs

@@ -152,7 +152,7 @@ impl LocalPool {
                 }
             }
 
-            self.poll_pool(waker);
+            let _ = self.poll_pool(waker);
             Poll::Pending
         })
     }

futures-util/src/macros/poll.rs

@@ -14,25 +14,6 @@ macro_rules! try_ready {
     }
 }
 
-
-/// Extracts `Poll<T>` from `Poll<Result<T, E>>`.
-///
-/// This macro bakes in propagation of `Err` signals by returning early.
-/// This macro bakes in propagation of `Pending` and `Err` signals by returning early.
-#[macro_export]
-macro_rules! try_poll {
-    ($x:expr) => {
-        match $x {
-            $crate::core_reexport::task::Poll::Ready(Ok(x)) =>
-                $crate::core_reexport::task::Poll::Ready(x),
-            $crate::core_reexport::task::Poll::Ready(Err(e)) =>
-                return $crate::core_reexport::task::Poll::Ready(Err(e.into())),
-            $crate::core_reexport::task::Poll::Pending =>
-                $crate::core_reexport::task::Poll::Pending,
-        }
-    }
-}
-
 /// Extracts the successful type of a `Poll<T>`.
 ///
 /// This macro bakes in propagation of `Pending` signals by returning early.

futures-util/src/sink/fanout.rs

@@ -54,8 +54,8 @@ impl<Si1, Si2> Sink for Fanout<Si1, Si2>
         mut self: Pin<&mut Self>,
         waker: &Waker,
     ) -> Poll<Result<(), Self::SinkError>> {
-        let sink1_ready = try_poll!(self.as_mut().sink1().poll_ready(waker)).is_ready();
-        let sink2_ready = try_poll!(self.as_mut().sink2().poll_ready(waker)).is_ready();
+        let sink1_ready = self.as_mut().sink1().poll_ready(waker)?.is_ready();
+        let sink2_ready = self.as_mut().sink2().poll_ready(waker)?.is_ready();
         let ready = sink1_ready && sink2_ready;
         if ready { Poll::Ready(Ok(())) } else { Poll::Pending }
     }
@@ -73,8 +73,8 @@ impl<Si1, Si2> Sink for Fanout<Si1, Si2>
         mut self: Pin<&mut Self>,
         waker: &Waker,
     ) -> Poll<Result<(), Self::SinkError>> {
-        let sink1_ready = try_poll!(self.as_mut().sink1().poll_flush(waker)).is_ready();
-        let sink2_ready = try_poll!(self.as_mut().sink2().poll_flush(waker)).is_ready();
+        let sink1_ready = self.as_mut().sink1().poll_flush(waker)?.is_ready();
+        let sink2_ready = self.as_mut().sink2().poll_flush(waker)?.is_ready();
         let ready = sink1_ready && sink2_ready;
         if ready { Poll::Ready(Ok(())) } else { Poll::Pending }
     }
@@ -83,8 +83,8 @@ impl<Si1, Si2> Sink for Fanout<Si1, Si2>
         mut self: Pin<&mut Self>,
         waker: &Waker,
     ) -> Poll<Result<(), Self::SinkError>> {
-        let sink1_ready = try_poll!(self.as_mut().sink1().poll_close(waker)).is_ready();
-        let sink2_ready = try_poll!(self.as_mut().sink2().poll_close(waker)).is_ready();
+        let sink1_ready = self.as_mut().sink1().poll_close(waker)?.is_ready();
+        let sink2_ready = self.as_mut().sink2().poll_close(waker)?.is_ready();
         let ready = sink1_ready && sink2_ready;
         if ready { Poll::Ready(Ok(())) } else { Poll::Pending }
     }

futures-util/src/sink/with_flat_map.rs

@@ -91,10 +91,8 @@ where
         if let Some(mut some_stream) = stream.as_mut().as_pin_mut() {
             while let Some(x) = ready!(some_stream.as_mut().poll_next(waker)) {
                 let item = try_ready!(Poll::Ready(x));
-                match try_poll!(sink.as_mut().poll_ready(waker)) {
-                    Poll::Ready(()) => {
-                        try_poll!(Poll::Ready(sink.as_mut().start_send(item)))
-                    }
+                match sink.as_mut().poll_ready(waker)? {
+                    Poll::Ready(()) => sink.as_mut().start_send(item)?,
                     Poll::Pending => {
                         *buffer = Some(item);
                         return Poll::Pending;

futures-util/src/stream/forward.rs

@@ -51,7 +51,7 @@ where
         debug_assert!(self.buffered_item.is_none());
         {
             let mut sink = self.as_mut().sink().as_pin_mut().unwrap();
-            if try_poll!(sink.as_mut().poll_ready(waker)).is_ready() {
+            if sink.as_mut().poll_ready(waker)?.is_ready() {
                 return Poll::Ready(sink.start_send(item));
             }
         }

futures-util/src/stream/select_all.rs

@@ -86,7 +86,7 @@ impl<St: Stream + Unpin> Stream for SelectAll<St> {
                 // FuturesUnordered thinks it isn't terminated
                 // because it yielded a Some. Here we poll it
                 // so it can realize it is terminated.
-                self.inner.poll_next_unpin(waker);
+                let _ = self.inner.poll_next_unpin(waker);
                 Poll::Ready(None)
             }
             Poll::Ready(_) => Poll::Ready(None),

futures-util/src/task/noop_waker.rs

@@ -1,9 +1,5 @@
 //! Utilities for creating zero-cost wakers that don't do anything.
-<<<<<<< HEAD
 use futures_core::task::{RawWaker, RawWakerVTable, Waker};
-=======
-use futures_core::task::{Waker, RawWaker, RawWakerVTable};
->>>>>>> Fix remaining compilation errors
 use core::ptr::null;
 use core::cell::UnsafeCell;
 

futures/src/lib.rs

@@ -53,7 +53,7 @@ compile_error!("The `cfg-target-has-atomic` feature requires the `nightly` featu
 // Macro reexports
 pub use futures_util::{
     // Error/readiness propagation
-    try_ready, try_poll, ready,
+    try_ready, ready,
 };
 #[cfg(feature = "std")]
 pub use futures_util::{