---

yaml
---
r: 13591
b: refs/heads/master
c: e7ce323
h: refs/heads/master
i:
  13589: 52ca30d
  13587: 88fa32e
  13583: 3ec1338
v: v3

Author: catamorphism

[refs]

@@ -1,5 +1,5 @@
 ---
-refs/heads/master: f331cd9324e4c4246fb3f332720a444042267e69
+refs/heads/master: e7ce32310b90a4738452f2331e25d4815f2ab81f
 refs/heads/snap-stage1: e33de59e47c5076a89eadeb38f4934f58a3618a6
 refs/heads/snap-stage3: 4a81779abd786ff22d71434c6d9a5917ea4cdfff
 refs/heads/try: 2898dcc5d97da9427ac367542382b6239d9c0bbf

trunk/src/rustc/util/ppaux.rs

@@ -28,12 +28,12 @@ fn bound_region_to_str(cx: ctxt, br: bound_region) -> str {
 }
 
 fn re_scope_id_to_str(cx: ctxt, node_id: ast::node_id) -> str {
-    alt cx.items.get(node_id) {
-      ast_map::node_block(blk) {
+    alt cx.items.find(node_id) {
+      some(ast_map::node_block(blk)) {
         #fmt("<block at %s>",
              codemap::span_to_str(blk.span, cx.sess.codemap))
       }
-      ast_map::node_expr(expr) {
+      some(ast_map::node_expr(expr)) {
         alt expr.node {
           ast::expr_call(*) {
             #fmt("<call at %s>",