Skip to content

Commit 8ef7369

Browse files
committed
Rename implied_bounds_tys to implied_bounds_tys_compat
1 parent 6c0916d commit 8ef7369

File tree

7 files changed

+11
-11
lines changed

7 files changed

+11
-11
lines changed

compiler/rustc_hir_analysis/src/check/check.rs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -355,7 +355,7 @@ fn check_opaque_meets_bounds<'tcx>(
355355
// Can have different predicates to their defining use
356356
hir::OpaqueTyOrigin::TyAlias { .. } => {
357357
let wf_tys = ocx.assumed_wf_types_and_report_errors(param_env, def_id)?;
358-
let implied_bounds = infcx.implied_bounds_tys(param_env, def_id, wf_tys);
358+
let implied_bounds = infcx.implied_bounds_tys_compat(param_env, def_id, wf_tys);
359359
let outlives_env = OutlivesEnvironment::with_bounds(param_env, implied_bounds);
360360
ocx.resolve_regions_and_report_errors(defining_use_anchor, &outlives_env)?;
361361
}

compiler/rustc_hir_analysis/src/check/compare_impl_item.rs

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -404,7 +404,7 @@ fn compare_method_predicate_entailment<'tcx>(
404404
// lifetime parameters.
405405
let outlives_env = OutlivesEnvironment::with_bounds(
406406
param_env,
407-
infcx.implied_bounds_tys(param_env, impl_m_def_id, wf_tys),
407+
infcx.implied_bounds_tys_compat(param_env, impl_m_def_id, wf_tys),
408408
);
409409
let errors = infcx.resolve_regions(&outlives_env);
410410
if !errors.is_empty() {
@@ -880,7 +880,7 @@ pub(super) fn collect_return_position_impl_trait_in_trait_tys<'tcx>(
880880
// lifetime parameters.
881881
let outlives_env = OutlivesEnvironment::with_bounds(
882882
param_env,
883-
infcx.implied_bounds_tys(param_env, impl_m_def_id, wf_tys),
883+
infcx.implied_bounds_tys_compat(param_env, impl_m_def_id, wf_tys),
884884
);
885885
ocx.resolve_regions_and_report_errors(impl_m_def_id, &outlives_env)?;
886886

@@ -2240,7 +2240,7 @@ pub(super) fn check_type_bounds<'tcx>(
22402240

22412241
// Finally, resolve all regions. This catches wily misuses of
22422242
// lifetime parameters.
2243-
let implied_bounds = infcx.implied_bounds_tys(param_env, impl_ty_def_id, assumed_wf_types);
2243+
let implied_bounds = infcx.implied_bounds_tys_compat(param_env, impl_ty_def_id, assumed_wf_types);
22442244
let outlives_env = OutlivesEnvironment::with_bounds(param_env, implied_bounds);
22452245
ocx.resolve_regions_and_report_errors(impl_ty_def_id, &outlives_env)
22462246
}

compiler/rustc_hir_analysis/src/check/compare_impl_item/refine.rs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -161,7 +161,7 @@ pub(super) fn check_refining_return_position_impl_trait_in_trait<'tcx>(
161161
}
162162
let outlives_env = OutlivesEnvironment::with_bounds(
163163
param_env,
164-
infcx.implied_bounds_tys(param_env, impl_m.def_id.expect_local(), implied_wf_types),
164+
infcx.implied_bounds_tys_compat(param_env, impl_m.def_id.expect_local(), implied_wf_types),
165165
);
166166
let errors = infcx.resolve_regions(&outlives_env);
167167
if !errors.is_empty() {

compiler/rustc_hir_analysis/src/check/wfcheck.rs

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -110,7 +110,7 @@ where
110110

111111
let assumed_wf_types = wfcx.ocx.assumed_wf_types_and_report_errors(param_env, body_def_id)?;
112112

113-
let implied_bounds = infcx.implied_bounds_tys(param_env, body_def_id, assumed_wf_types);
113+
let implied_bounds = infcx.implied_bounds_tys_compat(param_env, body_def_id, assumed_wf_types);
114114

115115
let errors = wfcx.select_all_or_error();
116116
if !errors.is_empty() {
@@ -717,7 +717,7 @@ fn resolve_regions_with_wf_tys<'tcx>(
717717
let infcx = tcx.infer_ctxt().build();
718718
let outlives_environment = OutlivesEnvironment::with_bounds(
719719
param_env,
720-
infcx.implied_bounds_tys(param_env, id, wf_tys.clone()),
720+
infcx.implied_bounds_tys_compat(param_env, id, wf_tys.clone()),
721721
);
722722
let region_bound_pairs = outlives_environment.region_bound_pairs();
723723

compiler/rustc_hir_analysis/src/impl_wf_check/min_specialization.rs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -202,7 +202,7 @@ fn get_impl_args(
202202
return Err(guar);
203203
}
204204

205-
let implied_bounds = infcx.implied_bounds_tys(param_env, impl1_def_id, assumed_wf_types);
205+
let implied_bounds = infcx.implied_bounds_tys_compat(param_env, impl1_def_id, assumed_wf_types);
206206
let outlives_env = OutlivesEnvironment::with_bounds(param_env, implied_bounds);
207207
let _ = ocx.resolve_regions_and_report_errors(impl1_def_id, &outlives_env);
208208
let Ok(impl2_args) = infcx.fully_resolve(impl2_args) else {

compiler/rustc_trait_selection/src/traits/misc.rs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -191,7 +191,7 @@ pub fn all_fields_implement_trait<'tcx>(
191191
// Check regions assuming the self type of the impl is WF
192192
let outlives_env = OutlivesEnvironment::with_bounds(
193193
param_env,
194-
infcx.implied_bounds_tys(
194+
infcx.implied_bounds_tys_compat(
195195
param_env,
196196
parent_cause.body_id,
197197
FxIndexSet::from_iter([self_type]),

compiler/rustc_trait_selection/src/traits/outlives_bounds.rs

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -18,7 +18,7 @@ pub trait InferCtxtExt<'a, 'tcx> {
1818
ty: Ty<'tcx>,
1919
) -> Vec<OutlivesBound<'tcx>>;
2020

21-
fn implied_bounds_tys(
21+
fn implied_bounds_tys_compat(
2222
&'a self,
2323
param_env: ty::ParamEnv<'tcx>,
2424
body_id: LocalDefId,
@@ -121,7 +121,7 @@ impl<'a, 'tcx: 'a> InferCtxtExt<'a, 'tcx> for InferCtxt<'tcx> {
121121
bounds
122122
}
123123

124-
fn implied_bounds_tys(
124+
fn implied_bounds_tys_compat(
125125
&'a self,
126126
param_env: ParamEnv<'tcx>,
127127
body_id: LocalDefId,

0 commit comments

Comments
 (0)