OpenE2K/rust
2
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Print "expected a record with field..." fields in the right order

Browse Source 
Because terr_record_mismatch was getting called by infer::flds,
which takes types a and b where it's trying to prove a <: b, the
expected and actual fields were switched. Fixed it. Closes #2094
This commit is contained in:
Tim Chevalier 2012-04-05 15:16:12 -07:00
parent 3ef620bf92
commit 5a3875e998
1 changed files with 12 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

21
src/rustc/middle/infer.rs
View File

@ -528,11 +528,14 @@ impl unify_methods for infer_ctxt {
}
}
fn flds(a: ty::field, b: ty::field) -> ures {
if a.ident != b.ident {
ret self.uerr(ty::terr_record_fields(a.ident, b.ident));
/* mk_subty passes the "smaller" type as the first argument
and the "bigger" type as the second -- so the first arg
is the actual type, and the second is the expected type */
fn flds(a: ty::field, e: ty::field) -> ures {
if e.ident != a.ident {
ret self.uerr(ty::terr_record_fields(e.ident, a.ident));
}
self.mts(a.mt, b.mt)
self.mts(a.mt, e.mt)
}
fn tps(as: [ty::t], bs: [ty::t]) -> ures {
@ -1087,13 +1090,13 @@ fn c_fieldvecs<C:combine>(self: C, as: [ty::field], bs: [ty::field])
}
}
fn c_flds<C:combine>(self: C, a: ty::field, b: ty::field) -> cres<ty::field> {
if a.ident == b.ident {
self.c_mts(a.mt, b.mt).chain {|mt|
ok({ident: a.ident, mt: mt})
fn c_flds<C:combine>(self: C, e: ty::field, a: ty::field) -> cres<ty::field> {
if e.ident == a.ident {
self.c_mts(e.mt, a.mt).chain {|mt|
ok({ident: e.ident, mt: mt})
}
} else {
err(ty::terr_record_fields(a.ident, b.ident))
err(ty::terr_record_fields(e.ident, a.ident))
}
}