diff options
| author | Jesse Luehrs <doy@tozt.net> | 2019-11-16 10:48:23 -0500 |
|---|---|---|
| committer | Jesse Luehrs <doy@tozt.net> | 2019-11-16 10:48:23 -0500 |
| commit | c3aed08259c794290d8cf21fe0712b36d4c5f523 (patch) | |
| tree | 3a064d859bdc258c99f554c952643eeb2f043ce4 /teleterm/src/server.rs | |
| parent | b8d8dbf0ff086825ce226b02603035601fbf955f (diff) | |
| download | teleterm-c3aed08259c794290d8cf21fe0712b36d4c5f523.tar.gz teleterm-c3aed08259c794290d8cf21fe0712b36d4c5f523.zip | |
shorter names
Diffstat (limited to 'teleterm/src/server.rs')
| -rw-r--r-- | teleterm/src/server.rs | 25 |
1 files changed, 11 insertions, 14 deletions
diff --git a/teleterm/src/server.rs b/teleterm/src/server.rs index d18fa95..4c44a01 100644 --- a/teleterm/src/server.rs +++ b/teleterm/src/server.rs @@ -9,7 +9,7 @@ enum ReadSocket< Connected(crate::protocol::FramedReadHalf<S>), Reading( Box< - dyn futures::future::Future< + dyn futures::Future< Item = ( crate::protocol::Message, crate::protocol::FramedReadHalf<S>, @@ -21,7 +21,7 @@ enum ReadSocket< Processing( crate::protocol::FramedReadHalf<S>, Box< - dyn futures::future::Future< + dyn futures::Future< Item = (ConnectionState, crate::protocol::Message), Error = Error, > + Send, @@ -35,7 +35,7 @@ enum WriteSocket< Connected(crate::protocol::FramedWriteHalf<S>), Writing( Box< - dyn futures::future::Future< + dyn futures::Future< Item = crate::protocol::FramedWriteHalf<S>, Error = Error, > + Send, @@ -302,8 +302,7 @@ pub struct Server< S: tokio::io::AsyncRead + tokio::io::AsyncWrite + Send + 'static, > { read_timeout: std::time::Duration, - acceptor: - Box<dyn futures::stream::Stream<Item = S, Error = Error> + Send>, + acceptor: Box<dyn futures::Stream<Item = S, Error = Error> + Send>, connections: std::collections::HashMap<String, Connection<S>>, rate_limiter: ratelimit_meter::KeyedRateLimiter<Option<String>>, allowed_auth_types: std::collections::HashSet<crate::protocol::AuthType>, @@ -317,9 +316,7 @@ impl<S: tokio::io::AsyncRead + tokio::io::AsyncWrite + Send + 'static> Server<S> { pub fn new( - acceptor: Box< - dyn futures::stream::Stream<Item = S, Error = Error> + Send, - >, + acceptor: Box<dyn futures::Stream<Item = S, Error = Error> + Send>, read_timeout: std::time::Duration, allowed_auth_types: std::collections::HashSet< crate::protocol::AuthType, @@ -351,7 +348,7 @@ impl<S: tokio::io::AsyncRead + tokio::io::AsyncWrite + Send + 'static> ) -> Result< Option< Box< - dyn futures::future::Future< + dyn futures::Future< Item = (ConnectionState, crate::protocol::Message), Error = Error, > + Send, @@ -597,7 +594,7 @@ impl<S: tokio::io::AsyncRead + tokio::io::AsyncWrite + Send + 'static> ) -> Result< Option< Box< - dyn futures::future::Future< + dyn futures::Future< Item = (ConnectionState, crate::protocol::Message), Error = Error, > + Send, @@ -634,7 +631,7 @@ impl<S: tokio::io::AsyncRead + tokio::io::AsyncWrite + Send + 'static> ) -> Result< Option< Box< - dyn futures::future::Future< + dyn futures::Future< Item = (ConnectionState, crate::protocol::Message), Error = Error, > + Send, @@ -659,7 +656,7 @@ impl<S: tokio::io::AsyncRead + tokio::io::AsyncWrite + Send + 'static> ) -> Result< Option< Box< - dyn futures::future::Future< + dyn futures::Future< Item = (ConnectionState, crate::protocol::Message), Error = Error, > + Send, @@ -756,7 +753,7 @@ impl<S: tokio::io::AsyncRead + tokio::io::AsyncWrite + Send + 'static> ) -> Result< Option< Box< - dyn futures::future::Future< + dyn futures::Future< Item = (ConnectionState, crate::protocol::Message), Error = Error, > + Send, @@ -1062,7 +1059,7 @@ fn classify_connection_error(e: Error) -> component_future::Poll<(), Error> { #[must_use = "futures do nothing unless polled"] impl<S: tokio::io::AsyncRead + tokio::io::AsyncWrite + Send + 'static> - futures::future::Future for Server<S> + futures::Future for Server<S> { type Item = (); type Error = Error; |