From df9fb9b159eeb0ed942f969adf9d69d6499118d5 Mon Sep 17 00:00:00 2001 From: Anatol Ulrich Date: Wed, 27 Oct 2021 17:25:37 +0200 Subject: [PATCH] re-introduce `always!` --- crates/ide/src/rename.rs | 15 +++++++-------- 1 file changed, 7 insertions(+), 8 deletions(-) diff --git a/crates/ide/src/rename.rs b/crates/ide/src/rename.rs index 8292a6e26d..270e06bc5f 100644 --- a/crates/ide/src/rename.rs +++ b/crates/ide/src/rename.rs @@ -12,7 +12,7 @@ use ide_db::{ RootDatabase, }; use itertools::Itertools; -use stdx::never; +use stdx::{always, never}; use syntax::{ast, AstNode, SyntaxNode}; use text_edit::TextEdit; @@ -41,13 +41,12 @@ pub(crate) fn prepare_rename( bail!("No references found at position") } let frange = sema.original_range(name_like.syntax()); - if frange.range.contains_inclusive(position.offset) - && frange.file_id == position.file_id - { - Ok(frange.range) - } else { - bail!("invalid text range") - } + + always!( + frange.range.contains_inclusive(position.offset) + && frange.file_id == position.file_id + ); + Ok(frange.range) }) .reduce(|acc, cur| match (acc, cur) { // ensure all ranges are the same