rust-lang/rust
1
0
Fork 0
Code Issues Pull Requests Actions 1 Packages Projects Releases Wiki Activity

Fix some indentation in check::vtable.

Browse Source
This commit is contained in:
Michael Sullivan
2012-07-03 10:57:17 -07:00
parent c854d6ebdb
commit d52f0f79bc
1 changed files with 53 additions and 53 deletions
Download Patch File Download Diff File Expand all files Collapse all files

106
src/rustc/middle/typeck/check/vtable.rs
View File

@@ -115,67 +115,67 @@ fn lookup_vtable(fcx: @fn_ctxt, isc: resolve::iscopes, sp: span,
for list::each(isc) |impls| { for list::each(isc) |impls| {
/* For each impl in scope... */ /* For each impl in scope... */
for vec::each(*impls) |im| { for vec::each(*impls) |im| {
// im = one specific impl // im = one specific impl
// find the iface that im implements (if any) // find the iface that im implements (if any)
let of_ty = alt ty::impl_iface(tcx, im.did) { let of_ty = alt ty::impl_iface(tcx, im.did) {
some(of_ty) { of_ty } some(of_ty) { of_ty }
_ { cont; } _ { cont; }
}; };
// it must have the same id as the expected one // it must have the same id as the expected one
alt ty::get(of_ty).struct { alt ty::get(of_ty).struct {
ty::ty_iface(id, _) if id != iface_id { cont; } ty::ty_iface(id, _) if id != iface_id { cont; }
_ { /* ok */ } _ { /* ok */ }
}
// check whether the type unifies with the type
// that the impl is for, and continue if not
let {substs: substs, ty: for_ty} =
impl_self_ty(fcx, im.did);
let im_bs = ty::lookup_item_type(tcx, im.did).bounds;
alt fcx.mk_subty(ty, for_ty) {
result::err(_) { cont; }
result::ok(()) { }
}
// check that desired iface type unifies
#debug("(checking vtable) @2 relating iface ty %s to \
of_ty %s",
fcx.infcx.ty_to_str(iface_ty),
fcx.infcx.ty_to_str(of_ty));
let of_ty = ty::subst(tcx, substs, of_ty);
relate_iface_tys(fcx, sp, iface_ty, of_ty);
// recursively process the bounds
let iface_tps = iface_substs.tps;
let substs_f = fixup_substs(fcx, sp, iface_id, substs);
connect_iface_tps(fcx, sp, substs_f.tps,
iface_tps, im.did);
let subres = lookup_vtables(fcx, isc, sp,
im_bs, substs_f, false);
vec::push(found,
vtable_static(im.did, substs_f.tps, subres));
} }
alt found.len() { // check whether the type unifies with the type
0u { /* fallthrough */ } // that the impl is for, and continue if not
1u { ret found[0]; } let {substs: substs, ty: for_ty} =
_ { impl_self_ty(fcx, im.did);
fcx.ccx.tcx.sess.span_err( let im_bs = ty::lookup_item_type(tcx, im.did).bounds;
sp, "multiple applicable methods in scope"); alt fcx.mk_subty(ty, for_ty) {
ret found[0]; result::err(_) { cont; }
} result::ok(()) { }
} }
// check that desired iface type unifies
#debug("(checking vtable) @2 relating iface ty %s to \
of_ty %s",
fcx.infcx.ty_to_str(iface_ty),
fcx.infcx.ty_to_str(of_ty));
let of_ty = ty::subst(tcx, substs, of_ty);
relate_iface_tys(fcx, sp, iface_ty, of_ty);
// recursively process the bounds
let iface_tps = iface_substs.tps;
let substs_f = fixup_substs(fcx, sp, iface_id, substs);
connect_iface_tps(fcx, sp, substs_f.tps,
iface_tps, im.did);
let subres = lookup_vtables(fcx, isc, sp,
im_bs, substs_f, false);
vec::push(found,
vtable_static(im.did, substs_f.tps, subres));
} }
}
}
tcx.sess.span_fatal( alt found.len() {
sp, "failed to find an implementation of interface " + 0u { /* fallthrough */ }
ty_to_str(tcx, iface_ty) + " for " + 1u { ret found[0]; }
ty_to_str(tcx, ty)); _ {
fcx.ccx.tcx.sess.span_err(
sp, "multiple applicable methods in scope");
ret found[0];
}
}
}
}
} }
tcx.sess.span_fatal(
sp, "failed to find an implementation of interface " +
ty_to_str(tcx, iface_ty) + " for " +
ty_to_str(tcx, ty));
}
fn fixup_ty(fcx: @fn_ctxt, sp: span, ty: ty::t) -> ty::t { fn fixup_ty(fcx: @fn_ctxt, sp: span, ty: ty::t) -> ty::t {
let tcx = fcx.ccx.tcx; let tcx = fcx.ccx.tcx;
alt infer::resolve_deep(fcx.infcx, ty, force_all) { alt infer::resolve_deep(fcx.infcx, ty, force_all) {