From c20ff6b16011734e1cf41f41f7581c7e22c1d243 Mon Sep 17 00:00:00 2001 From: rvcas Date: Thu, 21 Mar 2024 11:30:01 -0400 Subject: [PATCH] fix: contains_opaque was never intended to be used for type equality --- crates/aiken-lang/src/tests/check.rs | 7 +------ crates/aiken-lang/src/tipo.rs | 5 ++--- crates/aiken-lang/src/tipo/environment.rs | 3 --- 3 files changed, 3 insertions(+), 12 deletions(-) diff --git a/crates/aiken-lang/src/tests/check.rs b/crates/aiken-lang/src/tests/check.rs index cd3cced1..7e48abe3 100644 --- a/crates/aiken-lang/src/tests/check.rs +++ b/crates/aiken-lang/src/tests/check.rs @@ -1976,12 +1976,7 @@ fn forbid_expect_into_nested_opaque_in_record_without_typecasting() { } "#; - panic!(""); - - assert!(matches!( - check(parse(source_code)), - Err((_, Error::ExpectOnOpaqueType { .. })) - )) + assert!(check(parse(source_code)).is_ok()) } #[test] diff --git a/crates/aiken-lang/src/tipo.rs b/crates/aiken-lang/src/tipo.rs index ad206b9e..de766117 100644 --- a/crates/aiken-lang/src/tipo.rs +++ b/crates/aiken-lang/src/tipo.rs @@ -81,7 +81,7 @@ impl PartialEq for Type { module, name, args, - contains_opaque: opaque, + contains_opaque: _, alias: _, } => { if let Type::App { @@ -89,14 +89,13 @@ impl PartialEq for Type { module: module2, name: name2, args: args2, - contains_opaque: opaque2, + contains_opaque: _, alias: _, } = other { name == name2 && module == module2 && public == public2 - && opaque == opaque2 && args.iter().zip(args2).all(|(left, right)| left == right) } else { false diff --git a/crates/aiken-lang/src/tipo/environment.rs b/crates/aiken-lang/src/tipo/environment.rs index 27b61155..481eda1b 100644 --- a/crates/aiken-lang/src/tipo/environment.rs +++ b/crates/aiken-lang/src/tipo/environment.rs @@ -1408,9 +1408,6 @@ impl<'a> Environment<'a> { return Ok(()); } - println!("lhs: {lhs:#?}"); - println!("rhs: {rhs:#?}"); - // TODO: maybe we also care to check is_link? if allow_cast && (lhs.is_data() || rhs.is_data())