Merge pull request #21190 from FlaPer87/remove_duplicated_func

bors · bors · commit 9ffe3e3f2ba3 · 2015-01-15T19:32:50.000Z
[r+] remove try_node_id_to_type in favor of node_id_to_type_opt

Reviewed-by: nikomatsakis
diff --git a/src/librustc/middle/ty.rs b/src/librustc/middle/ty.rs
@@ -4133,12 +4133,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
`@@ -4133,12 +4133,8 @@ pub fn node_id_to_trait_ref<'tcx>(cx: &ctxt<'tcx>, id: ast::NodeId)`
`4133`	`4133`	`}`
`4134`	`4134`	`}`
`4135`	`4135`
`4136`		`-pub fn try_node_id_to_type<'tcx>(cx: &ctxt<'tcx>, id: ast::NodeId) -> Option<Ty<'tcx>> {`
`4137`		`- cx.node_types.borrow().get(&id).cloned()`
`4138`		`-}`
`4139`		`-`
`4140`	`4136`	`pub fn node_id_to_type<'tcx>(cx: &ctxt<'tcx>, id: ast::NodeId) -> Ty<'tcx> {`
`4141`		`- match try_node_id_to_type(cx, id) {`
	`4137`	`+ match node_id_to_type_opt(cx, id) {`
`4142`	`4138`	`Some(ty) => ty,`
`4143`	`4139`	`None => cx.sess.bug(`
`4144`	`4140`	&format!("node_id_to_type: no type for node `{}`",