1 files changed, 7 insertions, 11 deletions

diff --git a/crates/ra_hir/src/ty/infer/path.rs b/crates/ra_hir/src/ty/infer/path.rs
index 1946bf608..59b7f7eb6 100644
--- a/crates/ra_hir/src/ty/infer/path.rs
+++ b/crates/ra_hir/src/ty/infer/path.rs
@@ -196,13 +196,8 @@ impl<'a, D: HirDatabase> InferenceContext<'a, D> {
                     AssocItem::Const(c) => ValueNs::Const(c),
                     AssocItem::TypeAlias(_) => unreachable!(),
                 };
-                match item.container(self.db) {
-                    Container::ImplBlock(_) => {
-                        let substs = self.find_self_types(&def, ty.clone());
-
-                        self.write_assoc_resolution(id, item);
-                        Some((def, substs))
-                    }
+                let substs = match item.container(self.db) {
+                    Container::ImplBlock(_) => self.find_self_types(&def, ty.clone()),
                     Container::Trait(t) => {
                         // we're picking this method
                         let trait_substs = Substs::build_for_def(self.db, t)
@@ -217,11 +212,12 @@ impl<'a, D: HirDatabase> InferenceContext<'a, D> {
                             trait_: t,
                             substs: trait_substs,
                         }));
-
-                        self.write_assoc_resolution(id, item);
-                        Some((def, Some(substs)))
+                        Some(substs)
                     }
-                }
+                };
+
+                self.write_assoc_resolution(id, item);
+                Some((def, substs))
             },
         )
     }