move common traits into a prelude

17 files changed, 24 insertions, 50 deletions

diff --git a/src/client.rs b/src/client.rs
index df8bedb..9ef1ae2 100644
--- a/src/client.rs
+++ b/src/client.rs
@@ -1,9 +1,5 @@
-use futures::future::Future as _;
-use futures::stream::Stream as _;
+use crate::prelude::*;
 use rand::Rng as _;
-use snafu::futures01::stream::StreamExt as _;
-use snafu::futures01::FutureExt as _;
-use snafu::ResultExt as _;
 
 #[derive(Debug, snafu::Snafu)]
 pub enum Error {
diff --git a/src/cmd.rs b/src/cmd.rs
index cc114d4..93f1ed8 100644
--- a/src/cmd.rs
+++ b/src/cmd.rs
@@ -1,11 +1,11 @@
+use crate::prelude::*;
+
 mod play;
 mod record;
 mod server;
 mod stream;
 mod watch;
 
-use snafu::ResultExt as _;
-
 #[derive(Debug, snafu::Snafu)]
 pub enum Error {
     #[snafu(display("failed to determine program name: {}", source))]
diff --git a/src/cmd/play.rs b/src/cmd/play.rs
index 94826bd..1a337fa 100644
--- a/src/cmd/play.rs
+++ b/src/cmd/play.rs
@@ -1,6 +1,4 @@
-use futures::future::Future as _;
-use futures::stream::Stream as _;
-use snafu::ResultExt as _;
+use crate::prelude::*;
 use std::io::Write as _;
 
 #[derive(Debug, snafu::Snafu)]
diff --git a/src/cmd/record.rs b/src/cmd/record.rs
index 69b8009..5f9e8c4 100644
--- a/src/cmd/record.rs
+++ b/src/cmd/record.rs
@@ -1,6 +1,4 @@
-use futures::future::Future as _;
-use futures::stream::Stream as _;
-use snafu::ResultExt as _;
+use crate::prelude::*;
 use tokio::io::AsyncWrite as _;
 
 #[derive(Debug, snafu::Snafu)]
diff --git a/src/cmd/server.rs b/src/cmd/server.rs
index aca32d9..a4ccc8f 100644
--- a/src/cmd/server.rs
+++ b/src/cmd/server.rs
@@ -1,8 +1,4 @@
-use futures::future::Future as _;
-use futures::stream::Stream as _;
-use snafu::futures01::stream::StreamExt as _;
-use snafu::futures01::FutureExt as _;
-use snafu::ResultExt as _;
+use crate::prelude::*;
 use std::io::Read as _;
 
 #[derive(Debug, snafu::Snafu)]
diff --git a/src/cmd/stream.rs b/src/cmd/stream.rs
index bc0d532..b14c063 100644
--- a/src/cmd/stream.rs
+++ b/src/cmd/stream.rs
@@ -1,7 +1,4 @@
-use futures::future::Future as _;
-use futures::stream::Stream as _;
-use snafu::futures01::FutureExt as _;
-use snafu::{OptionExt as _, ResultExt as _};
+use crate::prelude::*;
 use tokio::io::AsyncWrite as _;
 
 #[derive(Debug, snafu::Snafu)]
diff --git a/src/cmd/watch.rs b/src/cmd/watch.rs
index 3dde126..6b395e2 100644
--- a/src/cmd/watch.rs
+++ b/src/cmd/watch.rs
@@ -1,7 +1,4 @@
-use futures::future::Future as _;
-use futures::stream::Stream as _;
-use snafu::futures01::FutureExt as _;
-use snafu::{OptionExt as _, ResultExt as _};
+use crate::prelude::*;
 use std::io::Write as _;
 
 #[derive(Debug, snafu::Snafu)]
diff --git a/src/key_reader.rs b/src/key_reader.rs
index bb3b92f..8933667 100644
--- a/src/key_reader.rs
+++ b/src/key_reader.rs
@@ -1,5 +1,4 @@
-use futures::sink::Sink as _;
-use snafu::ResultExt as _;
+use crate::prelude::*;
 
 #[derive(Debug, snafu::Snafu)]
 pub enum Error {
diff --git a/src/main.rs b/src/main.rs
index 9d8cd11..a45aced 100644
--- a/src/main.rs
+++ b/src/main.rs
@@ -6,6 +6,8 @@
 #![allow(clippy::single_match_else)]
 #![allow(clippy::type_complexity)]
 
+mod prelude;
+
 mod async_stdin;
 mod client;
 mod cmd;
diff --git a/src/prelude.rs b/src/prelude.rs
new file mode 100644
index 0000000..762632d
--- /dev/null
+++ b/src/prelude.rs
@@ -0,0 +1,6 @@
+pub use futures::future::Future as _;
+pub use futures::sink::Sink as _;
+pub use futures::stream::Stream as _;
+pub use snafu::futures01::stream::StreamExt as _;
+pub use snafu::futures01::FutureExt as _;
+pub use snafu::{OptionExt as _, ResultExt as _};
diff --git a/src/process.rs b/src/process.rs
index 0315384..7f19df6 100644
--- a/src/process.rs
+++ b/src/process.rs
@@ -1,5 +1,4 @@
-use futures::future::Future as _;
-use snafu::ResultExt as _;
+use crate::prelude::*;
 use std::os::unix::io::AsRawFd as _;
 use tokio::io::{AsyncRead as _, AsyncWrite as _};
 use tokio_pty_process::CommandExt as _;
@@ -298,8 +297,6 @@ impl<R: tokio::io::AsyncRead + 'static> futures::stream::Stream
 #[cfg(test)]
 mod test {
     use super::*;
-    use futures::sink::Sink as _;
-    use futures::stream::Stream as _;
 
     #[test]
     fn test_simple() {
diff --git a/src/protocol.rs b/src/protocol.rs
index 1221fc5..fb1b91f 100644
--- a/src/protocol.rs
+++ b/src/protocol.rs
@@ -1,8 +1,4 @@
-use futures::future::Future as _;
-use futures::sink::Sink as _;
-use futures::stream::Stream as _;
-use snafu::futures01::FutureExt as _;
-use snafu::ResultExt as _;
+use crate::prelude::*;
 use std::convert::{TryFrom as _, TryInto as _};
 
 #[derive(Debug, snafu::Snafu)]
diff --git a/src/server.rs b/src/server.rs
index eeb4069..aac968a 100644
--- a/src/server.rs
+++ b/src/server.rs
@@ -1,8 +1,4 @@
-use futures::future::Future as _;
-use futures::stream::Stream as _;
-use snafu::futures01::stream::StreamExt as _;
-use snafu::futures01::FutureExt as _;
-use snafu::ResultExt as _;
+use crate::prelude::*;
 use tokio::util::FutureExt as _;
 
 pub mod tls;
diff --git a/src/server/tls.rs b/src/server/tls.rs
index 8a4d132..3ee2c8a 100644
--- a/src/server/tls.rs
+++ b/src/server/tls.rs
@@ -1,6 +1,4 @@
-use futures::future::Future as _;
-use futures::stream::Stream as _;
-use snafu::ResultExt as _;
+use crate::prelude::*;
 
 #[derive(Debug, snafu::Snafu)]
 pub enum Error {
diff --git a/src/term.rs b/src/term.rs
index f4a44d4..a804fff 100644
--- a/src/term.rs
+++ b/src/term.rs
@@ -1,4 +1,4 @@
-use snafu::ResultExt as _;
+use crate::prelude::*;
 
 #[derive(Debug, snafu::Snafu)]
 pub enum Error {
diff --git a/src/ttyrec.rs b/src/ttyrec.rs
index 70cef9d..f9cde91 100644
--- a/src/ttyrec.rs
+++ b/src/ttyrec.rs
@@ -1,6 +1,4 @@
-use futures::sink::Sink as _;
-use futures::stream::Stream as _;
-use snafu::ResultExt as _;
+use crate::prelude::*;
 use std::convert::TryFrom as _;
 use tokio::io::{AsyncRead as _, AsyncWrite as _};
 
diff --git a/src/util.rs b/src/util.rs
index 7b9b1c0..23534c5 100644
--- a/src/util.rs
+++ b/src/util.rs
@@ -1,4 +1,4 @@
-use snafu::{OptionExt as _, ResultExt as _};
+use crate::prelude::*;
 use std::net::ToSocketAddrs as _;
 
 #[derive(Debug, snafu::Snafu)]