Mercurial > public > mercurial-scm > hg
diff rust/chg/src/main.rs @ 43818:ce088b38f92b
rust: run rustfmt
# skip-blame automated reformatting
Differential Revision: https://phab.mercurial-scm.org/D7578
author | Gregory Szorc <gregory.szorc@gmail.com> |
---|---|
date | Sat, 07 Dec 2019 13:06:25 -0800 |
parents | 87c76e5f3427 |
children | bb936e25a84a |
line wrap: on
line diff
--- a/rust/chg/src/main.rs Fri Dec 06 16:09:03 2019 -0500 +++ b/rust/chg/src/main.rs Sat Dec 07 13:06:25 2019 -0800 @@ -9,9 +9,9 @@ extern crate tokio; extern crate tokio_hglib; -use chg::{ChgClientExt, ChgUiHandler}; use chg::locator; use chg::procutil; +use chg::{ChgClientExt, ChgUiHandler}; use futures::sync::oneshot; use std::env; use std::io; @@ -42,13 +42,19 @@ // just make the output looks similar to chg of C let l = format!("{}", record.level()).to_lowercase(); let t = self.start.elapsed(); - writeln!(io::stderr(), "chg: {}: {}.{:06} {}", - l, t.as_secs(), t.subsec_micros(), record.args()).unwrap_or(()); + writeln!( + io::stderr(), + "chg: {}: {}.{:06} {}", + l, + t.as_secs(), + t.subsec_micros(), + record.args() + ) + .unwrap_or(()); } } - fn flush(&self) { - } + fn flush(&self) {} } fn main() { @@ -71,28 +77,24 @@ let handler = ChgUiHandler::new(); let (result_tx, result_rx) = oneshot::channel(); let fut = UnixClient::connect(sock_path) - .and_then(|client| { - client.set_current_dir(current_dir) - }) - .and_then(|client| { - client.attach_io(io::stdin(), io::stdout(), io::stderr()) - }) + .and_then(|client| client.set_current_dir(current_dir)) + .and_then(|client| client.attach_io(io::stdin(), io::stdout(), io::stderr())) .and_then(|client| { let pid = client.server_spec().process_id.unwrap(); let pgid = client.server_spec().process_group_id; procutil::setup_signal_handler_once(pid, pgid)?; Ok(client) }) - .and_then(|client| { - client.run_command_chg(handler, env::args_os().skip(1)) - }) + .and_then(|client| client.run_command_chg(handler, env::args_os().skip(1))) .map(|(_client, _handler, code)| { procutil::restore_signal_handler_once()?; Ok(code) }) - .or_else(|err| Ok(Err(err))) // pass back error to caller + .or_else(|err| Ok(Err(err))) // pass back error to caller .map(|res| result_tx.send(res).unwrap()); tokio::run(fut); - result_rx.wait().unwrap_or(Err(io::Error::new(io::ErrorKind::Other, - "no exit code set"))) + result_rx.wait().unwrap_or(Err(io::Error::new( + io::ErrorKind::Other, + "no exit code set", + ))) }