@@ -62,7 +62,6 @@ use std::error::Error as StdError;
6262use std:: fmt;
6363use std:: io as std_io;
6464use std:: io:: prelude:: * ;
65- use std:: marker:: Sync as StdSync ;
6665use std:: mem;
6766use std:: result;
6867use std:: sync:: Arc ;
@@ -150,17 +149,17 @@ pub struct ConnectParams {
150149/// A trait implemented by types that can be converted into a `ConnectParams`.
151150pub trait IntoConnectParams {
152151 /// 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 > > ;
154153}
155154
156155impl 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 > > {
158157 Ok ( self )
159158 }
160159}
161160
162161impl < ' 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 > > {
164163 match Url :: parse ( self ) {
165164 Ok ( url) => url. into_connect_params ( ) ,
166165 Err ( err) => Err ( err. into ( ) ) ,
@@ -169,14 +168,14 @@ impl<'a> IntoConnectParams for &'a str {
169168}
170169
171170impl 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 > > {
173172 #[ cfg( any( feature = "unix_socket" , all( unix, feature = "nightly" ) ) ) ]
174173 fn make_unix ( maybe_path : String )
175- -> result:: Result < ConnectTarget , Box < StdError + StdSync + Send > > {
174+ -> result:: Result < ConnectTarget , Box < StdError + Sync + Send > > {
176175 Ok ( ConnectTarget :: Unix ( PathBuf :: from ( maybe_path) ) )
177176 }
178177 #[ 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 > > {
180179 Err ( "unix socket support requires the `unix_socket` or `nightly` features" . into ( ) )
181180 }
182181
@@ -401,7 +400,7 @@ impl InnerConnection {
401400 let user = match user {
402401 Some ( user) => user,
403402 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"
405404 . into ( ) ;
406405 return Err ( ConnectError :: ConnectParams ( err) ) ;
407406 }
0 commit comments