OMGeeky/tarpc
1
0
Fork 0
mirror of https://github.com/OMGeeky/tarpc.git synced 2026-01-07 03:56:48 +01:00
Code Issues Packages Projects Releases Wiki Activity

Use try! where applicable

Browse Source
This commit is contained in:
Tim Kuehn
2016-01-25 22:50:23 -08:00
parent 61e304ddfb
commit 57c058dfbc
1 changed files with 2 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
tarpc/src/protocol.rs
View File

@@ -444,9 +444,7 @@ impl<Request, Reply> Client<Request, Reply>
let mut state = self.synced_state.lock().unwrap();
let id = increment(&mut state.next_id);
{ // block required to drop lock asap
if let Err(e) = self.requests.lock().unwrap().insert_tx(id, tx) {
return Err(e);
}
try!(self.requests.lock().unwrap().insert_tx(id, tx));
}
let packet = Packet {
rpc_id: id,
@@ -461,9 +459,7 @@ impl<Request, Reply> Client<Request, Reply>
warn!("Client: failed to write packet.\nPacket: {:?}\nError: {:?}",
packet,
err);
if let Err(e) = self.requests.lock().unwrap().remove_tx(id) {
return Err(e);
}
try!(self.requests.lock().unwrap().remove_tx(id));
}
drop(state);
match rx.recv() {