diff --git a/tokio-fs/src/file/create.rs b/tokio-fs/src/file/create.rs index 15fbc8f67..65feef6c0 100644 --- a/tokio-fs/src/file/create.rs +++ b/tokio-fs/src/file/create.rs @@ -35,6 +35,6 @@ where let std = ready!(crate::blocking_io(|| StdFile::create(&self.path)))?; let file = File::from_std(std); - Poll::Ready(Ok(file.into())) + Poll::Ready(Ok(file)) } } diff --git a/tokio-fs/src/file/metadata.rs b/tokio-fs/src/file/metadata.rs index 9afb7f7b0..a29f17d8c 100644 --- a/tokio-fs/src/file/metadata.rs +++ b/tokio-fs/src/file/metadata.rs @@ -36,6 +36,6 @@ impl Future for MetadataFuture { let metadata = ready!(crate::blocking_io(|| StdFile::metadata(inner.std())))?; let file = inner.file.take().expect(POLL_AFTER_RESOLVE); - Poll::Ready(Ok((file, metadata).into())) + Poll::Ready(Ok((file, metadata))) } } diff --git a/tokio-fs/src/file/open.rs b/tokio-fs/src/file/open.rs index abe7bcb29..d8fa36ccb 100644 --- a/tokio-fs/src/file/open.rs +++ b/tokio-fs/src/file/open.rs @@ -36,6 +36,6 @@ where let std = ready!(crate::blocking_io(|| self.options.open(&self.path)))?; let file = File::from_std(std); - Poll::Ready(Ok(file.into())) + Poll::Ready(Ok(file)) } } diff --git a/tokio-fs/src/file/seek.rs b/tokio-fs/src/file/seek.rs index ab0aca97a..cf99cc373 100644 --- a/tokio-fs/src/file/seek.rs +++ b/tokio-fs/src/file/seek.rs @@ -35,6 +35,6 @@ impl Future for SeekFuture { .expect("Cannot poll `SeekFuture` after it resolves") .poll_seek(inner_self.pos))?; let inner = inner_self.inner.take().unwrap(); - Poll::Ready(Ok((inner, pos).into())) + Poll::Ready(Ok((inner, pos))) } } diff --git a/tokio-timer/src/timer/atomic_stack.rs b/tokio-timer/src/timer/atomic_stack.rs index bbc540a25..c248c20a1 100644 --- a/tokio-timer/src/timer/atomic_stack.rs +++ b/tokio-timer/src/timer/atomic_stack.rs @@ -34,7 +34,7 @@ impl AtomicStack { /// on the stack, `Err` if the timer is shutdown. pub fn push(&self, entry: &Arc) -> Result { // First, set the queued bit on the entry - let queued = entry.queued.fetch_or(true, SeqCst).into(); + let queued = entry.queued.fetch_or(true, SeqCst); if queued { // Already queued, nothing more to do diff --git a/tokio-timer/src/timer/entry.rs b/tokio-timer/src/timer/entry.rs index 3cd0f8152..dc8288cf1 100644 --- a/tokio-timer/src/timer/entry.rs +++ b/tokio-timer/src/timer/entry.rs @@ -302,7 +302,7 @@ impl Entry { self.waker.register_by_ref(cx.waker()); - curr = self.state.load(SeqCst).into(); + curr = self.state.load(SeqCst); if is_elapsed(curr) { return Poll::Ready(if curr == ERROR { diff --git a/tokio-tls/src/lib.rs b/tokio-tls/src/lib.rs index a95d31da2..f2730e284 100644 --- a/tokio-tls/src/lib.rs +++ b/tokio-tls/src/lib.rs @@ -194,7 +194,7 @@ where match self.with_context(ctx, |s| s.shutdown()) { Ok(()) => Poll::Ready(Ok(())), Err(ref e) if e.kind() == io::ErrorKind::WouldBlock => return Poll::Pending, - Err(e) => return Poll::Ready(Err(e.into())), + Err(e) => return Poll::Ready(Err(e)), } } }