Skip to content

Commit d9f9c56

Browse files
authored
chore: bump to newer nightly (#1426)
1 parent fff39c0 commit d9f9c56

File tree

44 files changed

+45
-89
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

44 files changed

+45
-89
lines changed

.cirrus.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -14,7 +14,7 @@ task:
1414
- pkg install -y curl
1515
- curl https://sh.rustup.rs -sSf --output rustup.sh
1616
# TODO: switch back to nightly
17-
- sh rustup.sh -y --default-toolchain nightly-2019-07-17
17+
- sh rustup.sh -y --default-toolchain nightly-2019-08-10
1818
- . $HOME/.cargo/env
1919
- rustup target add i686-unknown-freebsd
2020
- |

azure-pipelines.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@ trigger: ["master", "std-future"]
22
pr: ["master", "std-future"]
33

44
variables:
5-
nightly: nightly-2019-07-17
5+
nightly: nightly-2019-08-10
66
RUSTFLAGS: -Dwarnings
77

88
jobs:

ci/azure-install-rust.yml

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -27,8 +27,6 @@ steps:
2727
2828
# All platforms.
2929
- script: |
30-
rustup toolchain install nightly
31-
rustup update
3230
rustup toolchain list
3331
rustc -Vv
3432
cargo -V

rust-toolchain

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1 +1 @@
1-
nightly-2019-07-17
1+
nightly-2019-08-10

tokio-codec/src/framed.rs

Lines changed: 1 addition & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -234,10 +234,7 @@ impl<T: AsyncRead + Unpin, U: Unpin> AsyncRead for Fuse<T, U> {
234234
}
235235

236236
impl<T: AsyncBufRead + Unpin, U: Unpin> AsyncBufRead for Fuse<T, U> {
237-
fn poll_fill_buf<'a>(
238-
self: Pin<&'a mut Self>,
239-
cx: &mut Context<'_>,
240-
) -> Poll<io::Result<&'a [u8]>> {
237+
fn poll_fill_buf(self: Pin<&mut Self>, cx: &mut Context<'_>) -> Poll<io::Result<&[u8]>> {
241238
pin!(self.get_mut().0).poll_fill_buf(cx)
242239
}
243240

tokio-codec/src/framed_write.rs

Lines changed: 1 addition & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -280,10 +280,7 @@ impl<T: AsyncRead + Unpin> AsyncRead for FramedWrite2<T> {
280280
}
281281

282282
impl<T: AsyncBufRead + Unpin> AsyncBufRead for FramedWrite2<T> {
283-
fn poll_fill_buf<'a>(
284-
self: Pin<&'a mut Self>,
285-
cx: &mut Context<'_>,
286-
) -> Poll<io::Result<&'a [u8]>> {
283+
fn poll_fill_buf(self: Pin<&mut Self>, cx: &mut Context<'_>) -> Poll<io::Result<&[u8]>> {
287284
pin!(self.get_mut().inner).poll_fill_buf(cx)
288285
}
289286

tokio-codec/tests/framed_read.rs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -284,7 +284,7 @@ impl AsyncRead for Mock {
284284
// TODO this newtype is necessary because `&[u8]` does not currently implement `AsyncRead`
285285
struct Slice<'a>(&'a [u8]);
286286

287-
impl<'a> AsyncRead for Slice<'a> {
287+
impl AsyncRead for Slice<'_> {
288288
fn poll_read(
289289
mut self: Pin<&mut Self>,
290290
cx: &mut Context<'_>,

tokio-current-thread/src/lib.rs

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -429,7 +429,7 @@ impl<P: Park + Default> Default for CurrentThread<P> {
429429

430430
// ===== impl Entered =====
431431

432-
impl<'a, P: Park> Entered<'a, P> {
432+
impl<P: Park> Entered<'_, P> {
433433
/// Spawn the future on the executor.
434434
///
435435
/// This internally queues the future to be executed once `run` is called.
@@ -593,7 +593,7 @@ impl<'a, P: Park> Entered<'a, P> {
593593
}
594594
}
595595

596-
impl<'a, P: Park> fmt::Debug for Entered<'a, P> {
596+
impl<P: Park> fmt::Debug for Entered<'_, P> {
597597
fn fmt(&self, fmt: &mut fmt::Formatter<'_>) -> fmt::Result {
598598
fmt.debug_struct("Entered")
599599
.field("executor", &self.executor)
@@ -738,7 +738,7 @@ where
738738

739739
// ===== impl Borrow =====
740740

741-
impl<'a, U: Unpark> Borrow<'a, U> {
741+
impl<U: Unpark> Borrow<'_, U> {
742742
fn enter<F, R>(&mut self, f: F) -> R
743743
where
744744
F: FnOnce() -> R,
@@ -750,7 +750,7 @@ impl<'a, U: Unpark> Borrow<'a, U> {
750750
}
751751
}
752752

753-
impl<'a, U: Unpark> SpawnLocal for Borrow<'a, U> {
753+
impl<U: Unpark> SpawnLocal for Borrow<'_, U> {
754754
fn spawn_local(&mut self, future: Pin<Box<dyn Future<Output = ()>>>, already_counted: bool) {
755755
if !already_counted {
756756
// NOTE: we have a borrow of the Runtime, so we know that it isn't shut down.
@@ -770,7 +770,7 @@ impl CurrentRunner {
770770
{
771771
struct Reset<'a>(&'a CurrentRunner);
772772

773-
impl<'a> Drop for Reset<'a> {
773+
impl Drop for Reset<'_> {
774774
fn drop(&mut self) {
775775
self.0.spawn.set(None);
776776
self.0.id.set(None);

tokio-current-thread/src/scheduler.rs

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -253,7 +253,7 @@ where
253253
node: Option<Arc<Node<U>>>,
254254
}
255255

256-
impl<'a, U: Unpark> Drop for Bomb<'a, U> {
256+
impl<U: Unpark> Drop for Bomb<'_, U> {
257257
fn drop(&mut self) {
258258
if let Some(node) = self.node.take() {
259259
self.borrow.enter(|| release_node(node))
@@ -329,7 +329,7 @@ where
329329
}
330330
}
331331

332-
impl<'a, U: Unpark> Scheduled<'a, U> {
332+
impl<U: Unpark> Scheduled<'_, U> {
333333
/// Polls the task, returns `true` if the task has completed.
334334
pub fn tick(&mut self) -> bool {
335335
let waker = unsafe {

tokio-current-thread/tests/current_thread.rs

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -380,7 +380,6 @@ mod and_turn {
380380
},
381381
);
382382
}
383-
384383
}
385384

386385
mod in_drop {
@@ -441,7 +440,6 @@ mod in_drop {
441440
},
442441
);
443442
}
444-
445443
}
446444

447445
/*

0 commit comments

Comments
 (0)