dnrops
/
rust
mirror of https://github.com/rust-lang/rust.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Rename resolve_regions to resolve_regions_and_report_errors

This commit is contained in:
Niko Matsakis 2014-05-08 16:26:38 -04:00
parent ab369c4353
commit fa43727781
2 changed files with 3 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
src/librustc/middle/typeck/check/regionck.rs
View File

@ -299,7 +299,7 @@ pub fn regionck_expr(fcx: &FnCtxt, e: &ast::Expr) {
// regionck assumes typeck succeeded // regionck assumes typeck succeeded
rcx.visit_expr(e, ()); rcx.visit_expr(e, ());
} }
fcx.infcx().resolve_regions(); fcx.infcx().resolve_regions_and_report_errors();
} }
pub fn regionck_fn(fcx: &FnCtxt, blk: &ast::Block) { 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 // regionck assumes typeck succeeded
rcx.visit_block(blk, ()); rcx.visit_block(blk, ());
} }
fcx.infcx().resolve_regions(); fcx.infcx().resolve_regions_and_report_errors();
} }
impl<'a> Visitor<()> for Rcx<'a> { impl<'a> Visitor<()> for Rcx<'a> {

2
src/librustc/middle/typeck/infer/mod.rs
View File

@ -644,7 +644,7 @@ impl<'a> InferCtxt<'a> {
self.region_vars.new_bound(binder_id) 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(); let errors = self.region_vars.resolve_regions();
self.report_region_errors(&errors); // see error_reporting.rs self.report_region_errors(&errors); // see error_reporting.rs
} }