Fix nitpicks

client/finality-grandpa/src/lib.rs

@@ -610,8 +610,7 @@ pub fn run_grandpa_voter<B, E, Block: BlockT, N, RA, SC, VR, X, Sp>(
 					}
 				);
 				future::ready(())
-			})
-			.then(|_| { future::ready(()) });
+			});
 		future::Either::Left(events)
 	} else {
 		future::Either::Right(future::pending())

client/finality-grandpa/src/tests.rs

@@ -1342,9 +1342,7 @@ fn voter_persists_its_votes() {
 					// by `Sink::poll_complete` to make sure items are being flushed. Given that
 					// we send in a loop including a delay until items are received, this can be
 					// ignored for the sake of reduced complexity.
-					Pin::new(&mut *round_tx.lock())
-						.start_send(finality_grandpa::Message::Prevote(prevote))
-						.unwrap();
+					Pin::new(&mut *round_tx.lock()).start_send(finality_grandpa::Message::Prevote(prevote)).unwrap();
 				} else if state.compare_and_swap(1, 2, Ordering::SeqCst) == 1 {
 					// the next message we receive should be our own prevote
 					let prevote = match signed.message {

client/finality-grandpa/src/until_imported.rs

@@ -186,7 +186,7 @@ impl<Block, BStatus, BSyncRequester, I, M> Stream for UntilImported<Block, BStat
 		}
 
 		let mut update_interval = false;
-		while let Poll::Ready(Some(Ok(()))) = Stream::poll_next(Pin::new(&mut this.check_pending), cx) {
+		while let Poll::Ready(Some(Ok(()))) = this.check_pending.poll_next_unpin(cx) {
 			update_interval = true;
 		}