Skip to content

Commit fa43727

Browse files
committed
Rename resolve_regions to resolve_regions_and_report_errors
1 parent ab369c4 commit fa43727

File tree

2 files changed

+3
-3
lines changed

2 files changed

+3
-3
lines changed

src/librustc/middle/typeck/check/regionck.rs

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -299,7 +299,7 @@ pub fn regionck_expr(fcx: &FnCtxt, e: &ast::Expr) {
299299
// regionck assumes typeck succeeded
300300
rcx.visit_expr(e, ());
301301
}
302-
fcx.infcx().resolve_regions();
302+
fcx.infcx().resolve_regions_and_report_errors();
303303
}
304304

305305
pub fn regionck_fn(fcx: &FnCtxt, blk: &ast::Block) {
@@ -309,7 +309,7 @@ pub fn regionck_fn(fcx: &FnCtxt, blk: &ast::Block) {
309309
// regionck assumes typeck succeeded
310310
rcx.visit_block(blk, ());
311311
}
312-
fcx.infcx().resolve_regions();
312+
fcx.infcx().resolve_regions_and_report_errors();
313313
}
314314

315315
impl<'a> Visitor<()> for Rcx<'a> {

src/librustc/middle/typeck/infer/mod.rs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -644,7 +644,7 @@ impl<'a> InferCtxt<'a> {
644644
self.region_vars.new_bound(binder_id)
645645
}
646646

647-
pub fn resolve_regions(&self) {
647+
pub fn resolve_regions_and_report_errors(&self) {
648648
let errors = self.region_vars.resolve_regions();
649649
self.report_region_errors(&errors); // see error_reporting.rs
650650
}

0 commit comments

Comments
 (0)