---

yaml
---
r: 147662
b: refs/heads/try2
c: 75c95e0
h: refs/heads/master
v: v3

Author: pcwalton

[refs]

@@ -5,7 +5,7 @@ refs/heads/snap-stage3: 78a7676898d9f80ab540c6df5d4c9ce35bb50463
 refs/heads/try: 519addf6277dbafccbb4159db4b710c37eaa2ec5
 refs/tags/release-0.1: 1f5c5126e96c79d22cb7862f75304136e204f105
 refs/heads/ndm: f3868061cd7988080c30d6d5bf352a5a5fe2460b
-refs/heads/try2: f759fe15a1f796f0c9f201891aa642e2eadd5d42
+refs/heads/try2: 75c95e096075f3720c2461f2c61d5b73646b22f7
 refs/heads/dist-snap: ba4081a5a8573875fed17545846f6f6902c8ba8d
 refs/tags/release-0.2: c870d2dffb391e14efb05aa27898f1f6333a9596
 refs/tags/release-0.3: b5f0d0f648d9a6153664837026ba1be43d3e2503

branches/try2/src/librustc/middle/region.rs

@@ -69,12 +69,12 @@ struct RegionResolutionVisitor {
     sess: Session,
 
     // Generated maps:
-    region_maps: @mut RegionMaps,
+    region_maps: @RegionMaps,
 }
 
 
 impl RegionMaps {
-    pub fn relate_free_regions(&mut self, sub: FreeRegion, sup: FreeRegion) {
+    pub fn relate_free_regions(&self, sub: FreeRegion, sup: FreeRegion) {
         let mut free_region_map = self.free_region_map.borrow_mut();
         match free_region_map.get().find_mut(&sub) {
             Some(sups) => {
@@ -91,15 +91,15 @@ impl RegionMaps {
         free_region_map.get().insert(sub, ~[sup]);
     }
 
-    pub fn record_parent(&mut self, sub: ast::NodeId, sup: ast::NodeId) {
+    pub fn record_parent(&self, sub: ast::NodeId, sup: ast::NodeId) {
         debug!("record_parent(sub={:?}, sup={:?})", sub, sup);
         assert!(sub != sup);
 
         let mut scope_map = self.scope_map.borrow_mut();
         scope_map.get().insert(sub, sup);
     }
 
-    pub fn record_cleanup_scope(&mut self, scope_id: ast::NodeId) {
+    pub fn record_cleanup_scope(&self, scope_id: ast::NodeId) {
         //! Records that a scope is a CLEANUP SCOPE.  This is invoked
         //! from within regionck.  We wait until regionck because we do
         //! not know which operators are overloaded until that point,
@@ -504,10 +504,8 @@ impl Visitor<Context> for RegionResolutionVisitor {
     }
 }
 
-pub fn resolve_crate(sess: Session,
-                     crate: &ast::Crate) -> @mut RegionMaps
-{
-    let region_maps = @mut RegionMaps {
+pub fn resolve_crate(sess: Session, crate: &ast::Crate) -> @RegionMaps {
+    let region_maps = @RegionMaps {
         scope_map: RefCell::new(HashMap::new()),
         free_region_map: RefCell::new(HashMap::new()),
         cleanup_scopes: RefCell::new(HashSet::new()),

branches/try2/src/librustc/middle/ty.rs

@@ -272,7 +272,7 @@ struct ctxt_ {
 
     named_region_map: @RefCell<resolve_lifetime::NamedRegionMap>,
 
-    region_maps: @mut middle::region::RegionMaps,
+    region_maps: @middle::region::RegionMaps,
 
     // Stores the types for various nodes in the AST.  Note that this table
     // is not guaranteed to be populated until after typeck.  See
@@ -962,7 +962,7 @@ pub fn mk_ctxt(s: session::Session,
                named_region_map: @RefCell<resolve_lifetime::NamedRegionMap>,
                amap: ast_map::map,
                freevars: freevars::freevar_map,
-               region_maps: @mut middle::region::RegionMaps,
+               region_maps: @middle::region::RegionMaps,
                lang_items: middle::lang_items::LanguageItems)
             -> ctxt {
     @ctxt_ {