bjoernager/rust
bjoernager/rust
1
Fork 0
Code Activity

Rename At::normalize to At::query_normalize

Browse source
This commit is contained in:
Michael Goulet 2022-11-25 16:45:33 +00:00
parent 8a09420ac4
commit f12e772b83
6 changed files with 7 additions and 7 deletions
Download patch file Download diff file Expand all files Collapse all files

2
compiler/rustc_traits/src/dropck_outlives.rs
View file

@ -100,7 +100,7 @@ fn dropck_outlives<'tcx>(
// to push them onto the stack to be expanded.
for ty in constraints.dtorck_types.drain(..) {
let Normalized { value: ty, obligations } =
ocx.infcx.at(&cause, param_env).normalize(ty)?;
ocx.infcx.at(&cause, param_env).query_normalize(ty)?;
ocx.register_obligations(obligations);
debug!("dropck_outlives: ty from dtorck_types = {:?}", ty);

2
compiler/rustc_traits/src/normalize_erasing_regions.rs
View file

@ -29,7 +29,7 @@ fn try_normalize_after_erasing_regions<'tcx, T: TypeFoldable<'tcx> + PartialEq +
let ParamEnvAnd { param_env, value } = goal;
let infcx = tcx.infer_ctxt().build();
let cause = ObligationCause::dummy();
match infcx.at(&cause, param_env).normalize(value) {
match infcx.at(&cause, param_env).query_normalize(value) {
Ok(Normalized { value: normalized_value, obligations: normalized_obligations }) => {
// We don't care about the `obligations`; they are
// always only region relations, and we are about to

2
compiler/rustc_traits/src/type_op.rs
View file

@ -137,7 +137,7 @@ where
{
let (param_env, Normalize { value }) = key.into_parts();
let Normalized { value, obligations } =
ocx.infcx.at(&ObligationCause::dummy(), param_env).normalize(value)?;
ocx.infcx.at(&ObligationCause::dummy(), param_env).query_normalize(value)?;
ocx.register_obligations(obligations);
Ok(value)
}