Skip to content

Commit 7ca16ec

Browse files
committed
do catch now wraps in Ok automatically
See rust-lang/rust#49371
1 parent a09e931 commit 7ca16ec

File tree

2 files changed

+1
-2
lines changed

2 files changed

+1
-2
lines changed

benchmarks/vote/orchestrator.rs

+1-1
Original file line numberDiff line numberDiff line change
@@ -492,7 +492,7 @@ fn run_clients(
492492

493493
let cmd: Vec<_> = cmd.iter().map(|s| &**s).collect();
494494
let c = ssh.exec(&cmd[..])?;
495-
Ok(c)
495+
c
496496
};
497497

498498
match c {

benchmarks/vote/server.rs

-1
Original file line numberDiff line numberDiff line change
@@ -130,7 +130,6 @@ impl<'a> Server<'a> {
130130
let mut c = client.channel_direct_tcpip(self.listen_addr, backend.port(), None)?;
131131
c.send_eof()?;
132132
c.wait_eof()?;
133-
Ok(())
134133
};
135134

136135
if let Err(e) = e {

0 commit comments

Comments
 (0)