From c87eba973da4b756ee8011c0b997ae9b95372933 Mon Sep 17 00:00:00 2001
From: Jesse Luehrs <doy@tozt.net>
Date: Sat, 6 Jul 2019 12:32:12 -0400
Subject: there's no reason to import these by name

---
 src/builtins.rs |  6 +++---
 src/eval.rs     |  6 +++---
 src/parser.rs   |  4 ++--
 src/process.rs  | 12 ++++++------
 src/readline.rs | 10 +++++-----
 src/repl.rs     | 10 +++++-----
 6 files changed, 24 insertions(+), 24 deletions(-)

diff --git a/src/builtins.rs b/src/builtins.rs
index 563cfe4..d130907 100644
--- a/src/builtins.rs
+++ b/src/builtins.rs
@@ -1,6 +1,6 @@
-use snafu::{ensure, OptionExt, ResultExt, Snafu};
+use snafu::{OptionExt as _, ResultExt as _};
 
-#[derive(Debug, Snafu)]
+#[derive(Debug, snafu::Snafu)]
 pub enum Error {
     #[snafu(display("unknown builtin {}", cmd))]
     UnknownBuiltin { cmd: String },
@@ -85,7 +85,7 @@ impl futures::stream::Stream for Builtin {
 }
 
 fn cd(args: &[String]) -> Result<()> {
-    ensure!(
+    snafu::ensure!(
         args.len() <= 1,
         TooManyParams {
             cmd: "cd",
diff --git a/src/eval.rs b/src/eval.rs
index 8ce0062..ae58fc8 100644
--- a/src/eval.rs
+++ b/src/eval.rs
@@ -1,7 +1,7 @@
-use futures::stream::Stream;
-use snafu::{ResultExt, Snafu};
+use futures::stream::Stream as _;
+use snafu::ResultExt as _;
 
-#[derive(Debug, Snafu)]
+#[derive(Debug, snafu::Snafu)]
 pub enum Error {
     #[snafu(display("failed to parse command line '{}': {}", line, source))]
     Parser {
diff --git a/src/parser.rs b/src/parser.rs
index d8d1dd6..7a7ec98 100644
--- a/src/parser.rs
+++ b/src/parser.rs
@@ -1,6 +1,6 @@
-use snafu::{OptionExt, Snafu};
+use snafu::OptionExt as _;
 
-#[derive(Debug, Snafu)]
+#[derive(Debug, snafu::Snafu)]
 pub enum Error {
     #[snafu(display("No command given"))]
     CommandRequired,
diff --git a/src/process.rs b/src/process.rs
index b7e3ed9..090824a 100644
--- a/src/process.rs
+++ b/src/process.rs
@@ -1,10 +1,10 @@
-use futures::future::Future;
-use snafu::{ResultExt, Snafu};
-use std::io::{Read, Write};
-use tokio::io::AsyncRead;
-use tokio_pty_process::CommandExt;
+use futures::future::Future as _;
+use snafu::ResultExt as _;
+use std::io::{Read as _, Write as _};
+use tokio::io::AsyncRead as _;
+use tokio_pty_process::CommandExt as _;
 
-#[derive(Debug, Snafu)]
+#[derive(Debug, snafu::Snafu)]
 pub enum Error {
     #[snafu(display("failed to open a pty: {}", source))]
     OpenPty { source: std::io::Error },
diff --git a/src/readline.rs b/src/readline.rs
index 2077da2..6d1a69a 100644
--- a/src/readline.rs
+++ b/src/readline.rs
@@ -1,7 +1,7 @@
-use snafu::{ensure, ResultExt, Snafu};
-use std::io::Write;
+use snafu::ResultExt as _;
+use std::io::Write as _;
 
-#[derive(Debug, Snafu)]
+#[derive(Debug, snafu::Snafu)]
 pub enum Error {
     #[snafu(display("failed to write to the terminal: {}", source))]
     WriteToTerminal { source: std::io::Error },
@@ -126,7 +126,7 @@ impl ReadlineState {
                 'd' => {
                     if self.buffer.is_empty() {
                         self.echo_char('\n').context(WriteToTerminal)?;
-                        ensure!(false, EOF);
+                        snafu::ensure!(false, EOF);
                     }
                 }
                 'e' => {
@@ -256,7 +256,7 @@ impl futures::future::Future for Readline {
                     }
                     Err(std::sync::mpsc::TryRecvError::Disconnected) => {
                         // is EOF correct here?
-                        ensure!(false, EOF)
+                        snafu::ensure!(false, EOF)
                     }
                 }
             }
diff --git a/src/repl.rs b/src/repl.rs
index 8661022..30d852e 100644
--- a/src/repl.rs
+++ b/src/repl.rs
@@ -1,9 +1,9 @@
-use futures::future::{Future, IntoFuture};
-use futures::stream::Stream;
-use snafu::{ResultExt, Snafu};
-use std::io::Write;
+use futures::future::{Future as _, IntoFuture as _};
+use futures::stream::Stream as _;
+use snafu::ResultExt as _;
+use std::io::Write as _;
 
-#[derive(Debug, Snafu)]
+#[derive(Debug, snafu::Snafu)]
 pub enum Error {
     #[snafu(display("error during read: {}", source))]
     Read { source: crate::readline::Error },
-- 
cgit v1.2.3-54-g00ecf