Move body back

Author: Zoxc

src/librustc/hir/map/mod.rs

@@ -433,11 +433,11 @@ impl<'hir> Map<'hir> {
     }
 
     pub fn body(&self, id: BodyId) -> &'hir Body<'hir> {
-        self.read(id.hir_id);
-
-        // N.B., intentionally bypass `self.krate()` so that we
-        // do not trigger a read of the whole krate here
-        self.krate.body(id)
+        self.tcx
+            .hir_owner_items(DefId::local(id.hir_id.owner))
+            .bodies
+            .get(&id.hir_id.local_id)
+            .unwrap()
     }
 
     pub fn fn_decl_by_hir_id(&self, hir_id: HirId) -> Option<&'hir FnDecl<'hir>> {

src/librustc/hir/mod.rs

@@ -10,11 +10,9 @@ use crate::ty::query::Providers;
 use crate::ty::TyCtxt;
 use rustc_data_structures::cold_path;
 use rustc_data_structures::fx::FxHashMap;
-use rustc_hir::def_id::DefId;
 use rustc_hir::def_id::LOCAL_CRATE;
 use rustc_hir::print;
 use rustc_hir::Body;
-use rustc_hir::BodyId;
 use rustc_hir::Crate;
 use rustc_hir::HirId;
 use rustc_hir::ItemLocalId;
@@ -52,14 +50,6 @@ impl<'tcx> Hir<'tcx> {
     pub fn krate(&self) -> &'tcx Crate<'tcx> {
         self.tcx.hir_crate(LOCAL_CRATE)
     }
-
-    pub fn body(&self, id: BodyId) -> &'tcx Body<'tcx> {
-        self.tcx
-            .hir_owner_items(DefId::local(id.hir_id.owner))
-            .bodies
-            .get(&id.hir_id.local_id)
-            .unwrap()
-    }
 }
 
 impl<'tcx> Deref for Hir<'tcx> {