85
85
use astconv:: AstConv ;
86
86
use check:: dropck;
87
87
use check:: FnCtxt ;
88
- use check:: regionmanip ;
88
+ use check:: implicator ;
89
89
use check:: vtable;
90
90
use middle:: def;
91
91
use middle:: mem_categorization as mc;
@@ -336,24 +336,24 @@ impl<'a, 'tcx> Rcx<'a, 'tcx> {
336
336
let body_scope = CodeExtent :: from_node_id ( body_id) ;
337
337
let body_scope = ty:: ReScope ( body_scope) ;
338
338
let constraints =
339
- regionmanip :: region_wf_constraints (
339
+ implicator :: region_wf_constraints (
340
340
tcx,
341
341
ty,
342
342
body_scope) ;
343
343
for constraint in & constraints {
344
344
debug ! ( "constraint: {}" , constraint. repr( tcx) ) ;
345
345
match * constraint {
346
- regionmanip :: RegionSubRegionConstraint ( _,
346
+ implicator :: RegionSubRegionConstraint ( _,
347
347
ty:: ReFree ( free_a) ,
348
348
ty:: ReFree ( free_b) ) => {
349
349
tcx. region_maps . relate_free_regions ( free_a, free_b) ;
350
350
}
351
- regionmanip :: RegionSubRegionConstraint ( _,
351
+ implicator :: RegionSubRegionConstraint ( _,
352
352
ty:: ReFree ( free_a) ,
353
353
ty:: ReInfer ( ty:: ReVar ( vid_b) ) ) => {
354
354
self . fcx . inh . infcx . add_given ( free_a, vid_b) ;
355
355
}
356
- regionmanip :: RegionSubRegionConstraint ( ..) => {
356
+ implicator :: RegionSubRegionConstraint ( ..) => {
357
357
// In principle, we could record (and take
358
358
// advantage of) every relationship here, but
359
359
// we are also free not to -- it simply means
@@ -364,7 +364,7 @@ impl<'a, 'tcx> Rcx<'a, 'tcx> {
364
364
// relationship that arises here, but
365
365
// presently we do not.)
366
366
}
367
- regionmanip :: RegionSubGenericConstraint ( _, r_a, ref generic_b) => {
367
+ implicator :: RegionSubGenericConstraint ( _, r_a, ref generic_b) => {
368
368
debug ! ( "RegionSubGenericConstraint: {} <= {}" ,
369
369
r_a. repr( tcx) , generic_b. repr( tcx) ) ;
370
370
@@ -1482,24 +1482,24 @@ pub fn type_must_outlive<'a, 'tcx>(rcx: &mut Rcx<'a, 'tcx>,
1482
1482
region. repr( rcx. tcx( ) ) ) ;
1483
1483
1484
1484
let constraints =
1485
- regionmanip :: region_wf_constraints (
1485
+ implicator :: region_wf_constraints (
1486
1486
rcx. tcx ( ) ,
1487
1487
ty,
1488
1488
region) ;
1489
1489
for constraint in & constraints {
1490
1490
debug ! ( "constraint: {}" , constraint. repr( rcx. tcx( ) ) ) ;
1491
1491
match * constraint {
1492
- regionmanip :: RegionSubRegionConstraint ( None , r_a, r_b) => {
1492
+ implicator :: RegionSubRegionConstraint ( None , r_a, r_b) => {
1493
1493
rcx. fcx . mk_subr ( origin. clone ( ) , r_a, r_b) ;
1494
1494
}
1495
- regionmanip :: RegionSubRegionConstraint ( Some ( ty) , r_a, r_b) => {
1495
+ implicator :: RegionSubRegionConstraint ( Some ( ty) , r_a, r_b) => {
1496
1496
let o1 = infer:: ReferenceOutlivesReferent ( ty, origin. span ( ) ) ;
1497
1497
rcx. fcx . mk_subr ( o1, r_a, r_b) ;
1498
1498
}
1499
- regionmanip :: RegionSubGenericConstraint ( None , r_a, ref generic_b) => {
1499
+ implicator :: RegionSubGenericConstraint ( None , r_a, ref generic_b) => {
1500
1500
generic_must_outlive ( rcx, origin. clone ( ) , r_a, generic_b) ;
1501
1501
}
1502
- regionmanip :: RegionSubGenericConstraint ( Some ( ty) , r_a, ref generic_b) => {
1502
+ implicator :: RegionSubGenericConstraint ( Some ( ty) , r_a, ref generic_b) => {
1503
1503
let o1 = infer:: ReferenceOutlivesReferent ( ty, origin. span ( ) ) ;
1504
1504
generic_must_outlive ( rcx, o1, r_a, generic_b) ;
1505
1505
}
0 commit comments