---

yaml
---
r: 232669
b: refs/heads/try
c: b61fdde
h: refs/heads/master
i:
  232667: 65721ba
v: v3

Author: sfackler

[refs]

@@ -1,7 +1,7 @@
 ---
 refs/heads/master: edeb4f1c86cbf6af8ef9874d4b3af50f721ea1b8
 refs/heads/snap-stage3: 1af31d4974e33027a68126fa5a5a3c2c6491824f
-refs/heads/try: 797d0ba59c3d11a61bdfca52b79d511580309713
+refs/heads/try: b61fddebb09f33c52cf97f66c797f8d5401096ec
 refs/tags/release-0.1: 1f5c5126e96c79d22cb7862f75304136e204f105
 refs/tags/release-0.2: c870d2dffb391e14efb05aa27898f1f6333a9596
 refs/tags/release-0.3: b5f0d0f648d9a6153664837026ba1be43d3e2503

branches/try/src/librustc/ast_map/blocks.rs

@@ -191,7 +191,7 @@ impl<'a> FnLikeNode<'a> {
             visit::FkItemFn(p.ident, p.generics, p.unsafety, p.constness, p.abi, p.vis)
         };
         let closure = |_: ClosureParts| {
-            visit::FkClosure
+            visit::FkFnBlock
         };
         let method = |_, ident, sig: &'a ast::MethodSig, vis, _, _| {
             visit::FkMethod(ident, sig, vis)

branches/try/src/librustc/ast_map/mod.rs

@@ -14,7 +14,6 @@ use self::MapEntry::*;
 
 use metadata::inline::InlinedItem;
 use metadata::inline::InlinedItem as II;
-use middle::def_id::DefId;
 use syntax::abi;
 use syntax::ast::*;
 use syntax::ast_util;
@@ -379,7 +378,7 @@ impl<'ast> Map<'ast> {
         match self.find_entry(parent) {
             Some(RootInlinedParent(&InlinedParent {ii: II::TraitItem(did, _), ..})) => did,
             Some(RootInlinedParent(&InlinedParent {ii: II::ImplItem(did, _), ..})) => did,
-            _ => DefId::local(parent)
+            _ => ast_util::local_def(parent)
         }
     }
 
@@ -592,7 +591,7 @@ impl<'ast> Map<'ast> {
     }
 
     pub fn def_id_span(&self, def_id: DefId, fallback: Span) -> Span {
-        if def_id.is_local() {
+        if def_id.krate == LOCAL_CRATE {
             self.opt_span(def_id.node).unwrap_or(fallback)
         } else {
             fallback

branches/try/src/librustc/lib.rs

@@ -118,7 +118,6 @@ pub mod middle {
     pub mod dataflow;
     pub mod dead;
     pub mod def;
-    pub mod def_id;
     pub mod dependency_format;
     pub mod effect;
     pub mod entry;