Apply rustfmt to command.rs and escape.rs

Signed-off-by: Aalekh Patel <aalekh@protectchildren.ca>

Author: CdnCentreForChildProtection

src/command.rs

@@ -55,34 +55,34 @@ macro_rules! delegate {
 /// Primarily a way to allow `std::process::Command` to be turned directly into an `openssh::Command`.
 pub trait OverSsh {
     /// Given a session, return a command that can be executed over that session.
-    /// 
-    /// **Note**: The command to be executed on the remote machine does not include 
+    ///
+    /// **Note**: The command to be executed on the remote machine does not include
     /// any environment variables or the current directory. They must be
     /// set explicitly, if desired.
-    /// 
+    ///
     /// # Example
     /// Consider the implementation of `OverSsh` for `std::process::Command`:
-    /// 
+    ///
     /// ```no_run
     /// # #[tokio::main(flavor = "current_thread")]
     /// async fn main() -> Result<(), Box<dyn std::error::Error>> {
     ///     use std::process::Command;
     ///     use openssh::{Session, KnownHosts, OverSsh};
     ///
     ///     let session = Session::connect_mux("me@ssh.example.com", KnownHosts::Strict).await?;
-    ///     let ls = 
+    ///     let ls =
     ///         Command::new("ls")
     ///         .arg("-l")
     ///         .arg("-a")
     ///         .arg("-h")
     ///         .over_session(&session)
     ///         .output()
     ///         .await?;
-    /// 
+    ///
     ///     assert!(String::from_utf8(ls.stdout).unwrap().contains("total"));
     /// #   Ok(())
     /// }
-    /// 
+    ///
     /// ```
     fn over_session<'session>(&self, session: &'session Session) -> crate::Command<'session>;
 }
@@ -91,26 +91,22 @@ impl OverSsh for std::process::Command {
     fn over_session<'session>(&self, session: &'session Session) -> Command<'session> {
         let program_escaped: Cow<'_, OsStr> = escape(self.get_program());
         let mut command = session.raw_command(program_escaped);
-        
-        let args = self
-            .get_args()
-            .map(escape);
+
+        let args = self.get_args().map(escape);
         command.raw_args(args);
         command
     }
 }
 
-
 impl OverSsh for tokio::process::Command {
     fn over_session<'session>(&self, session: &'session Session) -> Command<'session> {
         self.as_std().over_session(session)
     }
 }
 
-
 impl<S> OverSsh for &S
 where
-    S: OverSsh
+    S: OverSsh,
 {
     fn over_session<'session>(&self, session: &'session Session) -> Command<'session> {
         <S as OverSsh>::over_session(self, session)
@@ -119,7 +115,7 @@ where
 
 impl<S> OverSsh for Box<S>
 where
-    S: OverSsh
+    S: OverSsh,
 {
     fn over_session<'session>(&self, session: &'session Session) -> Command<'session> {
         <S as OverSsh>::over_session(self, session)
@@ -128,7 +124,7 @@ where
 
 impl<S> OverSsh for std::rc::Rc<S>
 where
-    S: OverSsh
+    S: OverSsh,
 {
     fn over_session<'session>(&self, session: &'session Session) -> Command<'session> {
         <S as OverSsh>::over_session(self, session)
@@ -137,7 +133,7 @@ where
 
 impl<S> OverSsh for std::sync::Arc<S>
 where
-    S: OverSsh
+    S: OverSsh,
 {
     fn over_session<'session>(&self, session: &'session Session) -> Command<'session> {
         <S as OverSsh>::over_session(self, session)

src/escape.rs

@@ -1,29 +1,28 @@
 //! Escape characters that may have special meaning in a shell, including spaces.
 //! This is a modified version of the [`shell-escape::unix`] module of [`shell-escape`] crate.
-//! 
+//!
 //! [`shell-escape`]: https://crates.io/crates/shell-escape
 //! [`shell-escape::unix`]: https://docs.rs/shell-escape/latest/src/shell_escape/lib.rs.html#101
 
 use std::{
-    borrow::Cow, 
+    borrow::Cow,
     ffi::{OsStr, OsString},
     os::unix::ffi::OsStrExt,
     os::unix::ffi::OsStringExt,
 };
 
-
 fn whitelisted(byte: u8) -> bool {
     matches!(byte, b'a'..=b'z' | b'A'..=b'Z' | b'0'..=b'9' | b'-' | b'_' | b'=' | b'/' | b',' | b'.' | b'+')
 }
 
 /// Escape characters that may have special meaning in a shell, including spaces.
-/// 
+///
 /// **Note**: This function is an adaptation of [`shell-escape::unix::escape`].
 /// This function exists only for type compatibility and the implementation is
 /// almost exactly the same as [`shell-escape::unix::escape`].
-/// 
+///
 /// [`shell-escape::unix::escape`]: https://docs.rs/shell-escape/latest/src/shell_escape/lib.rs.html#101
-/// 
+///
 pub(crate) fn escape(s: &OsStr) -> Cow<'_, OsStr> {
     let as_bytes = s.as_bytes();
     let all_whitelisted = as_bytes.iter().copied().all(whitelisted);
@@ -51,7 +50,6 @@ pub(crate) fn escape(s: &OsStr) -> Cow<'_, OsStr> {
     OsString::from_vec(escaped).into()
 }
 
-
 #[cfg(test)]
 mod tests {
     use super::*;
@@ -75,36 +73,21 @@ mod tests {
     fn test_escape() {
         test_escape_case(
             "abcdefghijklmnopqrstuvwxyzABCDEFGHIJKLMNOPQRSTUVWXYZ0123456789-_=/,.+",
-            "abcdefghijklmnopqrstuvwxyzABCDEFGHIJKLMNOPQRSTUVWXYZ0123456789-_=/,.+"
-        );
-        test_escape_case(
-            "--aaa=bbb-ccc",
-            "--aaa=bbb-ccc"
+            "abcdefghijklmnopqrstuvwxyzABCDEFGHIJKLMNOPQRSTUVWXYZ0123456789-_=/,.+",
         );
+        test_escape_case("--aaa=bbb-ccc", "--aaa=bbb-ccc");
         test_escape_case(
             "linker=gcc -L/foo -Wl,bar",
-            r#"'linker=gcc -L/foo -Wl,bar'"#
-        );
-        test_escape_case(
-            r#"--features="default""#,
-            r#"'--features="default"'"#
-        );
-        test_escape_case(
-            r#"'!\$`\\\n "#,
-            r#"''\'''\!'\$`\\\n '"#
-        );
-        test_escape_case(
-            "",
-            r#"''"#
-        );
-        test_escape_case(
-            " ",
-            r#"' '"#
+            r#"'linker=gcc -L/foo -Wl,bar'"#,
         );
+        test_escape_case(r#"--features="default""#, r#"'--features="default"'"#);
+        test_escape_case(r#"'!\$`\\\n "#, r#"''\'''\!'\$`\\\n '"#);
+        test_escape_case("", r#"''"#);
+        test_escape_case(" ", r#"' '"#);
 
         test_escape_from_bytes(
             &[0x66, 0x6f, 0x80, 0x6f],
-            &[b'\'', 0x66, 0x6f, 0x80, 0x6f, b'\'']
+            &[b'\'', 0x66, 0x6f, 0x80, 0x6f, b'\''],
         );
     }
 }