From 278d64dafce164122698a1c49ab340020aee17a5 Mon Sep 17 00:00:00 2001 From: Patrick Walton Date: Mon, 16 May 2011 15:19:07 -0700 Subject: [PATCH] rustc: Don't unpack annotations in trans::lval_generic_fn() --- src/comp/middle/trans.rs | 14 ++------------ 1 file changed, 2 insertions(+), 12 deletions(-) diff --git a/src/comp/middle/trans.rs b/src/comp/middle/trans.rs index 3fa7c8012c2..aaf65fe270e 100644 --- a/src/comp/middle/trans.rs +++ b/src/comp/middle/trans.rs @@ -4310,18 +4310,8 @@ fn lval_generic_fn(&@block_ctxt cx, lv = trans_external_path(cx, fn_id, tpt); } - auto monoty; - let vec[ty::t] tys; - alt (ann) { - case (ast::ann_none(_)) { - cx.fcx.lcx.ccx.sess.bug("no type annotation for path!"); - fail; - } - case (ast::ann_type(_, ?monoty_, ?tps, _)) { - monoty = monoty_; - tys = option::get[vec[ty::t]](tps); - } - } + auto tys = ty::ann_to_type_params(cx.fcx.lcx.ccx.node_types, ann); + auto monoty = ty::ann_to_type(cx.fcx.lcx.ccx.node_types, ann); if (_vec::len[ty::t](tys) != 0u) { auto bcx = lv.res.bcx;