From efef078cfa378378201ab097579992b40751cfb4 Mon Sep 17 00:00:00 2001 From: Eduard Burtescu Date: Wed, 19 Feb 2014 22:11:45 +0200 Subject: Replaced method_map_entry with method_origin and cleaned up vtable checking a bit. --- src/librustc/middle/trans/meth.rs | 9 ++++----- 1 file changed, 4 insertions(+), 5 deletions(-) (limited to 'src/librustc/middle/trans') diff --git a/src/librustc/middle/trans/meth.rs b/src/librustc/middle/trans/meth.rs index 27fb9bdb0bb..7fa116cafd0 100644 --- a/src/librustc/middle/trans/meth.rs +++ b/src/librustc/middle/trans/meth.rs @@ -95,16 +95,15 @@ pub fn trans_method_callee<'a>( bcx: &'a Block<'a>, callee_id: ast::NodeId, this: &ast::Expr, - mentry: typeck::method_map_entry, + origin: typeck::method_origin, arg_cleanup_scope: cleanup::ScopeId) -> Callee<'a> { let _icx = push_ctxt("meth::trans_method_callee"); - debug!("trans_method_callee(callee_id={:?}, mentry={})", - callee_id, - mentry.repr(bcx.tcx())); + debug!("trans_method_callee(callee_id={:?}, origin={})", + callee_id, origin.repr(bcx.tcx())); - match mentry.origin { + match origin { typeck::method_static(did) => { Callee { bcx: bcx, -- cgit 1.4.1-3-g733a5