2 files changed, 22 insertions, 13 deletions

diff --git a/crates/ra_hir/src/source_binder.rs b/crates/ra_hir/src/source_binder.rs
index 8496b143a..67cb19615 100644
--- a/crates/ra_hir/src/source_binder.rs
+++ b/crates/ra_hir/src/source_binder.rs
@@ -23,8 +23,8 @@ use crate::{
         scope::{ExprScopes, ScopeId},
         BodySourceMap,
     },
-    ty::method_resolution::implements_trait,
     ids::LocationCtx,
+    ty::method_resolution::implements_trait,
     AsName, AstId, Const, Crate, DefWithBody, Either, Enum, Function, HirDatabase, HirFileId,
     MacroDef, Module, Name, Path, PerNs, Resolver, Static, Struct, Trait, Ty,
 };
@@ -414,22 +414,25 @@ impl SourceAnalyzer {
     /// This function is used in `.await` syntax completion.
     pub fn impls_future(&self, db: &impl HirDatabase, ty: Ty) -> bool {
         // Search for std::future::Future trait in scope
-        let future_trait = self.resolver.traits_in_scope(db)
+        let future_trait = self
+            .resolver
+            .traits_in_scope(db)
             .into_iter()
             .filter(|t| {
-                let std = t.module(db).parent(db)
-                    .and_then(|m| m
-                        .name(db)
-                        .and_then(|n| Some(n.to_string() == "std")))
+                let std = t
+                    .module(db)
+                    .parent(db)
+                    .and_then(|m| m.name(db).and_then(|n| Some(n.to_string() == "std")))
                     .unwrap_or(false);
 
-                let future = t.module(db).name(db)
+                let future = t
+                    .module(db)
+                    .name(db)
                     .and_then(|n| Some(n.to_string() == "future"))
                     .unwrap_or(false);
 
-                let future_trait = t.name(db)
-                    .and_then(|n| Some(n.to_string() == "Future"))
-                    .unwrap_or(false);
+                let future_trait =
+                    t.name(db).and_then(|n| Some(n.to_string() == "Future")).unwrap_or(false);
 
                 std && future && future_trait
             })
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;
         }
     }