rollup merge of #21190: FlaPer87/remove_duplicated_func

alexcrichton · alexcrichton · commit 782c3917898a · 2015-01-15T14:12:03.000-08:00
small cleanup r? @nikomatsakis
diff --git a/src/librustc/middle/ty.rs b/src/librustc/middle/ty.rs
@@ -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 `{}`",

Original file line number	Diff line number	Diff line change
`@@ -4147,12 +4147,8 @@ pub fn node_id_to_trait_ref<'tcx>(cx: &ctxt<'tcx>, id: ast::NodeId)`
`4147`	`4147`	`}`
`4148`	`4148`	`}`
`4149`	`4149`
`4150`		`-pub fn try_node_id_to_type<'tcx>(cx: &ctxt<'tcx>, id: ast::NodeId) -> Option<Ty<'tcx>> {`
`4151`		`- cx.node_types.borrow().get(&id).cloned()`
`4152`		`-}`
`4153`		`-`
`4154`	`4150`	`pub fn node_id_to_type<'tcx>(cx: &ctxt<'tcx>, id: ast::NodeId) -> Ty<'tcx> {`
`4155`		`- match try_node_id_to_type(cx, id) {`
	`4151`	`+ match node_id_to_type_opt(cx, id) {`
`4156`	`4152`	`Some(ty) => ty,`
`4157`	`4153`	`None => cx.sess.bug(`
`4158`	`4154`	&format!("node_id_to_type: no type for node `{}`",