From aaaa68b56cc8520f09649acef22ae0eb26ee9678 Mon Sep 17 00:00:00 2001
From: Jonas Schievink <jonasschievink@gmail.com>
Date: Mon, 15 Jun 2020 22:59:49 +0200
Subject: Simplify

---
 .../src/handlers/replace_qualified_name_with_use.rs   | 19 ++++++-------------
 1 file changed, 6 insertions(+), 13 deletions(-)

(limited to 'crates/ra_assists')

diff --git a/crates/ra_assists/src/handlers/replace_qualified_name_with_use.rs b/crates/ra_assists/src/handlers/replace_qualified_name_with_use.rs
index 301ae8497..f2286c9f6 100644
--- a/crates/ra_assists/src/handlers/replace_qualified_name_with_use.rs
+++ b/crates/ra_assists/src/handlers/replace_qualified_name_with_use.rs
@@ -5,7 +5,6 @@ use crate::{
     utils::{find_insert_use_container, insert_use_statement},
     AssistContext, AssistId, Assists,
 };
-use either::Either;
 
 // Assist: replace_qualified_name_with_use
 //
@@ -56,14 +55,8 @@ pub(crate) fn replace_qualified_name_with_use(
                 None => return,
             };
             let mut rewriter = SyntaxRewriter::default();
-            match container {
-                Either::Left(l) => {
-                    shorten_paths(&mut rewriter, l.syntax().clone(), hir_path.mod_path());
-                }
-                Either::Right(r) => {
-                    shorten_paths(&mut rewriter, r.syntax().clone(), hir_path.mod_path());
-                }
-            }
+            let syntax = container.either(|l| l.syntax().clone(), |r| r.syntax().clone());
+            shorten_paths(&mut rewriter, syntax, hir_path.mod_path());
             builder.rewrite(rewriter);
         },
     )
@@ -90,7 +83,7 @@ fn collect_hir_path_segments(path: &hir::Path) -> Option<Vec<SmolStr>> {
 }
 
 /// Adds replacements to `re` that shorten `path` in all descendants of `node`.
-fn shorten_paths(re: &mut SyntaxRewriter<'static>, node: SyntaxNode, path: &ModPath) {
+fn shorten_paths(rewriter: &mut SyntaxRewriter<'static>, node: SyntaxNode, path: &ModPath) {
     for child in node.children() {
         match_ast! {
             match child {
@@ -101,12 +94,12 @@ fn shorten_paths(re: &mut SyntaxRewriter<'static>, node: SyntaxNode, path: &ModP
                 ast::Module(_it) => continue,
 
                 ast::Path(p) => {
-                    match maybe_replace_path(re, &p, path) {
+                    match maybe_replace_path(rewriter, &p, path) {
                         Some(()) => {},
-                        None => shorten_paths(re, p.syntax().clone(), path),
+                        None => shorten_paths(rewriter, p.syntax().clone(), path),
                     }
                 },
-                _ => shorten_paths(re, child, path),
+                _ => shorten_paths(rewriter, child, path),
             }
         }
     }
-- 
cgit v1.2.3