From 71c9a884d1d9b27bf9da8ce7d328d74349db54a2 Mon Sep 17 00:00:00 2001
From: Nick Spain <nicholas.spain@stileeducation.com>
Date: Fri, 1 Jan 2021 15:41:04 +1100
Subject: Fix type error with .and_then

---
 crates/ide_db/src/search.rs | 29 ++++++++++++++---------------
 1 file changed, 14 insertions(+), 15 deletions(-)

(limited to 'crates/ide_db/src')

diff --git a/crates/ide_db/src/search.rs b/crates/ide_db/src/search.rs
index c4aff3932..436c59d2c 100644
--- a/crates/ide_db/src/search.rs
+++ b/crates/ide_db/src/search.rs
@@ -120,20 +120,19 @@ impl Definition {
         let file_id = module_src.file_id.original_file(db);
 
         if let Definition::Local(var) = self {
-            #[allow(deprecated)]
             let range = match var.parent(db) {
                 DefWithBody::Function(f) => {
-                    f.source(db).and_then(|src| src.value.syntax().text_range())
+                    f.source(db).and_then(|src| Some(src.value.syntax().text_range()))
                 }
                 DefWithBody::Const(c) => {
-                    c.source(db).and_then(|src| src.value.syntax().text_range())
+                    c.source(db).and_then(|src| Some(src.value.syntax().text_range()))
                 }
                 DefWithBody::Static(s) => {
-                    s.source(db).and_then(|src| src.value.syntax().text_range())
+                    s.source(db).and_then(|src| Some(src.value.syntax().text_range()))
                 }
             };
             let mut res = FxHashMap::default();
-            res.insert(file_id, Some(range));
+            res.insert(file_id, range);
             return SearchScope::new(res);
         }
 
@@ -141,37 +140,37 @@ impl Definition {
             #[allow(deprecated)]
             let range = match param.parent(db) {
                 hir::GenericDef::Function(it) => {
-                    it.source(db).and_then(|src| src.value.syntax().text_range())
+                    it.source(db).and_then(|src| Some(src.value.syntax().text_range()))
                 }
                 hir::GenericDef::Adt(it) => match it {
                     hir::Adt::Struct(it) => {
-                        it.source(db).and_then(|src| src.value.syntax().text_range())
+                        it.source(db).and_then(|src| Some(src.value.syntax().text_range()))
                     }
                     hir::Adt::Union(it) => {
-                        it.source(db).and_then(|src| src.value.syntax().text_range())
+                        it.source(db).and_then(|src| Some(src.value.syntax().text_range()))
                     }
                     hir::Adt::Enum(it) => {
-                        it.source(db).and_then(|src| src.value.syntax().text_range())
+                        it.source(db).and_then(|src| Some(src.value.syntax().text_range()))
                     }
                 },
                 hir::GenericDef::Trait(it) => {
-                    it.source(db).and_then(|src| src.value.syntax().text_range())
+                    it.source(db).and_then(|src| Some(src.value.syntax().text_range()))
                 }
                 hir::GenericDef::TypeAlias(it) => {
-                    it.source(db).and_then(|src| src.value.syntax().text_range())
+                    it.source(db).and_then(|src| Some(src.value.syntax().text_range()))
                 }
                 hir::GenericDef::Impl(it) => {
-                    it.source(db).and_then(|src| src.value.syntax().text_range())
+                    it.source(db).and_then(|src| Some(src.value.syntax().text_range()))
                 }
                 hir::GenericDef::Variant(it) => {
-                    it.source(db).and_then(|src| src.value.syntax().text_range())
+                    it.source(db).and_then(|src| Some(src.value.syntax().text_range()))
                 }
                 hir::GenericDef::Const(it) => {
-                    it.source(db).and_then(|src| src.value.syntax().text_range())
+                    it.source(db).and_then(|src| Some(src.value.syntax().text_range()))
                 }
             };
             let mut res = FxHashMap::default();
-            res.insert(file_id, Some(range));
+            res.insert(file_id, range);
             return SearchScope::new(res);
         }
 
-- 
cgit v1.2.3