Mercurial > public > mercurial-scm > hg-stable
diff rust/chg/src/runcommand.rs @ 45623:426294d06ddc
rust: move rustfmt.toml to repo root so it can be used by `hg fix`
`hg fix` runs the formatters from the repo root so it doesn't pick up
the `rustfmt.toml` configs we had in each the `hg-core`, `hg-cpython`,
and `rhg` packages, which resulted in warnings about `async fn` not
existing in Rust 2015. This patch moves the `rustfmt.toml` file to the
root so `hg fix` will use it.
By putting the `rustfmt.toml` file in a higher-level directory, it
also applies to the `chg` and `hgcli` packages. That makes
`test-check-rust-format.t` fail, so this patch also applies the new
formatting rules to those packages.
Differential Revision: https://phab.mercurial-scm.org/D9142
| author | Martin von Zweigbergk <martinvonz@google.com> |
|---|---|
| date | Thu, 01 Oct 2020 09:09:35 -0700 |
| parents | 94cace4b80ea |
| children |
line wrap: on
line diff
--- a/rust/chg/src/runcommand.rs Wed Sep 30 18:07:21 2020 +0530 +++ b/rust/chg/src/runcommand.rs Thu Oct 01 09:09:35 2020 -0700 @@ -36,7 +36,8 @@ ChannelMessage::Data(..) => { // just ignores data sent to optional channel } - ChannelMessage::InputRequest(..) | ChannelMessage::LineRequest(..) => { + ChannelMessage::InputRequest(..) + | ChannelMessage::LineRequest(..) => { return Err(io::Error::new( io::ErrorKind::InvalidData, "unsupported request", @@ -49,7 +50,8 @@ // server spins new command loop while pager request is // in progress, which can be terminated by "" command. let pin = handler.spawn_pager(&cmd_spec).await?; - attachio::attach_io(proto, &io::stdin(), &pin, &pin).await?; + attachio::attach_io(proto, &io::stdin(), &pin, &pin) + .await?; proto.send_command("").await?; // terminator } CommandType::System => {