diff -r d9f85f61f0ed -r ce088b38f92b rust/chg/src/clientext.rs --- a/rust/chg/src/clientext.rs Fri Dec 06 16:09:03 2019 -0500 +++ b/rust/chg/src/clientext.rs Sat Dec 07 13:06:25 2019 -0800 @@ -9,8 +9,8 @@ use std::os::unix::ffi::OsStrExt; use std::os::unix::io::AsRawFd; use std::path::Path; +use tokio_hglib::protocol::OneShotRequest; use tokio_hglib::{Client, Connection}; -use tokio_hglib::protocol::OneShotRequest; use super::attachio::AttachIo; use super::message; @@ -18,46 +18,54 @@ use super::uihandler::SystemHandler; pub trait ChgClientExt - where C: Connection + AsRawFd, +where + C: Connection + AsRawFd, { /// Attaches the client file descriptors to the server. fn attach_io(self, stdin: I, stdout: O, stderr: E) -> AttachIo - where I: AsRawFd, - O: AsRawFd, - E: AsRawFd; + where + I: AsRawFd, + O: AsRawFd, + E: AsRawFd; /// Changes the working directory of the server. fn set_current_dir

(self, dir: P) -> OneShotRequest - where P: AsRef; + where + P: AsRef; /// Runs the specified Mercurial command with cHg extension. fn run_command_chg(self, handler: H, args: I) -> ChgRunCommand - where I: IntoIterator, - P: AsRef, - H: SystemHandler; + where + I: IntoIterator, + P: AsRef, + H: SystemHandler; } impl ChgClientExt for Client - where C: Connection + AsRawFd, +where + C: Connection + AsRawFd, { fn attach_io(self, stdin: I, stdout: O, stderr: E) -> AttachIo - where I: AsRawFd, - O: AsRawFd, - E: AsRawFd, + where + I: AsRawFd, + O: AsRawFd, + E: AsRawFd, { AttachIo::with_client(self, stdin, stdout, Some(stderr)) } fn set_current_dir

(self, dir: P) -> OneShotRequest - where P: AsRef, + where + P: AsRef, { OneShotRequest::start_with_args(self, b"chdir", dir.as_ref().as_os_str().as_bytes()) } fn run_command_chg(self, handler: H, args: I) -> ChgRunCommand - where I: IntoIterator, - P: AsRef, - H: SystemHandler, + where + I: IntoIterator, + P: AsRef, + H: SystemHandler, { ChgRunCommand::with_client(self, handler, message::pack_args_os(args)) }