Skip to content

Commit c4ba359

Browse files
committed
Fixed Rust tests.
1 parent 51c2d81 commit c4ba359

File tree

4 files changed

+20
-7
lines changed

4 files changed

+20
-7
lines changed

hugr-core/src/types/type_param.rs

Lines changed: 15 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -565,12 +565,24 @@ mod test {
565565
)
566566
.unwrap_err();
567567

568-
// TypeParam::Tuples require a TypeArg::Seq of the same number of elems
568+
// TypeParam::Tuples require a TypeArg::Tuple of the same number of elems
569569
let usize_and_ty = TypeParam::Tuple {
570570
params: vec![TypeParam::max_nat(), TypeBound::Copyable.into()],
571571
};
572-
check(vec![5.into(), usize_t().into()], &usize_and_ty).unwrap();
573-
check(vec![usize_t().into(), 5.into()], &usize_and_ty).unwrap_err(); // Wrong way around
572+
check(
573+
TypeArg::Tuple {
574+
elems: vec![5.into(), usize_t().into()],
575+
},
576+
&usize_and_ty,
577+
)
578+
.unwrap();
579+
check(
580+
TypeArg::Tuple {
581+
elems: vec![usize_t().into(), 5.into()],
582+
},
583+
&usize_and_ty,
584+
)
585+
.unwrap_err(); // Wrong way around
574586
let two_types = TypeParam::Tuple {
575587
params: vec![TypeBound::Any.into(), TypeBound::Any.into()],
576588
};

hugr-llvm/src/extension/prelude.rs

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -560,7 +560,7 @@ mod test {
560560
fn prelude_panic(prelude_llvm_ctx: TestContext) {
561561
let error_val = ConstError::new(42, "PANIC");
562562
let type_arg_q: TypeArg = TypeArg::Type { ty: qb_t() };
563-
let type_arg_2q: TypeArg = TypeArg::Sequence {
563+
let type_arg_2q: TypeArg = TypeArg::List {
564564
elems: vec![type_arg_q.clone(), type_arg_q],
565565
};
566566
let panic_op = PRELUDE
@@ -588,7 +588,7 @@ mod test {
588588
fn prelude_exit(prelude_llvm_ctx: TestContext) {
589589
let error_val = ConstError::new(42, "EXIT");
590590
let type_arg_q: TypeArg = TypeArg::Type { ty: qb_t() };
591-
let type_arg_2q: TypeArg = TypeArg::Sequence {
591+
let type_arg_2q: TypeArg = TypeArg::List {
592592
elems: vec![type_arg_q.clone(), type_arg_q],
593593
};
594594
let exit_op = PRELUDE

hugr-passes/src/monomorphize.rs

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -659,7 +659,8 @@ mod test {
659659
#[case::type_int(vec![INT_TYPES[2].clone().into()], "$foo$$t(int(2))")]
660660
#[case::string(vec!["arg".into()], "$foo$$s(arg)")]
661661
#[case::dollar_string(vec!["$arg".into()], "$foo$$s(\\$arg)")]
662-
#[case::sequence(vec![vec![0.into(), Type::UNIT.into()].into()], "$foo$$seq($n(0)$t(Unit))")]
662+
#[case::sequence(vec![vec![0.into(), Type::UNIT.into()].into()], "$foo$$list($n(0)$t(Unit))")]
663+
#[case::sequence(vec![TypeArg::Tuple { elems: vec![0.into(), Type::UNIT.into()] }], "$foo$$tuple($n(0)$t(Unit))")]
663664
#[should_panic]
664665
#[case::typeargvariable(vec![TypeArg::new_var_use(1, TypeParam::String)],
665666
"$foo$$v(1)")]

uv.lock

Lines changed: 1 addition & 1 deletion
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

0 commit comments

Comments
 (0)