@@ -62,7 +62,6 @@ use std::error::Error as StdError;
62
62
use std:: fmt;
63
63
use std:: io as std_io;
64
64
use std:: io:: prelude:: * ;
65
- use std:: marker:: Sync as StdSync ;
66
65
use std:: mem;
67
66
use std:: result;
68
67
use std:: sync:: Arc ;
@@ -150,17 +149,17 @@ pub struct ConnectParams {
150
149
/// A trait implemented by types that can be converted into a `ConnectParams`.
151
150
pub trait IntoConnectParams {
152
151
/// Converts the value of `self` into a `ConnectParams`.
153
- fn into_connect_params ( self ) -> result:: Result < ConnectParams , Box < StdError + StdSync + Send > > ;
152
+ fn into_connect_params ( self ) -> result:: Result < ConnectParams , Box < StdError + Sync + Send > > ;
154
153
}
155
154
156
155
impl IntoConnectParams for ConnectParams {
157
- fn into_connect_params ( self ) -> result:: Result < ConnectParams , Box < StdError + StdSync + Send > > {
156
+ fn into_connect_params ( self ) -> result:: Result < ConnectParams , Box < StdError + Sync + Send > > {
158
157
Ok ( self )
159
158
}
160
159
}
161
160
162
161
impl < ' a > IntoConnectParams for & ' a str {
163
- fn into_connect_params ( self ) -> result:: Result < ConnectParams , Box < StdError + StdSync + Send > > {
162
+ fn into_connect_params ( self ) -> result:: Result < ConnectParams , Box < StdError + Sync + Send > > {
164
163
match Url :: parse ( self ) {
165
164
Ok ( url) => url. into_connect_params ( ) ,
166
165
Err ( err) => Err ( err. into ( ) ) ,
@@ -169,14 +168,14 @@ impl<'a> IntoConnectParams for &'a str {
169
168
}
170
169
171
170
impl IntoConnectParams for Url {
172
- fn into_connect_params ( self ) -> result:: Result < ConnectParams , Box < StdError + StdSync + Send > > {
171
+ fn into_connect_params ( self ) -> result:: Result < ConnectParams , Box < StdError + Sync + Send > > {
173
172
#[ cfg( any( feature = "unix_socket" , all( unix, feature = "nightly" ) ) ) ]
174
173
fn make_unix ( maybe_path : String )
175
- -> result:: Result < ConnectTarget , Box < StdError + StdSync + Send > > {
174
+ -> result:: Result < ConnectTarget , Box < StdError + Sync + Send > > {
176
175
Ok ( ConnectTarget :: Unix ( PathBuf :: from ( maybe_path) ) )
177
176
}
178
177
#[ cfg( not( any( feature = "unix_socket" , all( unix, feature = "nightly" ) ) ) ) ]
179
- fn make_unix ( _: String ) -> result:: Result < ConnectTarget , Box < StdError + StdSync + Send > > {
178
+ fn make_unix ( _: String ) -> result:: Result < ConnectTarget , Box < StdError + Sync + Send > > {
180
179
Err ( "unix socket support requires the `unix_socket` or `nightly` features" . into ( ) )
181
180
}
182
181
@@ -401,7 +400,7 @@ impl InnerConnection {
401
400
let user = match user {
402
401
Some ( user) => user,
403
402
None => {
404
- let err: Box < StdError + StdSync + Send > = "User missing from connection parameters"
403
+ let err: Box < StdError + Sync + Send > = "User missing from connection parameters"
405
404
. into ( ) ;
406
405
return Err ( ConnectError :: ConnectParams ( err) ) ;
407
406
}
0 commit comments