1 files changed, 4 insertions, 5 deletions

diff --git a/crates/ra_ide_db/src/search.rs b/crates/ra_ide_db/src/search.rs
index 1bf014149..c66de4f42 100644
--- a/crates/ra_ide_db/src/search.rs
+++ b/crates/ra_ide_db/src/search.rs
@@ -10,7 +10,7 @@ use hir::{DefWithBody, HasSource, Module, ModuleSource, Semantics, Visibility};
 use once_cell::unsync::Lazy;
 use ra_db::{FileId, FileRange, SourceDatabaseExt};
 use ra_prof::profile;
-use ra_syntax::{ast, match_ast, AstNode, TextRange, TextUnit};
+use ra_syntax::{ast, match_ast, AstNode, TextRange, TextSize};
 use rustc_hash::FxHashMap;
 use test_utils::tested_by;
 
@@ -85,7 +85,7 @@ impl SearchScope {
             match (r1, r2) {
                 (None, r) | (r, None) => Some(r),
                 (Some(r1), Some(r2)) => {
-                    let r = r1.intersection(&r2)?;
+                    let r = r1.intersect(r2)?;
                     Some(Some(r))
                 }
             }
@@ -200,14 +200,13 @@ impl Definition {
 
         for (file_id, search_range) in search_scope {
             let text = db.file_text(file_id);
-            let search_range =
-                search_range.unwrap_or(TextRange::offset_len(0.into(), TextUnit::of_str(&text)));
+            let search_range = search_range.unwrap_or(TextRange::up_to(TextSize::of(&text)));
 
             let sema = Semantics::new(db);
             let tree = Lazy::new(|| sema.parse(file_id).syntax().clone());
 
             for (idx, _) in text.match_indices(pat) {
-                let offset = TextUnit::from_usize(idx);
+                let offset = TextSize::from_usize(idx);
                 if !search_range.contains_inclusive(offset) {
                     tested_by!(search_filters_by_range; force);
                     continue;