about summary refs log tree commit diff
diff options
context:
space:
mode:
authorAnatol Ulrich <anatol.ulrich@ferrous-systems.com>2021-10-27 17:23:23 +0200
committerAnatol Ulrich <anatol.ulrich@ferrous-systems.com>2021-10-27 17:23:23 +0200
commit28c73f8374295459cdf4cfdc97c1540753484d02 (patch)
tree0037e58d1d1884e1d543db43292fdf0ac75051c5
parent4a1a5ff54eee3d0fa42f3f64170fc19524aa10f8 (diff)
downloadrust-28c73f8374295459cdf4cfdc97c1540753484d02.tar.gz
rust-28c73f8374295459cdf4cfdc97c1540753484d02.zip
unwrap--
-rw-r--r--crates/ide/src/rename.rs6
1 files changed, 3 insertions, 3 deletions
diff --git a/crates/ide/src/rename.rs b/crates/ide/src/rename.rs
index 2f95557a8e0..8292a6e26d8 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"),
         });