refactor(hugrv2)!: WIP+RFC: Unify Type and Term - #2785

Closed

acl-cqc wants to merge 97 commits into

acl/no_1type_rowfrom

acl/unify_type_term

Commits on Jan 1, 2026

Hide SeqPart stuff - some can be removed, not sure if we need rest
acl-cqc
committed
dfc038b
collect_signature_exts is monomorphic, Type::Function does not use
acl-cqc
committed
ce1d652
import.rs: import_poly_func_type is used only monomorphically
acl-cqc
committed
5bab2ec
import.rs: Explicit typeargs to import_type_row; inline singly-used import_type_rows
acl-cqc
committed
0113579
export.rs: use SumType::num_variants/get_variant, uniform across Unit/GeneralSum
acl-cqc
committed
74d9a07
refactor: rephrase root_checked/dfg.rs TypeBase<NoRV> -> Type
acl-cqc
committed
0247266
WIP add new Term variants, declare Type=Term, remove row_var.rs
acl-cqc
committed
740e227
GeneralSum with cached Option<TypeBound>
acl-cqc
committed
d8b7d38
Move Transformable clauses into Term + SumType
acl-cqc
committed
1ccc7eb
TypeRow now stores Terms, deparametrize; move (dubious) TypeRV->Term conversion to types.rs
acl-cqc
committed
cda8762
Remove some defunct RV conversions from types.rs
acl-cqc
committed
2a462e8
SumType stores Vec<Term> not Term, so fixed #variants
acl-cqc
committed
9d327ea
zap various conversions etc., handle Term::Variable in least_upper_bound
acl-cqc
committed
d431be1
trait Substitutable
acl-cqc
committed
75fe99c
Combine Type/Term ::validate
acl-cqc
committed
49e9637
PolyFunc, Signature, also Extension + Reinstate least_upper_bound
acl-cqc
committed
5cd9bcd
import.rs: combine import_{type,term}; import_type_row == closed_list of Term
acl-cqc
committed
158830d
export.rs
acl-cqc
committed
8fc6a40
Remove a bunch of serde
acl-cqc
committed
5e42791
Revert "Remove a bunch of serde"
acl-cqc
committed
1283b24
extension resolution
acl-cqc
committed
6231e7d
more types.rs
acl-cqc
committed
3647822
export.rs: generalize export_poly_func_type => export_symbol_params
acl-cqc
committed
62a9268
Rename Type::new_{=>runtime_}tuple
acl-cqc
committed
aa91785
SumType::new_from_row and many others
acl-cqc
committed
9a27f98
test Term->TypeRow, add /*more complex Term::try_into_list_elements*/ in case
acl-cqc
committed
6a95f9a
poly_func.rs: split validate
acl-cqc
committed
ae39bca
serialize (to some extent)
acl-cqc
committed
7c1055a
check.rs
acl-cqc
committed
591d0e9
new_var_use takes impl Into<Term>
acl-cqc
committed
0dbae20
std_extensions (at least start on)
acl-cqc
committed
c990657
prelude.rs
acl-cqc
committed
372a341
Remove AliasID and related
acl-cqc
committed
af3d9e6
simple_replace
acl-cqc
committed
9ec8877
Fix check_term_type; fix+extend is_supertype
acl-cqc
committed
bffdddd
TEMP TO REVERT remove dev-dep hugr-core -> hugr
acl-cqc
committed
f1f4b57
WIP hugr-core tests...almost compile, but problems with Arbitrary
acl-cqc
committed
23eeb8c
Arbitrary for (Poly)FuncTypes
acl-cqc
committed
a8174c9
fix test types.rs/as_option
acl-cqc
committed
1ead319
Fix new_runtime_tuple
acl-cqc
committed
8b810ca
validate check_term_types the subtrees (RTSum/RTFunc) that check_term_type avoids
acl-cqc
committed
e8fe1a8
Fix no_outer_row_variables
acl-cqc
committed
c1fe1b6
fix prelude type errors
acl-cqc
committed
b5bbcfd
move check_typevar_decl, remove bad assert
acl-cqc
committed
81d7fc5
Change Display for Term::List
acl-cqc
committed
d3fb5c4
Fix extension_with_eval_parallel; polyfunc, type{_row,_param,s}, validate tests
acl-cqc
committed
4bbff67
hugr-core test fixes
acl-cqc
committed
ca2d0e1
Some serialization fixes but still many problems; [...] becoming TypeArgSer::List
acl-cqc
committed
8f41bd2
DISABLE check_{hugr,testing}_roundtrip as TEST WORKAROUND
acl-cqc
committed
f022c59
hugr-passes...all compile, all tests passing
acl-cqc
committed
78a6fab
monomorphize/mangle_name: use different prefix for extension/function types
acl-cqc
committed
c8bda84
hugr-llvm and benches compile; hugr-llvm snapshots failing "legacy format"
acl-cqc
committed
0446bb5
FunctionType + GeneralSum checking (RIP new_from_row)
acl-cqc
committed
61444e4
Sum bound is just TypeBound not Option
acl-cqc
committed
a84ce48
clippy
acl-cqc
committed
1e5e9f3
splicing for sums + FuncValueType; no tests, but use (saving only 5 lines...)
acl-cqc
committed
68fba45
Revert "splicing for sums + FuncValueType; no tests, but use (saving only 5 lines...)"
acl-cqc
committed
57b8921

