From d75f768c13752dfa5ea9189a0b4dfb9b460993e6 Mon Sep 17 00:00:00 2001
From: Aleksey Kladov <aleksey.kladov@gmail.com>
Date: Sat, 7 Dec 2019 17:34:28 +0100
Subject: Minor

---
 crates/ra_hir_def/src/generics.rs | 7 ++++---
 1 file changed, 4 insertions(+), 3 deletions(-)

(limited to 'crates/ra_hir_def/src/generics.rs')

diff --git a/crates/ra_hir_def/src/generics.rs b/crates/ra_hir_def/src/generics.rs
index 94ce83564..b3e345082 100644
--- a/crates/ra_hir_def/src/generics.rs
+++ b/crates/ra_hir_def/src/generics.rs
@@ -58,11 +58,12 @@ impl GenericParams {
             GenericDefId::TraitId(it) => {
                 // traits get the Self type as an implicit first type parameter
                 generics.params.alloc(GenericParamData { name: name::SELF_TYPE, default: None });
-                generics.fill(&it.source(db).value);
                 // add super traits as bounds on Self
                 // i.e., trait Foo: Bar is equivalent to trait Foo where Self: Bar
                 let self_param = TypeRef::Path(name::SELF_TYPE.into());
                 generics.fill_bounds(&it.source(db).value, self_param);
+
+                generics.fill(&it.source(db).value);
             }
             GenericDefId::TypeAliasId(it) => generics.fill(&it.lookup(db).source(db).value),
             // Note that we don't add `Self` here: in `impl`s, `Self` is not a
@@ -75,7 +76,7 @@ impl GenericParams {
         generics
     }
 
-    fn fill(&mut self, node: &impl TypeParamsOwner) {
+    fn fill(&mut self, node: &dyn TypeParamsOwner) {
         if let Some(params) = node.type_param_list() {
             self.fill_params(params)
         }
@@ -84,7 +85,7 @@ impl GenericParams {
         }
     }
 
-    fn fill_bounds(&mut self, node: &impl ast::TypeBoundsOwner, type_ref: TypeRef) {
+    fn fill_bounds(&mut self, node: &dyn ast::TypeBoundsOwner, type_ref: TypeRef) {
         for bound in
             node.type_bound_list().iter().flat_map(|type_bound_list| type_bound_list.bounds())
         {
-- 
cgit v1.2.3