From 5b55fd3db8ee93e15154db945e6e138bdd4d28c1 Mon Sep 17 00:00:00 2001
From: Alex Helfet <alex.helfet@gmail.com>
Date: Sun, 24 Dec 2017 20:00:29 +0000
Subject: [PATCH] Support cargo test with all toolchains.

---
 bin/build_local   | 22 +++++++---------------
 bin/travis/script |  6 ------
 src/lib.rs        |  8 +++-----
 3 files changed, 10 insertions(+), 26 deletions(-)

diff --git a/bin/build_local b/bin/build_local
index 441f3a9..3fd84a6 100755
--- a/bin/build_local
+++ b/bin/build_local
@@ -3,18 +3,10 @@ set -ex
 
 # A simple build script to run locally.
 
-rustup toolchain update stable;
-rustup toolchain update beta;
-rustup toolchain update nightly;
-
-cargo +stable  build --verbose;
-cargo +stable  build --verbose --no-default-features;
-cargo +beta    build --verbose;
-cargo +beta    build --verbose --no-default-features;
-
-cargo +nightly test --verbose;
-cargo +nightly test --verbose --no-default-features;
-
-cargo +stable  doc --verbose;
-cargo +beta    doc --verbose;
-cargo +nightly doc --verbose;
+for tc in stable beta nightly; do
+    echo "Toolchain: ${tc}";
+    rustup toolchain update ${tc};
+    cargo +${tc} test --verbose;
+    cargo +${tc} test --verbose --no-default-features;
+    cargo +${tc} doc --verbose;
+done
diff --git a/bin/travis/script b/bin/travis/script
index 5940598..f2d0c88 100755
--- a/bin/travis/script
+++ b/bin/travis/script
@@ -4,12 +4,6 @@ set -e
 echo "TRAVIS_RUST_VERSION: '${TRAVIS_RUST_VERSION}'"
 set -x
 
-cargo build --verbose;
-cargo build --verbose --no-default-features;
-
-if [[ "${TRAVIS_RUST_VERSION}" == "nightly" ]]; then
 cargo test --verbose;
 cargo test --verbose --no-default-features;
-fi
-
 cargo doc --verbose;
diff --git a/src/lib.rs b/src/lib.rs
index fc525fe..ed9a1ab 100644
--- a/src/lib.rs
+++ b/src/lib.rs
@@ -80,8 +80,6 @@
 //! instance.
 
 #![deny(warnings)]
-#![cfg_attr(test, feature(conservative_impl_trait))]
-
 #![cfg_attr(not(feature = "use_std"), no_std)]
 
 extern crate cobs;
@@ -508,10 +506,10 @@ mod rw_tests {
         }
     }
 
-    fn pair() -> (Sender<impl Write>, Receiver<impl Read>) {
+    fn pair() -> (Sender<Box<Write>>, Receiver<Box<Read>>) {
         let c = Channel::new();
-        let tx = Sender::new(c.writer());
-        let rx = Receiver::new(c.reader());
+        let tx = Sender::new(Box::new(c.writer()) as Box<Write>);
+        let rx = Receiver::new(Box::new(c.reader()) as Box<Read>);
         (tx, rx)
     }
 }