bjoernager/rust
bjoernager/rust
1
Fork 0
Code Activity

rustc: move some functions in middle::ty working on Ty to methods.

Browse source
This commit is contained in:
Eduard Burtescu 2015-06-24 08:24:13 +03:00
parent aa03871a6e
commit 59935f70e0
37 changed files with 433 additions and 477 deletions
Download patch file Download diff file Expand all files Collapse all files

6
src/librustc/middle/cfg/construct.rs
View file

@ -411,14 +411,14 @@ impl<'a, 'tcx> CFGBuilder<'a, 'tcx> {
func_or_rcvr: &ast::Expr,
args: I) -> CFGIndex {
let method_call = ty::MethodCall::expr(call_expr.id);
let return_ty = ty::ty_fn_ret(match self.tcx.method_map.borrow().get(&method_call) {
let fn_ty = match self.tcx.method_map.borrow().get(&method_call) {
Some(method) => method.ty,
None => ty::expr_ty_adjusted(self.tcx, func_or_rcvr)
});
};
let func_or_rcvr_exit = self.expr(func_or_rcvr, pred);
let ret = self.straightline(call_expr, func_or_rcvr_exit, args);
if return_ty.diverges() {
if fn_ty.fn_ret().diverges() {
self.add_unreachable_node()
} else {
ret