From c417b98f02004a10819111903882482b39e50d17 Mon Sep 17 00:00:00 2001
From: Evgenii P <eupn@protonmail.com>
Date: Sat, 3 Aug 2019 01:15:43 +0700
Subject: Implement completion for the .await syntax

---
 crates/ra_hir/src/ty/method_resolution.rs | 16 +++++++++++++++-
 1 file changed, 15 insertions(+), 1 deletion(-)

(limited to 'crates/ra_hir/src/ty')

diff --git a/crates/ra_hir/src/ty/method_resolution.rs b/crates/ra_hir/src/ty/method_resolution.rs
index d421bf9ef..2e2f88138 100644
--- a/crates/ra_hir/src/ty/method_resolution.rs
+++ b/crates/ra_hir/src/ty/method_resolution.rs
@@ -15,7 +15,7 @@ use crate::{
     resolve::Resolver,
     traits::TraitItem,
     ty::primitive::{FloatBitness, UncertainFloatTy, UncertainIntTy},
-    ty::{Ty, TypeCtor},
+    ty::{Ty, TypeCtor, traits::Solution},
     Crate, Function, HirDatabase, Module, Name, Trait,
 };
 
@@ -255,6 +255,20 @@ fn iterate_inherent_methods<T>(
     None
 }
 
+pub(crate) fn implements_trait(ty: &Canonical<Ty>, db: &impl HirDatabase, resolver: &Resolver, krate: Crate, trait_: Trait) -> bool {
+    let env = lower::trait_env(db, resolver);
+    let goal = generic_implements_goal(db, env.clone(), trait_, ty.clone());
+    let solution = db.trait_solve(krate, goal);
+
+    if let Some(solution) = solution {
+        if let Solution::Unique(_) = solution {
+            return true
+        }
+    }
+
+    false
+}
+
 impl Ty {
     // This would be nicer if it just returned an iterator, but that runs into
     // lifetime problems, because we need to borrow temp `CrateImplBlocks`.
-- 
cgit v1.2.3


From 30bc3b93bec06256350b66869f2885ee71c3bedd Mon Sep 17 00:00:00 2001
From: Evgenii P <eupn@protonmail.com>
Date: Sat, 3 Aug 2019 01:16:20 +0700
Subject: rustfmt

---
 crates/ra_hir/src/ty/method_resolution.rs | 12 +++++++++---
 1 file changed, 9 insertions(+), 3 deletions(-)

(limited to 'crates/ra_hir/src/ty')

diff --git a/crates/ra_hir/src/ty/method_resolution.rs b/crates/ra_hir/src/ty/method_resolution.rs
index 2e2f88138..8731d6ba4 100644
--- a/crates/ra_hir/src/ty/method_resolution.rs
+++ b/crates/ra_hir/src/ty/method_resolution.rs
@@ -15,7 +15,7 @@ use crate::{
     resolve::Resolver,
     traits::TraitItem,
     ty::primitive::{FloatBitness, UncertainFloatTy, UncertainIntTy},
-    ty::{Ty, TypeCtor, traits::Solution},
+    ty::{traits::Solution, Ty, TypeCtor},
     Crate, Function, HirDatabase, Module, Name, Trait,
 };
 
@@ -255,14 +255,20 @@ fn iterate_inherent_methods<T>(
     None
 }
 
-pub(crate) fn implements_trait(ty: &Canonical<Ty>, db: &impl HirDatabase, resolver: &Resolver, krate: Crate, trait_: Trait) -> bool {
+pub(crate) fn implements_trait(
+    ty: &Canonical<Ty>,
+    db: &impl HirDatabase,
+    resolver: &Resolver,
+    krate: Crate,
+    trait_: Trait,
+) -> bool {
     let env = lower::trait_env(db, resolver);
     let goal = generic_implements_goal(db, env.clone(), trait_, ty.clone());
     let solution = db.trait_solve(krate, goal);
 
     if let Some(solution) = solution {
         if let Solution::Unique(_) = solution {
-            return true
+            return true;
         }
     }
 
-- 
cgit v1.2.3


From 291bd81e74742472572c88ccf3d2cf9cf70af6b2 Mon Sep 17 00:00:00 2001
From: Evgenii P <eupn@protonmail.com>
Date: Sat, 3 Aug 2019 01:56:27 +0700
Subject: Relax trait solving more for completion

---
 crates/ra_hir/src/ty/method_resolution.rs | 8 +-------
 1 file changed, 1 insertion(+), 7 deletions(-)

(limited to 'crates/ra_hir/src/ty')

diff --git a/crates/ra_hir/src/ty/method_resolution.rs b/crates/ra_hir/src/ty/method_resolution.rs
index 8731d6ba4..aa625a013 100644
--- a/crates/ra_hir/src/ty/method_resolution.rs
+++ b/crates/ra_hir/src/ty/method_resolution.rs
@@ -266,13 +266,7 @@ pub(crate) fn implements_trait(
     let goal = generic_implements_goal(db, env.clone(), trait_, ty.clone());
     let solution = db.trait_solve(krate, goal);
 
-    if let Some(solution) = solution {
-        if let Solution::Unique(_) = solution {
-            return true;
-        }
-    }
-
-    false
+    solution.is_some()
 }
 
 impl Ty {
-- 
cgit v1.2.3


From 858736c47758250c9a4b897300fce24e35e9a579 Mon Sep 17 00:00:00 2001
From: Evgenii P <eupn@protonmail.com>
Date: Sat, 3 Aug 2019 02:46:00 +0700
Subject: do fixup: remove unused import

---
 crates/ra_hir/src/ty/method_resolution.rs | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to 'crates/ra_hir/src/ty')

diff --git a/crates/ra_hir/src/ty/method_resolution.rs b/crates/ra_hir/src/ty/method_resolution.rs
index aa625a013..88d012a74 100644
--- a/crates/ra_hir/src/ty/method_resolution.rs
+++ b/crates/ra_hir/src/ty/method_resolution.rs
@@ -15,7 +15,7 @@ use crate::{
     resolve::Resolver,
     traits::TraitItem,
     ty::primitive::{FloatBitness, UncertainFloatTy, UncertainIntTy},
-    ty::{traits::Solution, Ty, TypeCtor},
+    ty::{Ty, TypeCtor},
     Crate, Function, HirDatabase, Module, Name, Trait,
 };
 
-- 
cgit v1.2.3