diff options
author | Taiki Endo <te316e89@gmail.com> | 2019-08-11 02:01:20 +0900 |
---|---|---|
committer | GitHub <noreply@github.com> | 2019-08-11 02:01:20 +0900 |
commit | d9f9c5658f135d2c5aca19ef435266170187c924 (patch) | |
tree | 5454c8087d7dffc244b97fec328a5774879921be /tokio-io | |
parent | fff39c03b19871aafad25df5b8688d3915f001a0 (diff) |
chore: bump to newer nightly (#1426)
Diffstat (limited to 'tokio-io')
-rw-r--r-- | tokio-io/src/async_buf_read.rs | 24 | ||||
-rw-r--r-- | tokio-io/src/io/copy.rs | 2 | ||||
-rw-r--r-- | tokio-io/src/io/flush.rs | 2 | ||||
-rw-r--r-- | tokio-io/src/io/read.rs | 2 | ||||
-rw-r--r-- | tokio-io/src/io/read_exact.rs | 2 | ||||
-rw-r--r-- | tokio-io/src/io/shutdown.rs | 2 | ||||
-rw-r--r-- | tokio-io/src/io/write.rs | 2 |
7 files changed, 12 insertions, 24 deletions
diff --git a/tokio-io/src/async_buf_read.rs b/tokio-io/src/async_buf_read.rs index d0c4952d..dfac44f3 100644 --- a/tokio-io/src/async_buf_read.rs +++ b/tokio-io/src/async_buf_read.rs @@ -31,10 +31,7 @@ pub trait AsyncBufRead: AsyncRead { /// /// [`poll_read`]: AsyncRead::poll_read /// [`consume`]: AsyncBufRead::consume - fn poll_fill_buf<'a>( - self: Pin<&'a mut Self>, - cx: &mut Context<'_>, - ) -> Poll<io::Result<&'a [u8]>>; + fn poll_fill_buf(self: Pin<&mut Self>, cx: &mut Context<'_>) -> Poll<io::Result<&[u8]>>; /// Tells this buffer that `amt` bytes have been consumed from the buffer, /// so they should no longer be returned in calls to [`poll_read`]. @@ -56,8 +53,8 @@ pub trait AsyncBufRead: AsyncRead { macro_rules! deref_async_buf_read { () => { - fn poll_fill_buf<'a>(self: Pin<&'a mut Self>, cx: &mut Context<'_>) - -> Poll<io::Result<&'a [u8]>> + fn poll_fill_buf(self: Pin<&mut Self>, cx: &mut Context<'_>) + -> Poll<io::Result<&[u8]>> { Pin::new(&mut **self.get_mut()).poll_fill_buf(cx) } @@ -81,10 +78,7 @@ where P: DerefMut + Unpin, P::Target: AsyncBufRead, { - fn poll_fill_buf<'a>( - self: Pin<&'a mut Self>, - cx: &mut Context<'_>, - ) -> Poll<io::Result<&'a [u8]>> { + fn poll_fill_buf(self: Pin<&mut Self>, cx: &mut Context<'_>) -> Poll<io::Result<&[u8]>> { self.get_mut().as_mut().poll_fill_buf(cx) } @@ -94,10 +88,7 @@ where } impl AsyncBufRead for &[u8] { - fn poll_fill_buf<'a>( - self: Pin<&'a mut Self>, - _cx: &mut Context<'_>, - ) -> Poll<io::Result<&'a [u8]>> { + fn poll_fill_buf(self: Pin<&mut Self>, _cx: &mut Context<'_>) -> Poll<io::Result<&[u8]>> { Poll::Ready(Ok(*self)) } @@ -107,10 +98,7 @@ impl AsyncBufRead for &[u8] { } impl<T: AsRef<[u8]> + Unpin> AsyncBufRead for io::Cursor<T> { - fn poll_fill_buf<'a>( - self: Pin<&'a mut Self>, - _cx: &mut Context<'_>, - ) -> Poll<io::Result<&'a [u8]>> { + fn poll_fill_buf(self: Pin<&mut Self>, _cx: &mut Context<'_>) -> Poll<io::Result<&[u8]>> { Poll::Ready(io::BufRead::fill_buf(self.get_mut())) } diff --git a/tokio-io/src/io/copy.rs b/tokio-io/src/io/copy.rs index f363e308..688eb502 100644 --- a/tokio-io/src/io/copy.rs +++ b/tokio-io/src/io/copy.rs @@ -33,7 +33,7 @@ where } } -impl<'a, R, W> Future for Copy<'a, R, W> +impl<R, W> Future for Copy<'_, R, W> where R: AsyncRead + Unpin + ?Sized, W: AsyncWrite + Unpin + ?Sized, diff --git a/tokio-io/src/io/flush.rs b/tokio-io/src/io/flush.rs index 6fef526b..6be90fcc 100644 --- a/tokio-io/src/io/flush.rs +++ b/tokio-io/src/io/flush.rs @@ -22,7 +22,7 @@ where Flush { a } } -impl<'a, A> Unpin for Flush<'a, A> where A: Unpin + ?Sized {} +impl<A> Unpin for Flush<'_, A> where A: Unpin + ?Sized {} impl<A> Future for Flush<'_, A> where diff --git a/tokio-io/src/io/read.rs b/tokio-io/src/io/read.rs index 449dac77..62f2fea0 100644 --- a/tokio-io/src/io/read.rs +++ b/tokio-io/src/io/read.rs @@ -29,7 +29,7 @@ pub struct Read<'a, R: ?Sized> { } // forward Unpin -impl<'a, R: Unpin + ?Sized> Unpin for Read<'_, R> {} +impl<R: Unpin + ?Sized> Unpin for Read<'_, R> {} impl<R> Future for Read<'_, R> where diff --git a/tokio-io/src/io/read_exact.rs b/tokio-io/src/io/read_exact.rs index 63006ab2..6a616b97 100644 --- a/tokio-io/src/io/read_exact.rs +++ b/tokio-io/src/io/read_exact.rs @@ -40,7 +40,7 @@ fn eof() -> io::Error { } // forward Unpin -impl<'a, A: Unpin + ?Sized> Unpin for ReadExact<'_, A> {} +impl<A: Unpin + ?Sized> Unpin for ReadExact<'_, A> {} impl<A> Future for ReadExact<'_, A> where diff --git a/tokio-io/src/io/shutdown.rs b/tokio-io/src/io/shutdown.rs index 4d01c46a..f22c6e55 100644 --- a/tokio-io/src/io/shutdown.rs +++ b/tokio-io/src/io/shutdown.rs @@ -22,7 +22,7 @@ where Shutdown { a } } -impl<'a, A> Unpin for Shutdown<'a, A> where A: Unpin + ?Sized {} +impl<A> Unpin for Shutdown<'_, A> where A: Unpin + ?Sized {} impl<A> Future for Shutdown<'_, A> where diff --git a/tokio-io/src/io/write.rs b/tokio-io/src/io/write.rs index 89ee86a3..1f27f605 100644 --- a/tokio-io/src/io/write.rs +++ b/tokio-io/src/io/write.rs @@ -22,7 +22,7 @@ where } // forward Unpin -impl<'a, W: Unpin + ?Sized> Unpin for Write<'a, W> {} +impl<W: Unpin + ?Sized> Unpin for Write<'_, W> {} impl<W> Future for Write<'_, W> where |