---

yaml
---
r: 147580
b: refs/heads/try2
c: a5f4a40
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: ff2d16e119093d98ab2d8fa1802e7e200475c729
+refs/heads/try2: a5f4a40f24109f94b4c1e568bf312105f07b1734
 refs/heads/dist-snap: ba4081a5a8573875fed17545846f6f6902c8ba8d
 refs/tags/release-0.2: c870d2dffb391e14efb05aa27898f1f6333a9596
 refs/tags/release-0.3: b5f0d0f648d9a6153664837026ba1be43d3e2503

branches/try2/src/librustc/middle/typeck/check/method.rs

@@ -1326,7 +1326,7 @@ impl<'a> LookupContext<'a> {
                  ty::item_path_str(self.tcx(), did)));
     }
 
-    fn infcx(&self) -> @mut infer::InferCtxt {
+    fn infcx(&self) -> @infer::InferCtxt {
         self.fcx.inh.infcx
     }
 

branches/try2/src/librustc/middle/typeck/check/mod.rs

@@ -157,7 +157,7 @@ pub struct SelfInfo {
 /// `bar()` will each have their own `FnCtxt`, but they will
 /// share the inherited fields.
 pub struct Inherited {
-    infcx: @mut infer::InferCtxt,
+    infcx: @infer::InferCtxt,
     locals: @mut HashMap<ast::NodeId, ty::t>,
     param_env: ty::ParameterEnvironment,
 
@@ -1045,7 +1045,7 @@ impl AstConv for FnCtxt {
 }
 
 impl FnCtxt {
-    pub fn infcx(&self) -> @mut infer::InferCtxt {
+    pub fn infcx(&self) -> @infer::InferCtxt {
         self.inh.infcx
     }
 
@@ -1061,7 +1061,7 @@ impl FnCtxt {
     }
 }
 
-impl RegionScope for @mut infer::InferCtxt {
+impl RegionScope for @infer::InferCtxt {
     fn anon_regions(&self,
                     span: Span,
                     count: uint) -> Result<~[ty::Region], ()> {

branches/try2/src/librustc/middle/typeck/check/vtable.rs

@@ -70,7 +70,7 @@ pub struct LocationInfo {
 /// A vtable context includes an inference context, a crate context, and a
 /// callback function to call in case of type error.
 pub struct VtableContext<'a> {
-    infcx: @mut infer::InferCtxt,
+    infcx: @infer::InferCtxt,
     param_env: &'a ty::ParameterEnvironment,
 }
 

branches/try2/src/librustc/middle/typeck/coherence.rs

@@ -55,7 +55,7 @@ pub struct UniversalQuantificationResult {
     type_param_defs: @~[ty::TypeParameterDef]
 }
 
-pub fn get_base_type(inference_context: @mut InferCtxt,
+pub fn get_base_type(inference_context: @InferCtxt,
                      span: Span,
                      original_type: t)
                   -> Option<t> {
@@ -118,7 +118,7 @@ pub fn type_is_defined_in_local_crate(original_type: t) -> bool {
 }
 
 // Returns the def ID of the base type, if there is one.
-pub fn get_base_type_def_id(inference_context: @mut InferCtxt,
+pub fn get_base_type_def_id(inference_context: @InferCtxt,
                             span: Span,
                             original_type: t)
                          -> Option<DefId> {
@@ -151,7 +151,7 @@ pub fn CoherenceChecker(crate_context: @CrateCtxt) -> CoherenceChecker {
 
 pub struct CoherenceChecker {
     crate_context: @CrateCtxt,
-    inference_context: @mut InferCtxt,
+    inference_context: @InferCtxt,
 }
 
 struct CoherenceCheckVisitor { cc: CoherenceChecker }

branches/try2/src/librustc/middle/typeck/infer/combine.rs

@@ -67,7 +67,7 @@ use syntax::opt_vec;
 use syntax::abi::AbiSet;
 
 pub trait Combine {
-    fn infcx(&self) -> @mut InferCtxt;
+    fn infcx(&self) -> @InferCtxt;
     fn tag(&self) -> ~str;
     fn a_is_expected(&self) -> bool;
     fn trace(&self) -> TypeTrace;
@@ -328,7 +328,7 @@ pub trait Combine {
 }
 
 pub struct CombineFields {
-    infcx: @mut InferCtxt,
+    infcx: @InferCtxt,
     a_is_expected: bool,
     trace: TypeTrace,
 }

branches/try2/src/librustc/middle/typeck/infer/error_reporting.rs

@@ -77,33 +77,33 @@ use util::ppaux::bound_region_to_str;
 use util::ppaux::note_and_explain_region;
 
 pub trait ErrorReporting {
-    fn report_region_errors(@mut self,
+    fn report_region_errors(@self,
                             errors: &OptVec<RegionResolutionError>);
 
-    fn report_and_explain_type_error(@mut self,
+    fn report_and_explain_type_error(@self,
                                      trace: TypeTrace,
                                      terr: &ty::type_err);
 
-    fn values_str(@mut self, values: &ValuePairs) -> Option<~str>;
+    fn values_str(@self, values: &ValuePairs) -> Option<~str>;
 
     fn expected_found_str<T:UserString+Resolvable>(
-        @mut self,
+        @self,
         exp_found: &ty::expected_found<T>)
         -> Option<~str>;
 
-    fn report_concrete_failure(@mut self,
+    fn report_concrete_failure(@self,
                                origin: SubregionOrigin,
                                sub: Region,
                                sup: Region);
 
-    fn report_sub_sup_conflict(@mut self,
+    fn report_sub_sup_conflict(@self,
                                var_origin: RegionVariableOrigin,
                                sub_origin: SubregionOrigin,
                                sub_region: Region,
                                sup_origin: SubregionOrigin,
                                sup_region: Region);
 
-    fn report_sup_sup_conflict(@mut self,
+    fn report_sup_sup_conflict(@self,
                                var_origin: RegionVariableOrigin,
                                origin1: SubregionOrigin,
                                region1: Region,
@@ -112,15 +112,15 @@ pub trait ErrorReporting {
 }
 
 trait ErrorReportingHelpers {
-    fn report_inference_failure(@mut self,
+    fn report_inference_failure(@self,
                                 var_origin: RegionVariableOrigin);
 
-    fn note_region_origin(@mut self,
+    fn note_region_origin(@self,
                           origin: SubregionOrigin);
 }
 
 impl ErrorReporting for InferCtxt {
-    fn report_region_errors(@mut self,
+    fn report_region_errors(@self,
                             errors: &OptVec<RegionResolutionError>) {
         for error in errors.iter() {
             match *error {
@@ -147,7 +147,7 @@ impl ErrorReporting for InferCtxt {
         }
     }
 
-    fn report_and_explain_type_error(@mut self,
+    fn report_and_explain_type_error(@self,
                                      trace: TypeTrace,
                                      terr: &ty::type_err) {
         let tcx = self.tcx;
@@ -179,7 +179,7 @@ impl ErrorReporting for InferCtxt {
         ty::note_and_explain_type_err(self.tcx, terr);
     }
 
-    fn values_str(@mut self, values: &ValuePairs) -> Option<~str> {
+    fn values_str(@self, values: &ValuePairs) -> Option<~str> {
         /*!
          * Returns a string of the form "expected `{}` but found `{}`",
          * or None if this is a derived error.
@@ -195,7 +195,7 @@ impl ErrorReporting for InferCtxt {
     }
 
     fn expected_found_str<T:UserString+Resolvable>(
-        @mut self,
+        @self,
         exp_found: &ty::expected_found<T>)
         -> Option<~str>
     {
@@ -214,7 +214,7 @@ impl ErrorReporting for InferCtxt {
                   found.user_string(self.tcx)))
     }
 
-    fn report_concrete_failure(@mut self,
+    fn report_concrete_failure(@self,
                                origin: SubregionOrigin,
                                sub: Region,
                                sup: Region) {
@@ -400,7 +400,7 @@ impl ErrorReporting for InferCtxt {
         }
     }
 
-    fn report_sub_sup_conflict(@mut self,
+    fn report_sub_sup_conflict(@self,
                                var_origin: RegionVariableOrigin,
                                sub_origin: SubregionOrigin,
                                sub_region: Region,
@@ -425,7 +425,7 @@ impl ErrorReporting for InferCtxt {
         self.note_region_origin(sub_origin);
     }
 
-    fn report_sup_sup_conflict(@mut self,
+    fn report_sup_sup_conflict(@self,
                                var_origin: RegionVariableOrigin,
                                origin1: SubregionOrigin,
                                region1: Region,
@@ -452,7 +452,7 @@ impl ErrorReporting for InferCtxt {
 }
 
 impl ErrorReportingHelpers for InferCtxt {
-    fn report_inference_failure(@mut self,
+    fn report_inference_failure(@self,
                                 var_origin: RegionVariableOrigin) {
         let var_description = match var_origin {
             infer::MiscVariable(_) => ~"",
@@ -484,8 +484,7 @@ impl ErrorReportingHelpers for InferCtxt {
                     var_description));
     }
 
-    fn note_region_origin(@mut self,
-                          origin: SubregionOrigin) {
+    fn note_region_origin(@self, origin: SubregionOrigin) {
         match origin {
             infer::Subtype(ref trace) => {
                 let desc = match trace.origin {
@@ -612,12 +611,12 @@ impl ErrorReportingHelpers for InferCtxt {
 }
 
 trait Resolvable {
-    fn resolve(&self, infcx: @mut InferCtxt) -> Self;
+    fn resolve(&self, infcx: @InferCtxt) -> Self;
     fn contains_error(&self) -> bool;
 }
 
 impl Resolvable for ty::t {
-    fn resolve(&self, infcx: @mut InferCtxt) -> ty::t {
+    fn resolve(&self, infcx: @InferCtxt) -> ty::t {
         infcx.resolve_type_vars_if_possible(*self)
     }
     fn contains_error(&self) -> bool {
@@ -626,7 +625,7 @@ impl Resolvable for ty::t {
 }
 
 impl Resolvable for @ty::TraitRef {
-    fn resolve(&self, infcx: @mut InferCtxt) -> @ty::TraitRef {
+    fn resolve(&self, infcx: @InferCtxt) -> @ty::TraitRef {
         @infcx.resolve_type_vars_in_trait_ref_if_possible(*self)
     }
     fn contains_error(&self) -> bool {

branches/try2/src/librustc/middle/typeck/infer/glb.rs

@@ -30,7 +30,7 @@ use util::ppaux::mt_to_str;
 pub struct Glb(CombineFields);  // "greatest lower bound" (common subtype)
 
 impl Combine for Glb {
-    fn infcx(&self) -> @mut InferCtxt { self.infcx }
+    fn infcx(&self) -> @InferCtxt { self.infcx }
     fn tag(&self) -> ~str { ~"glb" }
     fn a_is_expected(&self) -> bool { self.a_is_expected }
     fn trace(&self) -> TypeTrace { self.trace }

branches/try2/src/librustc/middle/typeck/infer/lub.rs

@@ -36,7 +36,7 @@ impl Lub {
 }
 
 impl Combine for Lub {
-    fn infcx(&self) -> @mut InferCtxt { self.infcx }
+    fn infcx(&self) -> @InferCtxt { self.infcx }
     fn tag(&self) -> ~str { ~"lub" }
     fn a_is_expected(&self) -> bool { self.a_is_expected }
     fn trace(&self) -> TypeTrace { self.trace }