user0/rust
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

rustc: Unify with the root types

Browse source
This commit is contained in:
Patrick Walton 2011-06-09 13:55:56 -07:00
parent 3c1be2aeba
commit 3009574165
1 changed files with 3 additions and 2 deletions
Download patch file Download diff file Expand all files Collapse all files

5
src/comp/middle/ty.rs
View file

@ -1810,9 +1810,10 @@ mod unify {
fn record_var_binding(&@ctxt cx, int key, t typ) -> result {
ufind::grow(cx.vb.sets, (key as uint) + 1u);
auto root = ufind::find(cx.vb.sets, key as uint);
auto result_type = typ;
alt (smallintmap::find[t](cx.vb.types, key as uint)) {
alt (smallintmap::find[t](cx.vb.types, root)) {
case (some(?old_type)) {
alt (unify_step(cx, old_type, typ)) {
case (ures_ok(?unified_type)) {
@ -1824,7 +1825,7 @@ mod unify {
case (none) { /* fall through */ }
}
smallintmap::insert[t](cx.vb.types, key as uint, result_type);
smallintmap::insert[t](cx.vb.types, root, result_type);
ret ures_ok(typ);
}