From 170a1b8641f91cf7c2bdfeb81903b5f32cb14752 Mon Sep 17 00:00:00 2001 From: aadityavardhan Date: Sun, 21 Aug 2022 15:42:51 +0530 Subject: [PATCH] Fixed formatting and clutter --- nac3core/src/toplevel/builtins.rs | 3 --- nac3core/src/typecheck/typedef/mod.rs | 2 +- 2 files changed, 1 insertion(+), 4 deletions(-) diff --git a/nac3core/src/toplevel/builtins.rs b/nac3core/src/toplevel/builtins.rs index 78c5c71..de3cc23 100755 --- a/nac3core/src/toplevel/builtins.rs +++ b/nac3core/src/toplevel/builtins.rs @@ -74,7 +74,6 @@ pub fn get_exn_constructor( constructor: Some(signature), resolver: None, loc: None, - // Make TopLevelDef::Class initlializer compatible static_fields: Default::default(), }; (fun_def, class_def, signature, exn_type) @@ -177,7 +176,6 @@ pub fn get_builtins(primitives: &mut (PrimitiveStore, Unifier)) -> BuiltinInfo { type_vars: Default::default(), fields: exception_fields, methods: Default::default(), - // Make TopLevelDef::Class initlializer compatible static_fields: Default::default(), ancestors: vec![], constructor: None, @@ -204,7 +202,6 @@ pub fn get_builtins(primitives: &mut (PrimitiveStore, Unifier)) -> BuiltinInfo { object_id: DefinitionId(10), type_vars: vec![option_ty_var], fields: vec![], - // Make TopLevelDef::Class initlializer compatible static_fields: vec![], methods: vec![ ("is_some".into(), is_some_ty.0, DefinitionId(11)), diff --git a/nac3core/src/typecheck/typedef/mod.rs b/nac3core/src/typecheck/typedef/mod.rs index fff88c3..861a2e3 100755 --- a/nac3core/src/typecheck/typedef/mod.rs +++ b/nac3core/src/typecheck/typedef/mod.rs @@ -513,7 +513,7 @@ impl Unifier { fn unify_impl(&mut self, a: Type, b: Type, swapped: bool) -> Result<(), TypeError> { use TypeEnum::*; - + if !swapped { let rep_a = self.unification_table.get_representative(a); let rep_b = self.unification_table.get_representative(b);