8585use astconv:: AstConv ;
8686use check:: dropck;
8787use check:: FnCtxt ;
88- use check:: regionmanip ;
88+ use check:: implicator ;
8989use check:: vtable;
9090use middle:: def;
9191use middle:: mem_categorization as mc;
@@ -336,24 +336,24 @@ impl<'a, 'tcx> Rcx<'a, 'tcx> {
336336 let body_scope = CodeExtent :: from_node_id ( body_id) ;
337337 let body_scope = ty:: ReScope ( body_scope) ;
338338 let constraints =
339- regionmanip :: region_wf_constraints (
339+ implicator :: region_wf_constraints (
340340 tcx,
341341 ty,
342342 body_scope) ;
343343 for constraint in & constraints {
344344 debug ! ( "constraint: {}" , constraint. repr( tcx) ) ;
345345 match * constraint {
346- regionmanip :: RegionSubRegionConstraint ( _,
346+ implicator :: RegionSubRegionConstraint ( _,
347347 ty:: ReFree ( free_a) ,
348348 ty:: ReFree ( free_b) ) => {
349349 tcx. region_maps . relate_free_regions ( free_a, free_b) ;
350350 }
351- regionmanip :: RegionSubRegionConstraint ( _,
351+ implicator :: RegionSubRegionConstraint ( _,
352352 ty:: ReFree ( free_a) ,
353353 ty:: ReInfer ( ty:: ReVar ( vid_b) ) ) => {
354354 self . fcx . inh . infcx . add_given ( free_a, vid_b) ;
355355 }
356- regionmanip :: RegionSubRegionConstraint ( ..) => {
356+ implicator :: RegionSubRegionConstraint ( ..) => {
357357 // In principle, we could record (and take
358358 // advantage of) every relationship here, but
359359 // we are also free not to -- it simply means
@@ -364,7 +364,7 @@ impl<'a, 'tcx> Rcx<'a, 'tcx> {
364364 // relationship that arises here, but
365365 // presently we do not.)
366366 }
367- regionmanip :: RegionSubGenericConstraint ( _, r_a, ref generic_b) => {
367+ implicator :: RegionSubGenericConstraint ( _, r_a, ref generic_b) => {
368368 debug ! ( "RegionSubGenericConstraint: {} <= {}" ,
369369 r_a. repr( tcx) , generic_b. repr( tcx) ) ;
370370
@@ -1482,24 +1482,24 @@ pub fn type_must_outlive<'a, 'tcx>(rcx: &mut Rcx<'a, 'tcx>,
14821482 region. repr( rcx. tcx( ) ) ) ;
14831483
14841484 let constraints =
1485- regionmanip :: region_wf_constraints (
1485+ implicator :: region_wf_constraints (
14861486 rcx. tcx ( ) ,
14871487 ty,
14881488 region) ;
14891489 for constraint in & constraints {
14901490 debug ! ( "constraint: {}" , constraint. repr( rcx. tcx( ) ) ) ;
14911491 match * constraint {
1492- regionmanip :: RegionSubRegionConstraint ( None , r_a, r_b) => {
1492+ implicator :: RegionSubRegionConstraint ( None , r_a, r_b) => {
14931493 rcx. fcx . mk_subr ( origin. clone ( ) , r_a, r_b) ;
14941494 }
1495- regionmanip :: RegionSubRegionConstraint ( Some ( ty) , r_a, r_b) => {
1495+ implicator :: RegionSubRegionConstraint ( Some ( ty) , r_a, r_b) => {
14961496 let o1 = infer:: ReferenceOutlivesReferent ( ty, origin. span ( ) ) ;
14971497 rcx. fcx . mk_subr ( o1, r_a, r_b) ;
14981498 }
1499- regionmanip :: RegionSubGenericConstraint ( None , r_a, ref generic_b) => {
1499+ implicator :: RegionSubGenericConstraint ( None , r_a, ref generic_b) => {
15001500 generic_must_outlive ( rcx, origin. clone ( ) , r_a, generic_b) ;
15011501 }
1502- regionmanip :: RegionSubGenericConstraint ( Some ( ty) , r_a, ref generic_b) => {
1502+ implicator :: RegionSubGenericConstraint ( Some ( ty) , r_a, ref generic_b) => {
15031503 let o1 = infer:: ReferenceOutlivesReferent ( ty, origin. span ( ) ) ;
15041504 generic_must_outlive ( rcx, o1, r_a, generic_b) ;
15051505 }
0 commit comments