From c5c7c3275c062f84b7f606f0207a6af6e1933e14 Mon Sep 17 00:00:00 2001 From: Taiki Endo Date: Thu, 27 Jun 2019 01:36:50 +0900 Subject: [PATCH 1/3] Revert "Ignore doc tests which "Broken MIR" ICE occurred" This reverts commit 2d12746b684617aaca7fcc379d9643d60a21a533. --- futures-util/src/stream/mod.rs | 9 +++------ futures-util/src/try_stream/mod.rs | 6 ++---- 2 files changed, 5 insertions(+), 10 deletions(-) diff --git a/futures-util/src/stream/mod.rs b/futures-util/src/stream/mod.rs index f7ee3129bd..05b42dde0b 100644 --- a/futures-util/src/stream/mod.rs +++ b/futures-util/src/stream/mod.rs @@ -410,8 +410,7 @@ pub trait StreamExt: Stream { /// /// # Examples /// - // TODO: https://github.com/rust-lang-nursery/futures-rs/issues/1657 - /// ```ignore + /// ``` /// #![feature(async_await)] /// # futures::executor::block_on(async { /// use futures::channel::mpsc; @@ -448,8 +447,7 @@ pub trait StreamExt: Stream { /// /// # Examples /// - // TODO: https://github.com/rust-lang-nursery/futures-rs/issues/1657 - /// ```ignore + /// ``` /// #![feature(async_await)] /// # futures::executor::block_on(async { /// use futures::channel::mpsc; @@ -512,8 +510,7 @@ pub trait StreamExt: Stream { /// /// # Examples /// - // TODO: https://github.com/rust-lang-nursery/futures-rs/issues/1657 - /// ```ignore + /// ``` /// #![feature(async_await)] /// # futures::executor::block_on(async { /// use futures::channel::mpsc; diff --git a/futures-util/src/try_stream/mod.rs b/futures-util/src/try_stream/mod.rs index 1c0757bc2e..5783af7d20 100644 --- a/futures-util/src/try_stream/mod.rs +++ b/futures-util/src/try_stream/mod.rs @@ -449,8 +449,7 @@ pub trait TryStreamExt: TryStream { /// /// # Examples /// - // TODO: https://github.com/rust-lang-nursery/futures-rs/issues/1657 - /// ```ignore + /// ``` /// #![feature(async_await)] /// # futures::executor::block_on(async { /// use futures::channel::mpsc; @@ -608,8 +607,7 @@ pub trait TryStreamExt: TryStream { /// /// # Examples /// - // TODO: https://github.com/rust-lang-nursery/futures-rs/issues/1657 - /// ```ignore + /// ``` /// #![feature(async_await)] /// # futures::executor::block_on(async { /// use futures::channel::mpsc; From 2b05b0a2631d188f80bca459014b3436977aa572 Mon Sep 17 00:00:00 2001 From: Taiki Endo Date: Thu, 27 Jun 2019 02:55:04 +0900 Subject: [PATCH 2/3] Fix warnings in examples --- futures-util/src/stream/mod.rs | 2 +- futures-util/src/try_stream/mod.rs | 6 +++--- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/futures-util/src/stream/mod.rs b/futures-util/src/stream/mod.rs index 05b42dde0b..e8f01e7b00 100644 --- a/futures-util/src/stream/mod.rs +++ b/futures-util/src/stream/mod.rs @@ -420,7 +420,7 @@ pub trait StreamExt: Stream { /// let (tx, rx) = mpsc::unbounded(); /// /// thread::spawn(move || { - /// for i in (1..=5) { + /// for i in 1..=5 { /// tx.unbounded_send(i).unwrap(); /// } /// }); diff --git a/futures-util/src/try_stream/mod.rs b/futures-util/src/try_stream/mod.rs index 5783af7d20..9a9f50113a 100644 --- a/futures-util/src/try_stream/mod.rs +++ b/futures-util/src/try_stream/mod.rs @@ -456,10 +456,10 @@ pub trait TryStreamExt: TryStream { /// use futures::stream::TryStreamExt; /// use std::thread; /// - /// let (mut tx, rx) = mpsc::unbounded(); + /// let (tx, rx) = mpsc::unbounded(); /// /// thread::spawn(move || { - /// for i in (1..=5) { + /// for i in 1..=5 { /// tx.unbounded_send(Ok(i)).unwrap(); /// } /// tx.unbounded_send(Err(6)).unwrap(); @@ -614,7 +614,7 @@ pub trait TryStreamExt: TryStream { /// use futures::stream::TryStreamExt; /// use std::thread; /// - /// let (mut tx, rx) = mpsc::unbounded::, ()>>(); + /// let (tx, rx) = mpsc::unbounded::, ()>>(); /// /// thread::spawn(move || { /// for i in (0..3).rev() { From de14729297772fadadf091139936ebb38fd8c69f Mon Sep 17 00:00:00 2001 From: Taiki Endo Date: Sat, 29 Jun 2019 21:34:54 +0900 Subject: [PATCH 3/3] Workaround for broken initialization script of travis --- .travis.yml | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/.travis.yml b/.travis.yml index caf523662e..2b3ae0be39 100644 --- a/.travis.yml +++ b/.travis.yml @@ -28,10 +28,16 @@ matrix: - name: cargo test rust: nightly os: osx + before_script: + # TODO: https://github.com/rust-lang-nursery/futures-rs/pull/1685#issuecomment-506927847 + - rustup update - name: cargo test rust: nightly os: linux + before_script: + # TODO: https://github.com/rust-lang-nursery/futures-rs/pull/1685#issuecomment-506927847 + - rustup update - name: cargo build (with minimal versions) rust: nightly