Skip to content

Commit

Permalink
chore: upgrade toolchain
Browse files Browse the repository at this point in the history
  • Loading branch information
driftluo committed Apr 12, 2019
1 parent 1ce924d commit fced4d6
Show file tree
Hide file tree
Showing 5 changed files with 8 additions and 8 deletions.
2 changes: 1 addition & 1 deletion rust-toolchain
Original file line number Diff line number Diff line change
@@ -1 +1 @@
1.33.0
1.34.0
6 changes: 3 additions & 3 deletions secio/src/handshake/handshake_context.rs
Original file line number Diff line number Diff line change
Expand Up @@ -180,7 +180,7 @@ impl HandshakeContext<Local> {
.config
.agreements_proposal
.as_ref()
.map(|s| s.as_ref())
.map(AsRef::as_ref)
.unwrap_or(support::DEFAULT_AGREEMENTS_PROPOSITION);
let theirs = &propose.exchange;
match support::select_agreement(hashes_ordering, ours, theirs) {
Expand All @@ -197,7 +197,7 @@ impl HandshakeContext<Local> {
.config
.ciphers_proposal
.as_ref()
.map(|s| s.as_ref())
.map(AsRef::as_ref)
.unwrap_or(support::DEFAULT_CIPHERS_PROPOSITION);
let theirs = &propose.ciphers;
match support::select_cipher(hashes_ordering, ours, theirs) {
Expand All @@ -217,7 +217,7 @@ impl HandshakeContext<Local> {
.config
.digests_proposal
.as_ref()
.map(|s| s.as_ref())
.map(AsRef::as_ref)
.unwrap_or(support::DEFAULT_DIGESTS_PROPOSITION);
let theirs = &propose.hashes;
match support::select_digest(hashes_ordering, ours, theirs) {
Expand Down
2 changes: 1 addition & 1 deletion secio/src/handshake/procedure.rs
Original file line number Diff line number Diff line change
Expand Up @@ -389,7 +389,7 @@ mod tests {
.map_err(|_| ());

let client = TcpStream::connect(&listener_addr)
.map_err(|e| e.into())
.map_err(Into::into)
.and_then(move |stream| config_2.handshake(stream))
.and_then(move |(mut handle, _, _)| {
let _ = handle.write_all(data);
Expand Down
4 changes: 2 additions & 2 deletions src/service.rs
Original file line number Diff line number Diff line change
Expand Up @@ -194,7 +194,7 @@ where
let (listen_future, listen_addr) = self
.multi_transport
.listen(address.clone())
.map_err::<io::Error, _>(|e| e.into())?;
.map_err::<io::Error, _>(Into::into)?;
let sender = self.session_event_sender.clone();
let task = listen_future.then(move |result| match result {
Ok(value) => tokio::spawn(
Expand Down Expand Up @@ -249,7 +249,7 @@ where
let dial_future = self
.multi_transport
.dial(address.clone())
.map_err::<io::Error, _>(|e| e.into())?;
.map_err::<io::Error, _>(Into::into)?;

let sender = self.session_event_sender.clone();
let task = dial_future.then(|result| match result {
Expand Down
2 changes: 1 addition & 1 deletion src/service/control.rs
Original file line number Diff line number Diff line change
Expand Up @@ -35,7 +35,7 @@ impl ServiceControl {
fn send(&mut self, event: ServiceTask) -> Result<(), Error> {
self.service_task_sender
.unbounded_send(event)
.map_err(|e| e.into())
.map_err(Into::into)
}

/// Get service protocol message, Map(ID, Name), but can't modify
Expand Down

0 comments on commit fced4d6

Please sign in to comment.