cargo fmt all source code

Now that cargo fmt has landed, run it over everything at once to bring
rust source to the standard formatting.

TEST=cargo test
BUG=None

Change-Id: Ic95a48725e5a40dcbd33ba6d5aef2bd01e91865b
Reviewed-on: https://chromium-review.googlesource.com/1259287
Commit-Ready: ChromeOS CL Exonerator Bot <chromiumos-cl-exonerator@appspot.gserviceaccount.com>
Tested-by: Zach Reizner <zachr@chromium.org>
Reviewed-by: Zach Reizner <zachr@chromium.org>

2 files changed, 11 insertions, 10 deletions

diff --git a/9s/src/main.rs b/9s/src/main.rs
index 711e07f..ab3f291 100644
--- a/9s/src/main.rs
+++ b/9s/src/main.rs
@@ -70,23 +70,23 @@ impl FromStr for ListenAddress {
     fn from_str(s: &str) -> result::Result<Self, Self::Err> {
         if s.starts_with(VSOCK) {
             if s.len() > VSOCK.len() {
-                Ok(ListenAddress::Vsock(s[VSOCK.len()..]
-                    .parse()
-                    .map_err(ParseAddressError::Vsock)?))
+                Ok(ListenAddress::Vsock(
+                    s[VSOCK.len()..].parse().map_err(ParseAddressError::Vsock)?,
+                ))
             } else {
                 Err(ParseAddressError::MissingVsockPort)
             }
         } else if s.starts_with(UNIX) {
             if s.len() > UNIX.len() {
-                Ok(ListenAddress::Unix(s[UNIX.len()..]
-                    .parse()
-                    .map_err(ParseAddressError::Unix)?))
+                Ok(ListenAddress::Unix(
+                    s[UNIX.len()..].parse().map_err(ParseAddressError::Unix)?,
+                ))
             } else {
                 Err(ParseAddressError::MissingUnixPath)
             }
         } else {
             Ok(ListenAddress::Net(
-                s.parse().map_err(ParseAddressError::Net)?
+                s.parse().map_err(ParseAddressError::Net)?,
             ))
         }
     }
@@ -171,7 +171,8 @@ fn main() -> Result<()> {
     );
     opts.optflag("h", "help", "print this help menu");
 
-    let matches = opts.parse(std::env::args_os().skip(1))
+    let matches = opts
+        .parse(std::env::args_os().skip(1))
         .map_err(Error::Argument)?;
 
     if matches.opt_present("h") || matches.free.len() == 0 {
diff --git a/9s/src/vsock.rs b/9s/src/vsock.rs
index 7957860..acf263e 100644
--- a/9s/src/vsock.rs
+++ b/9s/src/vsock.rs
@@ -147,7 +147,7 @@ impl VsockListener {
             return Err(io::Error::last_os_error());
         }
 
-        Ok(VsockListener { fd: fd })
+        Ok(VsockListener { fd })
     }
 
     /// Accepts a new incoming connection on this listener.  Blocks the calling thread until a
@@ -179,7 +179,7 @@ impl VsockListener {
         }
 
         Ok((
-            VsockStream { fd: fd },
+            VsockStream { fd },
             SocketAddr {
                 cid: svm.svm_cid,
                 port: svm.svm_port,