diff options
| author | lcnr <rust@lcnr.de> | 2023-09-25 15:46:38 +0200 |
|---|---|---|
| committer | lcnr <rust@lcnr.de> | 2023-09-26 09:37:55 +0200 |
| commit | 159293cdbf9aaa32754af395dbb9833fe236a8a6 (patch) | |
| tree | f9cdfed84f12bb9d55a2974abdec3a698ea63e3a | |
| parent | 1351de36eebd2304b8905b0e29138f04ed49bb41 (diff) | |
| download | rust-159293cdbf9aaa32754af395dbb9833fe236a8a6.tar.gz rust-159293cdbf9aaa32754af395dbb9833fe236a8a6.zip | |
subst -> instantiate
| -rwxr-xr-x | scripts/filter_profile.rs | 6 | ||||
| -rw-r--r-- | src/common.rs | 2 |
2 files changed, 4 insertions, 4 deletions
diff --git a/scripts/filter_profile.rs b/scripts/filter_profile.rs index f782671fe36..03912b18ea5 100755 --- a/scripts/filter_profile.rs +++ b/scripts/filter_profile.rs @@ -100,9 +100,9 @@ fn main() -> Result<(), Box<dyn std::error::Error>> { stack = &stack[..index + ENCODE_METADATA.len()]; } - const SUBST_AND_NORMALIZE_ERASING_REGIONS: &str = "rustc_middle::ty::normalize_erasing_regions::<impl rustc_middle::ty::context::TyCtxt>::subst_and_normalize_erasing_regions"; - if let Some(index) = stack.find(SUBST_AND_NORMALIZE_ERASING_REGIONS) { - stack = &stack[..index + SUBST_AND_NORMALIZE_ERASING_REGIONS.len()]; + const INSTANTIATE_AND_NORMALIZE_ERASING_REGIONS: &str = "rustc_middle::ty::normalize_erasing_regions::<impl rustc_middle::ty::context::TyCtxt>::instantiate_and_normalize_erasing_regions"; + if let Some(index) = stack.find(INSTANTIATE_AND_NORMALIZE_ERASING_REGIONS) { + stack = &stack[..index + INSTANTIATE_AND_NORMALIZE_ERASING_REGIONS.len()]; } const NORMALIZE_ERASING_LATE_BOUND_REGIONS: &str = "rustc_middle::ty::normalize_erasing_regions::<impl rustc_middle::ty::context::TyCtxt>::normalize_erasing_late_bound_regions"; diff --git a/src/common.rs b/src/common.rs index ec2da39398b..359b430b4e5 100644 --- a/src/common.rs +++ b/src/common.rs @@ -359,7 +359,7 @@ impl<'tcx> FunctionCx<'_, '_, 'tcx> { where T: TypeFoldable<TyCtxt<'tcx>> + Copy, { - self.instance.subst_mir_and_normalize_erasing_regions( + self.instance.instantiate_mir_and_normalize_erasing_regions( self.tcx, ty::ParamEnv::reveal_all(), ty::EarlyBinder::bind(value), |