librustc: Removed the RefCell wrapping DefMap in CrateMap

Author: gereeter

src/librustc_driver/driver.rs

@@ -600,8 +600,7 @@ pub fn phase_3_run_analysis_passes<'tcx>(sess: Session,
     syntax::ext::mtwt::clear_tables();
 
     let named_region_map = time(time_passes, "lifetime resolution", (),
-                                |_| middle::resolve_lifetime::krate(&sess, krate,
-                                                                    &def_map.borrow()));
+                                |_| middle::resolve_lifetime::krate(&sess, krate, &def_map));
 
     time(time_passes, "looking for entry point", (),
          |_| middle::entry::find_entry_point(&sess, &ast_map));
@@ -618,11 +617,11 @@ pub fn phase_3_run_analysis_passes<'tcx>(sess: Session,
          middle::check_loop::check_crate(&sess, krate));
 
     time(time_passes, "static item recursion checking", (), |_|
-         middle::check_static_recursion::check_crate(&sess, krate, &def_map.borrow(), &ast_map));
+         middle::check_static_recursion::check_crate(&sess, krate, &def_map, &ast_map));
 
     let ty_cx = ty::mk_ctxt(sess,
                             arenas,
-                            def_map.into_inner(),
+                            def_map,
                             named_region_map,
                             ast_map,
                             freevars,

src/librustc_driver/test.rs

@@ -129,7 +129,7 @@ fn test_env<F>(source_string: &str,
     let region_map = region::resolve_crate(&sess, krate);
     let tcx = ty::mk_ctxt(sess,
                           &arenas,
-                          def_map.into_inner(),
+                          def_map,
                           named_region_map,
                           ast_map,
                           freevars,

src/librustc_resolve/lib.rs

@@ -3519,7 +3519,7 @@ fn module_to_string(module: &Module) -> String {
 
 
 pub struct CrateMap {
-    pub def_map: RefCell<DefMap>,
+    pub def_map: DefMap,
     pub freevars: RefCell<FreevarMap>,
     pub export_map: ExportMap,
     pub trait_map: TraitMap,
@@ -3557,7 +3557,7 @@ pub fn resolve_crate<'a, 'tcx>(session: &'a Session,
     check_unused::check_crate(&mut resolver, krate);
 
     CrateMap {
-        def_map: RefCell::new(resolver.def_map),
+        def_map: resolver.def_map,
         freevars: resolver.freevars,
         export_map: resolver.export_map,
         trait_map: resolver.trait_map,