From 28c73f8374295459cdf4cfdc97c1540753484d02 Mon Sep 17 00:00:00 2001
From: Anatol Ulrich <anatol.ulrich@ferrous-systems.com>
Date: Wed, 27 Oct 2021 17:23:23 +0200
Subject: [PATCH] unwrap--

---
 crates/ide/src/rename.rs | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/crates/ide/src/rename.rs b/crates/ide/src/rename.rs
index 2f95557a8e..8292a6e26d 100644
--- a/crates/ide/src/rename.rs
+++ b/crates/ide/src/rename.rs
@@ -49,10 +49,10 @@ pub(crate) fn prepare_rename(
                 bail!("invalid text range")
             }
         })
-        .reduce(|acc, cur| match acc {
+        .reduce(|acc, cur| match (acc, cur) {
             // ensure all ranges are the same
-            Ok(acc_inner) if cur.is_ok() && acc_inner == cur.unwrap() => acc,
-            Err(e) => Err(e),
+            (Ok(acc_inner), Ok(cur_inner)) if acc_inner == cur_inner => Ok(acc_inner),
+            (Err(e), _) => Err(e),
             _ => bail!("inconsistent text range"),
         });