Merge #776

776: More performance improvements r=Marwes a=Marwes Co-authored-by: Markus Westerlind <marwes91@gmail.com>
gluon-lang · Sep 2, 2019 · a507ed0 · a507ed0
2 parents 4f76ca6 + 32b1f82
commit a507ed0
Show file tree

Hide file tree

Showing 45 changed files with 1,472 additions and 1,245 deletions.
diff --git a/Cargo.lock b/Cargo.lock
diff --git a/base/Cargo.toml b/base/Cargo.toml
@@ -17,6 +17,7 @@ travis-ci = { repository = "gluon-lang/gluon" }
 
 [dependencies]
 bitflags = "1"
+hashbrown = "0.6"
 log = "0.4"
 quick-error = "1.0.0"
 fnv = "1.0.3"

diff --git a/base/src/ast.rs b/base/src/ast.rs
@@ -188,7 +188,10 @@ pub struct TypedIdent<Id = Symbol, T = ArcType<Id>> {
 }
 
 impl<Id> TypedIdent<Id> {
-    pub fn new(name: Id) -> TypedIdent<Id> {
+    pub fn new(name: Id) -> TypedIdent<Id>
+    where
+        Id: PartialEq,
+    {
         TypedIdent {
             typ: Type::hole(),
             name,
@@ -543,7 +546,10 @@ pub struct ValueBinding<Id> {
     pub expr: SpannedExpr<Id>,
 }
 
-impl<T> Default for ValueBinding<T> {
+impl<T> Default for ValueBinding<T>
+where
+    T: PartialEq,
+{
     fn default() -> Self {
         ValueBinding {
             metadata: Default::default(),
@@ -809,18 +815,23 @@ pub fn walk_ast_type<'a, V: ?Sized + $trait_name<'a>>(
         Type::Effect(ref $($mut)* ast_type) => v.visit_ast_type(&$($mut)* ast_type._typ.typ),
         Type::EmptyRow => (),
         Type::ExtendRow {
-            ref $($mut)* types,
             ref $($mut)* fields,
             ref $($mut)* rest,
+        } => {
+            for field in fields {
+                v.visit_ast_type(&$($mut)* field.typ._typ.typ);
+            }
+            v.visit_ast_type(&$($mut)* rest._typ.typ);
+        }
+        Type::ExtendTypeRow {
+            ref $($mut)* types,
+            ref $($mut)* rest,
         } => {
             for field in types {
                 if let Some(alias) = field.typ.$try_get_alias() {
                     v.visit_ast_type(&$($mut)* alias.$unresolved_type()._typ.typ);
                 }
             }
-            for field in fields {
-                v.visit_ast_type(&$($mut)* field.typ._typ.typ);
-            }
             v.visit_ast_type(&$($mut)* rest._typ.typ);
         }
         Type::Alias(ref $($mut)* alias) => {