Cargo fmt and update a test

diff --git a/rustfmt-bin/build.rs b/rustfmt-bin/build.rs
index c806b1f0408e3755bbb00c55cdf49fcc28284bcf..d72b44eb7f36426b4ccf2903a758b049d8616e9a 100644 (file)
--- a/rustfmt-bin/build.rs
+++ b/rustfmt-bin/build.rs
@@ -27,7 +27,9 @@ fn main() {
 // (git not installed or if this is not a git repository) just return an empty string.
 fn commit_info() -> String {
     match (channel(), commit_hash(), commit_date()) {
-        (channel, Some(hash), Some(date)) => format!("{} ({} {})", channel, hash.trim_right(), date),
+        (channel, Some(hash), Some(date)) => {
+            format!("{} ({} {})", channel, hash.trim_right(), date)
+        }
         _ => String::new(),
     }
 }

diff --git a/rustfmt-core/src/types.rs b/rustfmt-core/src/types.rs
index 204b5869f03643ac7771eeda1c86858c13801090..7f96a2299a3e6f19d03f4569cda39207851afa1e 100644 (file)
--- a/rustfmt-core/src/types.rs
+++ b/rustfmt-core/src/types.rs
@@ -529,12 +529,9 @@ fn rewrite(&self, context: &RewriteContext, shape: Shape) -> Option<String> {
             ast::TyParamBound::TraitTyParamBound(ref tref, ast::TraitBoundModifier::None) => {
                 tref.rewrite(context, shape)
             }
-            ast::TyParamBound::TraitTyParamBound(ref tref, ast::TraitBoundModifier::Maybe) => {
-                Some(format!(
-                    "?{}",
-                    tref.rewrite(context, shape.offset_left(1)?)?
-                ))
-            }
+            ast::TyParamBound::TraitTyParamBound(ref tref, ast::TraitBoundModifier::Maybe) => Some(
+                format!("?{}", tref.rewrite(context, shape.offset_left(1)?)?),
+            ),
             ast::TyParamBound::RegionTyParamBound(ref l) => l.rewrite(context, shape),
         }
     }

diff --git a/rustfmt-core/tests/target/configs/indent_style/block_call.rs b/rustfmt-core/tests/target/configs/indent_style/block_call.rs
index d3522214c2e2f4e3aa0a4685f7042c0f63ba55fe..4e4c9465fe834a193084b9a39979545f6e291fe9 100644 (file)
--- a/rustfmt-core/tests/target/configs/indent_style/block_call.rs
+++ b/rustfmt-core/tests/target/configs/indent_style/block_call.rs
@@ -13,9 +13,9 @@ fn main() {
         "elit",
     );
     // #1501
-    let hyper = Arc::new(Client::with_connector(HttpsConnector::new(
-        TlsClient::new(),
-    )));
+    let hyper = Arc::new(Client::with_connector(
+        HttpsConnector::new(TlsClient::new()),
+    ));
 
     // chain
     let x = yooooooooooooo