From 27cadcd531c017aa7c78c6f7a36f2b7f2ce8a196 Mon Sep 17 00:00:00 2001
From: Nick Spain <nicholas.spain@stileeducation.com>
Date: Fri, 1 Jan 2021 13:05:28 +1100
Subject: HasSource::source -> HasSource::source_old

To start migrating HasSource::source to return an Option.
---
 crates/completion/src/render/const_.rs | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to 'crates/completion/src/render/const_.rs')

diff --git a/crates/completion/src/render/const_.rs b/crates/completion/src/render/const_.rs
index 039bdabc0..a8820a4fe 100644
--- a/crates/completion/src/render/const_.rs
+++ b/crates/completion/src/render/const_.rs
@@ -27,7 +27,7 @@ struct ConstRender<'a> {
 
 impl<'a> ConstRender<'a> {
     fn new(ctx: RenderContext<'a>, const_: hir::Const) -> ConstRender<'a> {
-        let ast_node = const_.source(ctx.db()).value;
+        let ast_node = const_.source_old(ctx.db()).value;
         ConstRender { ctx, const_, ast_node }
     }
 
-- 
cgit v1.2.3


From ea4708c444509449b86c50b7b1b23f9ff5af4e97 Mon Sep 17 00:00:00 2001
From: Nick Spain <nicholas.spain@stileeducation.com>
Date: Fri, 1 Jan 2021 13:50:50 +1100
Subject: Mark HasSource::source_old as deprecated but allow at all call sites

---
 crates/completion/src/render/const_.rs | 1 +
 1 file changed, 1 insertion(+)

(limited to 'crates/completion/src/render/const_.rs')

diff --git a/crates/completion/src/render/const_.rs b/crates/completion/src/render/const_.rs
index a8820a4fe..648a1afc5 100644
--- a/crates/completion/src/render/const_.rs
+++ b/crates/completion/src/render/const_.rs
@@ -27,6 +27,7 @@ struct ConstRender<'a> {
 
 impl<'a> ConstRender<'a> {
     fn new(ctx: RenderContext<'a>, const_: hir::Const) -> ConstRender<'a> {
+        #[allow(deprecated)]
         let ast_node = const_.source_old(ctx.db()).value;
         ConstRender { ctx, const_, ast_node }
     }
-- 
cgit v1.2.3


From 7bfec89cf969aa630f184f7d4a66e8e12a423d2f Mon Sep 17 00:00:00 2001
From: Nick Spain <nicholas.spain@stileeducation.com>
Date: Fri, 1 Jan 2021 17:26:39 +1100
Subject: Make the result of Const, FunctionRender and TypeAliasRender
 constructors optional

They use source() which now returns an Option so they need to too.
---
 crates/completion/src/render/const_.rs | 9 ++++-----
 1 file changed, 4 insertions(+), 5 deletions(-)

(limited to 'crates/completion/src/render/const_.rs')

diff --git a/crates/completion/src/render/const_.rs b/crates/completion/src/render/const_.rs
index 648a1afc5..ce924f309 100644
--- a/crates/completion/src/render/const_.rs
+++ b/crates/completion/src/render/const_.rs
@@ -15,7 +15,7 @@ pub(crate) fn render_const<'a>(
     ctx: RenderContext<'a>,
     const_: hir::Const,
 ) -> Option<CompletionItem> {
-    ConstRender::new(ctx, const_).render()
+    ConstRender::new(ctx, const_)?.render()
 }
 
 #[derive(Debug)]
@@ -26,10 +26,9 @@ struct ConstRender<'a> {
 }
 
 impl<'a> ConstRender<'a> {
-    fn new(ctx: RenderContext<'a>, const_: hir::Const) -> ConstRender<'a> {
-        #[allow(deprecated)]
-        let ast_node = const_.source_old(ctx.db()).value;
-        ConstRender { ctx, const_, ast_node }
+    fn new(ctx: RenderContext<'a>, const_: hir::Const) -> Option<ConstRender<'a>> {
+        let ast_node = const_.source(ctx.db())?.value;
+        Some(ConstRender { ctx, const_, ast_node })
     }
 
     fn render(self) -> Option<CompletionItem> {
-- 
cgit v1.2.3