shorter names

6 files changed, 14 insertions, 22 deletions

diff --git a/teleterm/src/cmd/play.rs b/teleterm/src/cmd/play.rs
index 3d36d18..93a2ca6 100644
--- a/teleterm/src/cmd/play.rs
+++ b/teleterm/src/cmd/play.rs
@@ -24,8 +24,7 @@ impl crate::config::Config for Config {
 
     fn run(
         &self,
-    ) -> Box<dyn futures::future::Future<Item = (), Error = Error> + Send>
-    {
+    ) -> Box<dyn futures::Future<Item = (), Error = Error> + Send> {
         Box::new(PlaySession::new(
             &self.ttyrec.filename,
             self.play.play_at_start,
@@ -936,7 +935,7 @@ impl PlaySession {
 }
 
 #[must_use = "futures do nothing unless polled"]
-impl futures::future::Future for PlaySession {
+impl futures::Future for PlaySession {
     type Item = ();
     type Error = Error;
 
diff --git a/teleterm/src/cmd/record.rs b/teleterm/src/cmd/record.rs
index 7cfe52a..735c372 100644
--- a/teleterm/src/cmd/record.rs
+++ b/teleterm/src/cmd/record.rs
@@ -22,8 +22,7 @@ impl crate::config::Config for Config {
 
     fn run(
         &self,
-    ) -> Box<dyn futures::future::Future<Item = (), Error = Error> + Send>
-    {
+    ) -> Box<dyn futures::Future<Item = (), Error = Error> + Send> {
         Box::new(RecordSession::new(
             &self.ttyrec.filename,
             &self.command.command,
@@ -249,7 +248,7 @@ impl RecordSession {
 }
 
 #[must_use = "futures do nothing unless polled"]
-impl futures::future::Future for RecordSession {
+impl futures::Future for RecordSession {
     type Item = ();
     type Error = Error;
 
diff --git a/teleterm/src/cmd/server.rs b/teleterm/src/cmd/server.rs
index c4d2075..7eff187 100644
--- a/teleterm/src/cmd/server.rs
+++ b/teleterm/src/cmd/server.rs
@@ -27,8 +27,7 @@ impl crate::config::Config for Config {
 
     fn run(
         &self,
-    ) -> Box<dyn futures::future::Future<Item = (), Error = Error> + Send>
-    {
+    ) -> Box<dyn futures::Future<Item = (), Error = Error> + Send> {
         if let Some(tls_identity_file) = &self.server.tls_identity_file {
             create_server_tls(
                 self.server.listen_address,
@@ -81,7 +80,7 @@ fn create_server(
     >,
     uid: Option<users::uid_t>,
     gid: Option<users::gid_t>,
-) -> Box<dyn futures::future::Future<Item = (), Error = Error> + Send> {
+) -> Box<dyn futures::Future<Item = (), Error = Error> + Send> {
     let listener = match listen(address, uid, gid) {
         Ok(listener) => listener,
         Err(e) => return Box::new(futures::future::err(e)),
@@ -111,7 +110,7 @@ fn create_server_tls(
     >,
     uid: Option<users::uid_t>,
     gid: Option<users::gid_t>,
-) -> Box<dyn futures::future::Future<Item = (), Error = Error> + Send> {
+) -> Box<dyn futures::Future<Item = (), Error = Error> + Send> {
     let tls_acceptor = match accept_tls(tls_identity_file) {
         Ok(acceptor) => acceptor,
         Err(e) => return Box::new(futures::future::err(e)),
diff --git a/teleterm/src/cmd/stream.rs b/teleterm/src/cmd/stream.rs
index 11d3873..0ca8dac 100644
--- a/teleterm/src/cmd/stream.rs
+++ b/teleterm/src/cmd/stream.rs
@@ -22,8 +22,7 @@ impl crate::config::Config for Config {
 
     fn run(
         &self,
-    ) -> Box<dyn futures::future::Future<Item = (), Error = Error> + Send>
-    {
+    ) -> Box<dyn futures::Future<Item = (), Error = Error> + Send> {
         let auth = match self.client.auth {
             crate::protocol::AuthType::Plain => {
                 let username = self
@@ -334,7 +333,7 @@ impl<S: tokio::io::AsyncRead + tokio::io::AsyncWrite + Send + 'static>
 
 #[must_use = "futures do nothing unless polled"]
 impl<S: tokio::io::AsyncRead + tokio::io::AsyncWrite + Send + 'static>
-    futures::future::Future for StreamSession<S>
+    futures::Future for StreamSession<S>
 {
     type Item = ();
     type Error = Error;
diff --git a/teleterm/src/cmd/watch.rs b/teleterm/src/cmd/watch.rs
index d5e4a9f..fa5fdd1 100644
--- a/teleterm/src/cmd/watch.rs
+++ b/teleterm/src/cmd/watch.rs
@@ -20,8 +20,7 @@ impl crate::config::Config for Config {
 
     fn run(
         &self,
-    ) -> Box<dyn futures::future::Future<Item = (), Error = Error> + Send>
-    {
+    ) -> Box<dyn futures::Future<Item = (), Error = Error> + Send> {
         let auth = match self.client.auth {
             crate::protocol::AuthType::Plain => {
                 let username = self
@@ -194,10 +193,8 @@ struct WatchSession<
     key_reader: crate::key_reader::KeyReader,
     list_client: crate::client::Client<S>,
     resizer: Box<
-        dyn futures::stream::Stream<
-                Item = (u16, u16),
-                Error = crate::error::Error,
-            > + Send,
+        dyn futures::Stream<Item = (u16, u16), Error = crate::error::Error>
+            + Send,
     >,
     state: State<S>,
     raw_screen: Option<crossterm::screen::RawScreen>,
@@ -644,7 +641,7 @@ impl<S: tokio::io::AsyncRead + tokio::io::AsyncWrite + Send + 'static>
 
 #[must_use = "futures do nothing unless polled"]
 impl<S: tokio::io::AsyncRead + tokio::io::AsyncWrite + Send + 'static>
-    futures::future::Future for WatchSession<S>
+    futures::Future for WatchSession<S>
 {
     type Item = ();
     type Error = Error;
diff --git a/teleterm/src/cmd/web.rs b/teleterm/src/cmd/web.rs
index a37468b..c39582b 100644
--- a/teleterm/src/cmd/web.rs
+++ b/teleterm/src/cmd/web.rs
@@ -16,8 +16,7 @@ impl crate::config::Config for Config {
 
     fn run(
         &self,
-    ) -> Box<dyn futures::future::Future<Item = (), Error = Error> + Send>
-    {
+    ) -> Box<dyn futures::Future<Item = (), Error = Error> + Send> {
         Box::new(
             gotham::init_server(
                 self.web.listen_address,