bjoernager/rust
bjoernager/rust
1
Fork 0
Code Activity

Make opaque type map key be of type OpaqueTypeKey

Browse source
This commit is contained in:
Santiago Pastorino 2021-06-07 16:57:44 -03:00
parent 7294f49d52
commit 37ab718350
No known key found for this signature in database
GPG key ID: 8131A24E0C79EFAF
5 changed files with 21 additions and 11 deletions
Download patch file Download diff file Expand all files Collapse all files

14
compiler/rustc_trait_selection/src/opaque_types.rs
View file

@ -17,7 +17,7 @@ use rustc_span::Span;
use std::ops::ControlFlow;
pub type OpaqueTypeMap<'tcx> = VecMap<DefId, OpaqueTypeDecl<'tcx>>;
pub type OpaqueTypeMap<'tcx> = VecMap<OpaqueTypeKey<'tcx>, OpaqueTypeDecl<'tcx>>;
/// Information about the opaque types whose values we
/// are inferring in this function (these are the `impl Trait` that
@ -370,7 +370,8 @@ impl<'a, 'tcx> InferCtxtExt<'tcx> for InferCtxt<'a, 'tcx> {
) {
debug!("constrain_opaque_types()");
for &(def_id, opaque_defn) in opaque_types {
for &(opaque_type_key, opaque_defn) in opaque_types {
let OpaqueTypeKey { def_id, substs: _ } = opaque_type_key;
self.constrain_opaque_type(
def_id,
&opaque_defn,
@ -1041,7 +1042,12 @@ impl<'a, 'tcx> Instantiator<'a, 'tcx> {
// Use the same type variable if the exact same opaque type appears more
// than once in the return type (e.g., if it's passed to a type alias).
if let Some(opaque_defn) = self.opaque_types.get(&def_id) {
if let Some(opaque_defn) = self
.opaque_types
.iter()
.find(|(opaque_type_key, _)| opaque_type_key.def_id == def_id)
.map(|(_, opaque_defn)| opaque_defn)
{
debug!("instantiate_opaque_types: returning concrete ty {:?}", opaque_defn.concrete_ty);
return opaque_defn.concrete_ty;
}
@ -1079,7 +1085,7 @@ impl<'a, 'tcx> Instantiator<'a, 'tcx> {
let definition_span = self.value_span;
self.opaque_types.insert(
def_id,
OpaqueTypeKey { def_id, substs },
OpaqueTypeDecl {
opaque_type: ty,
substs,