2 files changed, 20 insertions, 0 deletions
diff --git a/gcc/rust/resolve/rust-toplevel-name-resolver-2.0.cc b/gcc/rust/resolve/rust-toplevel-name-resolver-2.0.cc
index ea64e25..3dde483 100644
--- a/gcc/rust/resolve/rust-toplevel-name-resolver-2.0.cc
+++ b/gcc/rust/resolve/rust-toplevel-name-resolver-2.0.cc
@@ -253,6 +253,15 @@ TopLevel::visit (AST::StaticItem &static_item)
 void
 TopLevel::visit (AST::StructStruct &struct_item)
 {
+  auto generic_vis = [this, &struct_item] () {
+    for (auto &g : struct_item.get_generic_params ())
+      {
+	g->accept_vis (*this);
+      }
+  };
+
+  ctx.scoped (Rib::Kind::Item, struct_item.get_node_id (), generic_vis);
+
   insert_or_error_out (struct_item.get_struct_name (), struct_item,
 		       Namespace::Types);
 
@@ -265,6 +274,16 @@ TopLevel::visit (AST::StructStruct &struct_item)
 }
 
 void
+TopLevel::visit (AST::TypeParam &type_param)
+{
+  // Hacky and weird, find a better solution
+  // We should probably not even insert self in the first place ?
+  if (type_param.get_type_representation ().as_string () != "Self")
+    insert_or_error_out (type_param.get_type_representation (), type_param,
+			 Namespace::Types);
+}
+
+void
 TopLevel::visit (AST::TupleStruct &tuple_struct)
 {
   insert_or_error_out (tuple_struct.get_struct_name (), tuple_struct,
diff --git a/gcc/rust/resolve/rust-toplevel-name-resolver-2.0.h b/gcc/rust/resolve/rust-toplevel-name-resolver-2.0.h
index 7309e70..6dc2de9 100644
--- a/gcc/rust/resolve/rust-toplevel-name-resolver-2.0.h
+++ b/gcc/rust/resolve/rust-toplevel-name-resolver-2.0.h
@@ -162,6 +162,7 @@ private:
   void visit (AST::Union &union_item) override;
   void visit (AST::ConstantItem &const_item) override;
   void visit (AST::ExternCrate &crate) override;
+  void visit (AST::TypeParam &type_param) override;
 
   void visit (AST::UseDeclaration &use) override;
 };