nordic-dev.net/rust
nordic-dev.net/rust
2
0
Fork 0
mirror of https://github.com/rust-lang/rust.git synced 2024-11-26 08:44:35 +00:00
Code Issues Packages Projects Releases Wiki Activity

Rename normalize_opaque_types to reveal_opaque_types_in_bounds

Browse Source
This commit is contained in:
Michael Goulet 2022-11-25 19:30:37 +00:00
parent 051cab2b84
commit 6b63d6c918
3 changed files with 6 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
compiler/rustc_middle/src/query/mod.rs
View File

@ -2077,8 +2077,8 @@ rustc_queries! {
remap_env_constness remap_env_constness
} }
query normalize_opaque_types(key: &'tcx ty::List<ty::Predicate<'tcx>>) -> &'tcx ty::List<ty::Predicate<'tcx>> { query reveal_opaque_types_in_bounds(key: &'tcx ty::List<ty::Predicate<'tcx>>) -> &'tcx ty::List<ty::Predicate<'tcx>> {
desc { "normalizing opaque types in `{:?}`", key } desc { "revealing opaque types in `{:?}`", key }
} }
query limits(key: ()) -> Limits { query limits(key: ()) -> Limits {

2
compiler/rustc_middle/src/ty/mod.rs
View File

@ -1747,7 +1747,7 @@ impl<'tcx> ParamEnv<'tcx> {
} }
ParamEnv::new( ParamEnv::new(
tcx.normalize_opaque_types(self.caller_bounds()), tcx.reveal_opaque_types_in_bounds(self.caller_bounds()),
Reveal::All, Reveal::All,
self.constness(), self.constness(),
) )

6
compiler/rustc_middle/src/ty/util.rs
View File

@ -1248,9 +1248,9 @@ where
#[derive(Copy, Clone, Debug, HashStable, TyEncodable, TyDecodable)] #[derive(Copy, Clone, Debug, HashStable, TyEncodable, TyDecodable)]
pub struct AlwaysRequiresDrop; pub struct AlwaysRequiresDrop;
/// Normalizes all opaque types in the given value, replacing them /// Reveals all opaque types in the given value, replacing them
/// with their underlying types. /// with their underlying types.
pub fn normalize_opaque_types<'tcx>( pub fn reveal_opaque_types_in_bounds<'tcx>(
tcx: TyCtxt<'tcx>, tcx: TyCtxt<'tcx>,
val: &'tcx ty::List<ty::Predicate<'tcx>>, val: &'tcx ty::List<ty::Predicate<'tcx>>,
) -> &'tcx ty::List<ty::Predicate<'tcx>> { ) -> &'tcx ty::List<ty::Predicate<'tcx>> {
@ -1287,7 +1287,7 @@ pub fn is_intrinsic(tcx: TyCtxt<'_>, def_id: DefId) -> bool {
pub fn provide(providers: &mut ty::query::Providers) { pub fn provide(providers: &mut ty::query::Providers) {
*providers = ty::query::Providers { *providers = ty::query::Providers {
normalize_opaque_types, reveal_opaque_types_in_bounds,
is_doc_hidden, is_doc_hidden,
is_doc_notable_trait, is_doc_notable_trait,
is_intrinsic, is_intrinsic,