Commits on Jan 2, 2026

Commits on Jan 23, 2026

fix: CustomSerialized (consts)
acl-cqc
committed
259b3a7
Fix some bad PolyFuncType's in serialize/test.rs
acl-cqc
committed
e402a73
better fix for constants, use serde_with
acl-cqc
committed
cc4c40e
even better, use serde_as
acl-cqc
committed
74bd0b1
Revert "even better, use serde_as"
acl-cqc
committed
999e712
RIP PolyFuncTypeBase, have two separate structs and a macro
acl-cqc
committed
320ea5d
RIP FuncTypeBase, same way
acl-cqc
committed
245b542
Add ser_type_row for serializing a TypeRow of SerSimpleType...use for signature but doesn't help much
acl-cqc
committed
0f06b92
Try to serialize FuncValueType inputs/outputs like old TypeRowRVs
acl-cqc
committed
2164c3a
Redo Term->Vec<SerSimpleType> with serde_as
acl-cqc
committed
edf28b1
Revert "Redo Term->Vec<SerSimpleType> with serde_as"
acl-cqc
committed
81c638e
Refactor out term_(from,to)_ssts, define ser_sum_rows -> fix*3
acl-cqc
committed
76d3392
Serialize a bunch of OpType TypeRows correctly -> many fixes
acl-cqc
committed
ecf0cfc

Commits on Jan 26, 2026

serde_as SerTypeRow does TypeRow->Vec<SST> -> also Vec<TypeRow>s in conditional.rs
acl-cqc
committed
de82507
serde_as SerTypeRowRV + SerGenSum(Vec<Term>) -> fix cfg_edge_ordering
acl-cqc
committed
0b58e82
Fix Arbitrary for Term; prop_roundtrip SIGABRTs now just FAIL
acl-cqc
committed
9306be6
Add any_type; use new_unchecked, any::<(->Custom)Type> -> fix prop_roundtrip
acl-cqc
committed
7692b4e
REINSTATE check_{hugr,testing}_roundtrip ---> 18 fails
acl-cqc
committed
b8b9a5d
mod ser_type -> serde_as SerType, use for Option in SerTestingLatest::typ, fix*8
acl-cqc
committed
710641f
proptest + serialize the 'type' in AliasDefn
acl-cqc
committed
f3d91da
Restrict prop_roundtrip_type; Arbitrary+serde_as LoadConstant
acl-cqc
committed
4252158
FuncValueType: Arbitrary type or row var using SeqPart
acl-cqc
committed
f42da0a
remove todo
acl-cqc
committed
029469b
move any_type into proptest_utils
acl-cqc
committed
e4a9a15
Term::(new_list_concat->concat_lists) returns singleton - final fix, all passing
acl-cqc
committed
9ebf211
clippy
acl-cqc
committed
cd0a264
Redefine TypeRowRV as Term; only a couple of fixes needed (dropping Into's)
acl-cqc
committed
2e362d5
docs
acl-cqc
committed
65eed1c
rm SerTypeRow, directly impl (Des/S)erialize for TypeRow
acl-cqc
committed
e3089d7

Commits on Jan 27, 2026

Remove trait Substitutable
acl-cqc
committed
ba34337

Commits on Jan 30, 2026

Merge branch 'acl/no_1type_row' into HEAD
acl-cqc
committed
e224c5b
clippy (inc 4*std::slice::from_ref)
acl-cqc
committed
273b45b
docs
acl-cqc
committed
536e511
update hugr-llvm snapshot updates...right
acl-cqc
committed
5c69585
and some more
acl-cqc
committed
3601613
Re-pub into_list/tuple_parts, new_list/tuple_from_parts, SeqPart
acl-cqc
committed
f85724a
Fix ops/constant.rs...no way to do serde_as SerType ??
acl-cqc
committed
f5047be

Commits on Feb 16, 2026

Rm commented-out from<TypeBase<RV>> for Term
acl-cqc
committed
f226d19