formatting, mostly from rustfmt (manually picked)

Signed-off-by: Ian Jackson <ijackson@chiark.greenend.org.uk>

diff --git a/src/bin/otter.rs b/src/bin/otter.rs
index fe319ae42e4e6ccf5491c1356fa90b09b4419e28..51887c7d38cf9cd8abff96d31ae66635a9abbeb6 100644 (file)
--- a/src/bin/otter.rs
+++ b/src/bin/otter.rs
@@ -269,40 +269,38 @@ fn main() {
     let mut ap = ArgumentParser::new();
     ap.stop_on_first_argument(true);
     ap.silence_double_dash(true);
-    ap.refer(&mut rma.subcommand).required().add_argument("SUBCOMMAND",Store,
-                                      "subcommand");
-    ap.refer(&mut rma.subargs).add_argument("...",Collect,
-                                   "subcommand options/arguments");
+
+    ap.refer(&mut rma.subcommand).required()
+      .add_argument("SUBCOMMAND", Store, "subcommand");
+    ap.refer(&mut rma.subargs)
+      .add_argument("...", Collect, "subcommand options/arguments");
 
     let mut account = ap.refer(&mut rma.account);
-    account.metavar("ACCOUNT").add_option(&["--account"],
-                     StoreOption,
-                     "use account ACCOUNT (default: unix:<current user>:)");
-
-    ap.refer(&mut rma.nick).metavar("NICK").add_option(
-      &["--nick"],
-      StoreOption,
-      "use NICK as nick for joining games (now and in the future) \
-       (default: derive from account name");
-    ap.refer(&mut rma.timezone).metavar("TZ").add_option(
-      &["--timezone"],
-      StoreOption,
-      "display times in timezone TZ (Olson timezone name) \
-       (default is to use server's default timezone)");
+    account.metavar("ACCOUNT")
+      .add_option(&["--account"],
+                  StoreOption,
+                  "use account ACCOUNT (default: unix:<current user>:)");
+    ap.refer(&mut rma.nick).metavar("NICK")
+      .add_option(&["--nick"],
+                  StoreOption,
+                  "use NICK as nick for joining games (now and in the future) \
+                   (default: derive from account name");
+    ap.refer(&mut rma.timezone).metavar("TZ")
+      .add_option(&["--timezone"],
+                  StoreOption,
+                  "display times in timezone TZ (Olson timezone name) \
+                   (default is to use server's default timezone)");
+
     let mut layout = ap.refer(&mut rma.layout);
-    layout.add_option(
-      &["--layout-portrait"],
-      StoreConst(Some(PL::Portrait)),
-      "set account to display in portrait (by default)");
-    layout.add_option(
-      &["--layout-landscape"],
-      StoreConst(Some(PL::Landscape)),
-      "set account to display in landscape (by default)");
-    layout.add_option(
-      &["--layout-default"],
-      StoreConst(None),
-      "do not modify default layout");
-    
+    layout.add_option(&["--layout-portrait"],
+                      StoreConst(Some(PL::Portrait)),
+                      "set account to display in portrait (by default)");
+    layout.add_option(&["--layout-landscape"],
+                      StoreConst(Some(PL::Landscape)),
+                      "set account to display in landscape (by default)");
+    layout.add_option(&["--layout-default"],
+                      StoreConst(None),
+                      "do not modify default layout");
 
     let mut access = ap.refer(&mut rma.access);
     access.metavar("EMAIL-ADDRESS").add_option(