Skip to content

Commit ad3d0e9

Browse files
committed
Drop Sync rename
1 parent e418a62 commit ad3d0e9

File tree

1 file changed

+7
-8
lines changed

1 file changed

+7
-8
lines changed

src/lib.rs

+7-8
Original file line numberDiff line numberDiff line change
@@ -62,7 +62,6 @@ use std::error::Error as StdError;
6262
use std::fmt;
6363
use std::io as std_io;
6464
use std::io::prelude::*;
65-
use std::marker::Sync as StdSync;
6665
use std::mem;
6766
use std::result;
6867
use std::sync::Arc;
@@ -150,17 +149,17 @@ pub struct ConnectParams {
150149
/// A trait implemented by types that can be converted into a `ConnectParams`.
151150
pub 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

156155
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>> {
158157
Ok(self)
159158
}
160159
}
161160

162161
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>> {
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

171170
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>> {
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

Comments
 (0)