rollup merge of #21190: FlaPer87/remove_duplicated_func

small cleanup

r? @nikomatsakis
This commit is contained in:
Alex Crichton 2015-01-15 14:12:03 -08:00
commit 782c391789

View file

@ -4147,12 +4147,8 @@ pub fn node_id_to_trait_ref<'tcx>(cx: &ctxt<'tcx>, id: ast::NodeId)
}
}
pub fn try_node_id_to_type<'tcx>(cx: &ctxt<'tcx>, id: ast::NodeId) -> Option<Ty<'tcx>> {
cx.node_types.borrow().get(&id).cloned()
}
pub fn node_id_to_type<'tcx>(cx: &ctxt<'tcx>, id: ast::NodeId) -> Ty<'tcx> {
match try_node_id_to_type(cx, id) {
match node_id_to_type_opt(cx, id) {
Some(ty) => ty,
None => cx.sess.bug(
&format!("node_id_to_type: no type for node `{}`",