From 314c97387d3e46dce1a939d16788b917dd4420e8 Mon Sep 17 00:00:00 2001
From: topecongiro <seuchida@gmail.com>
Date: Thu, 26 Oct 2017 16:53:30 +0900
Subject: [PATCH] Squash redundant match arms

---
 src/imports.rs | 11 +++++------
 src/visitor.rs | 12 +-----------
 2 files changed, 6 insertions(+), 17 deletions(-)

diff --git a/src/imports.rs b/src/imports.rs
index 68c3ec32897..699029e7151 100644
--- a/src/imports.rs
+++ b/src/imports.rs
@@ -94,15 +94,14 @@ fn compare_path_list_item_lists(
 fn compare_view_path_types(a: &ast::ViewPath_, b: &ast::ViewPath_) -> Ordering {
     use syntax::ast::ViewPath_::*;
     match (a, b) {
-        (&ViewPathSimple(..), &ViewPathSimple(..)) => Ordering::Equal,
-        (&ViewPathSimple(..), _) => Ordering::Less,
-        (&ViewPathGlob(_), &ViewPathSimple(..)) => Ordering::Greater,
-        (&ViewPathGlob(_), &ViewPathGlob(_)) => Ordering::Equal,
-        (&ViewPathGlob(_), &ViewPathList(..)) => Ordering::Less,
+        (&ViewPathSimple(..), &ViewPathSimple(..)) | (&ViewPathGlob(_), &ViewPathGlob(_)) => {
+            Ordering::Equal
+        }
+        (&ViewPathSimple(..), _) | (&ViewPathGlob(_), &ViewPathList(..)) => Ordering::Less,
         (&ViewPathList(_, ref a_items), &ViewPathList(_, ref b_items)) => {
             compare_path_list_item_lists(a_items, b_items)
         }
-        (&ViewPathList(..), _) => Ordering::Greater,
+        (&ViewPathGlob(_), &ViewPathSimple(..)) | (&ViewPathList(..), _) => Ordering::Greater,
     }
 }
 
diff --git a/src/visitor.rs b/src/visitor.rs
index 642f75e58ab..ee6e6be63f4 100644
--- a/src/visitor.rs
+++ b/src/visitor.rs
@@ -250,17 +250,7 @@ impl<'a> FmtVisitor<'a> {
         let indent = self.block_indent;
         let block;
         let rewrite = match fk {
-            visit::FnKind::ItemFn(ident, _, _, _, _, b) => {
-                block = b;
-                self.rewrite_fn(
-                    indent,
-                    ident,
-                    &FnSig::from_fn_kind(&fk, generics, fd, defaultness),
-                    mk_sp(s.lo(), b.span.lo()),
-                    b,
-                )
-            }
-            visit::FnKind::Method(ident, _, _, b) => {
+            visit::FnKind::ItemFn(ident, _, _, _, _, b) | visit::FnKind::Method(ident, _, _, b) => {
                 block = b;
                 self.rewrite_fn(
                     indent,