File tree Expand file tree Collapse file tree 3 files changed +5
-4
lines changed Expand file tree Collapse file tree 3 files changed +5
-4
lines changed Original file line number Diff line number Diff line change @@ -111,7 +111,7 @@ impl ClientType {
111
111
}
112
112
113
113
impl Client {
114
- /// Default constructor supporting multiple backend by providing a prefix
114
+ /// Default constructor supporting multiple backends by providing a prefix
115
115
///
116
116
/// Supported prefixes are:
117
117
/// - tcp:// for a TCP plaintext client.
Original file line number Diff line number Diff line change @@ -404,6 +404,7 @@ impl<S: Read + Write> RawClient<S> {
404
404
s. send ( ChannelMessage :: Error ( error. clone ( ) ) )
405
405
. expect ( "Unable to send ChannelMessage::Error" ) ;
406
406
}
407
+ return Err ( Error :: SharedIOError ( error. clone ( ) ) ) ;
407
408
}
408
409
trace ! ( "<== {}" , raw_resp) ;
409
410
@@ -535,7 +536,7 @@ impl<S: Read + Write> RawClient<S> {
535
536
Ok ( ChannelMessage :: Error ( e) ) => {
536
537
warn ! ( "Received ChannelMessage::Error" ) ;
537
538
538
- break Err ( Error :: ChannelError ( e) ) ;
539
+ break Err ( Error :: SharedIOError ( e) ) ;
539
540
}
540
541
e @ Err ( _) => e. map ( |_| ( ) ) . expect ( "Error receiving from channel" ) , // panic if there's something wrong with the channels
541
542
}
Original file line number Diff line number Diff line change @@ -291,8 +291,8 @@ pub enum Error {
291
291
SSLOverSocks5 ,
292
292
/// Made one or multiple attempts, always in Error
293
293
AllAttemptsErrored ( Vec < Error > ) ,
294
- /// There was an error transmitted from the reader thread to others
295
- ChannelError ( Arc < std:: io:: Error > ) ,
294
+ /// There was an io error reading the socket, to be shared between threads
295
+ SharedIOError ( Arc < std:: io:: Error > ) ,
296
296
/// Setting both a proxy and a timeout in `Config` results in this error
297
297
BothSocksAndTimeout ,
298
298
/// Setting both a timeout and passing zero or more than one socket addrs is an error
You can’t perform that action at this time.
0 commit comments