typ -> type

crates/noirc_frontend/src/ast/type_alias.rs

@@ -26,6 +26,6 @@ impl NoirTypeAlias {
 impl Display for NoirTypeAlias {
     fn fmt(&self, f: &mut std::fmt::Formatter<'_>) -> std::fmt::Result {
         let generics = vecmap(&self.generics, |generic| generic.to_string());
-        write!(f, "type {}<{}> = {}", self.name, generics.join(", "), self.ty)
+        write!(f, "type {}<{}> = {}", self.name, generics.join(", "), self.typ)
     }
 }

crates/noirc_frontend/src/hir/def_collector/dc_mod.rs

@@ -204,18 +204,18 @@ impl<'a> ModCollector<'a> {
                 type_alias_def: type_alias,
             };
 
-            let typ_alias_id = context.def_interner.push_type_alias(&unresolved);
+            let type_alias_id = context.def_interner.push_type_alias(&unresolved);
 
             // Add the type alias to scope so its path can be looked up later
             let result = self.def_collector.def_map.modules[self.module_id.0]
-                .declare_type_alias(name, typ_alias_id);
+                .declare_type_alias(name, type_alias_id);
 
             if let Err((first_def, second_def)) = result {
                 let err = DefCollectorErrorKind::DuplicateFunction { first_def, second_def };
                 errors.push(err.into_file_diagnostic(self.file_id));
             }
 
-            self.def_collector.collected_type_aliases.insert(typ_alias_id, unresolved);
+            self.def_collector.collected_type_aliases.insert(type_alias_id, unresolved);
         }
     }
 

crates/noirc_frontend/src/parser/parser.rs

@@ -246,8 +246,8 @@ fn type_alias_definition() -> impl NoirParser<TopLevelStatement> {
     let p = then_commit_ignore(p, just(Token::Assign));
     let p = then_commit(p, parse_type());
 
-    p.map_with_span(|((name, generics), ty), span| {
-        TopLevelStatement::TypeAlias(NoirTypeAlias { name, generics, ty, span })
+    p.map_with_span(|((name, generics), typ), span| {
+        TopLevelStatement::TypeAlias(NoirTypeAlias { name, generics, typ, span })
     })
 }