Rename resolve_regions to resolve_regions_and_report_errors

rust-lang · May 9, 2014 · fa43727 · fa43727
1 parent ab369c4
commit fa43727
Show file tree

Hide file tree

Showing 2 changed files with 3 additions and 3 deletions.
diff --git a/src/librustc/middle/typeck/check/regionck.rs b/src/librustc/middle/typeck/check/regionck.rs
@@ -299,7 +299,7 @@ pub fn regionck_expr(fcx: &FnCtxt, e: &ast::Expr) {
         // regionck assumes typeck succeeded
         rcx.visit_expr(e, ());
     }
-    fcx.infcx().resolve_regions();
+    fcx.infcx().resolve_regions_and_report_errors();
 }
 
 pub fn regionck_fn(fcx: &FnCtxt, blk: &ast::Block) {
@@ -309,7 +309,7 @@ pub fn regionck_fn(fcx: &FnCtxt, blk: &ast::Block) {
         // regionck assumes typeck succeeded
         rcx.visit_block(blk, ());
     }
-    fcx.infcx().resolve_regions();
+    fcx.infcx().resolve_regions_and_report_errors();
 }
 
 impl<'a> Visitor<()> for Rcx<'a> {

diff --git a/src/librustc/middle/typeck/infer/mod.rs b/src/librustc/middle/typeck/infer/mod.rs
@@ -644,7 +644,7 @@ impl<'a> InferCtxt<'a> {
         self.region_vars.new_bound(binder_id)
     }
 
-    pub fn resolve_regions(&self) {
+    pub fn resolve_regions_and_report_errors(&self) {
         let errors = self.region_vars.resolve_regions();
         self.report_region_errors(&errors); // see error_reporting.rs
     }