mikros/rust
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Remove unnecessary StructurallyRelateAliases from CombineFields/TypeRelating

Browse Source
This commit is contained in:
Michael Goulet 2024-10-04 13:07:34 -04:00
parent 3da257a98d
commit 30a2ecddb4
2 changed files with 2 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
compiler/rustc_infer/src/infer/at.rs
View File

@ -31,7 +31,7 @@
use super::*; use super::*;
use crate::infer::relate::type_relating::TypeRelating; use crate::infer::relate::type_relating::TypeRelating;
use crate::infer::relate::{Relate, StructurallyRelateAliases, TypeRelation}; use crate::infer::relate::{Relate, TypeRelation};
/// Whether we should define opaque types or just treat them opaquely. /// Whether we should define opaque types or just treat them opaquely.
/// ///
@ -114,7 +114,6 @@ pub fn sup<T>(
ToTrace::to_trace(self.cause, expected, actual), ToTrace::to_trace(self.cause, expected, actual),
self.param_env, self.param_env,
define_opaque_types, define_opaque_types,
StructurallyRelateAliases::No,
ty::Contravariant, ty::Contravariant,
); );
op.relate(expected, actual)?; op.relate(expected, actual)?;
@ -136,7 +135,6 @@ pub fn sub<T>(
ToTrace::to_trace(self.cause, expected, actual), ToTrace::to_trace(self.cause, expected, actual),
self.param_env, self.param_env,
define_opaque_types, define_opaque_types,
StructurallyRelateAliases::No,
ty::Covariant, ty::Covariant,
); );
op.relate(expected, actual)?; op.relate(expected, actual)?;
@ -177,7 +175,6 @@ pub fn eq_trace<T>(
trace, trace,
self.param_env, self.param_env,
define_opaque_types, define_opaque_types,
StructurallyRelateAliases::No,
ty::Invariant, ty::Invariant,
); );
op.relate(expected, actual)?; op.relate(expected, actual)?;

5
compiler/rustc_infer/src/infer/relate/type_relating.rs
View File

@ -21,7 +21,6 @@ pub(crate) struct TypeRelating<'infcx, 'tcx> {
trace: TypeTrace<'tcx>, trace: TypeTrace<'tcx>,
param_env: ty::ParamEnv<'tcx>, param_env: ty::ParamEnv<'tcx>,
define_opaque_types: DefineOpaqueTypes, define_opaque_types: DefineOpaqueTypes,
structurally_relate_aliases: StructurallyRelateAliases,
// Mutable fields. // Mutable fields.
ambient_variance: ty::Variance, ambient_variance: ty::Variance,
@ -57,7 +56,6 @@ pub(crate) fn new(
trace: TypeTrace<'tcx>, trace: TypeTrace<'tcx>,
param_env: ty::ParamEnv<'tcx>, param_env: ty::ParamEnv<'tcx>,
define_opaque_types: DefineOpaqueTypes, define_opaque_types: DefineOpaqueTypes,
structurally_relate_aliases: StructurallyRelateAliases,
ambient_variance: ty::Variance, ambient_variance: ty::Variance,
) -> TypeRelating<'infcx, 'tcx> { ) -> TypeRelating<'infcx, 'tcx> {
TypeRelating { TypeRelating {
@ -65,7 +63,6 @@ pub(crate) fn new(
trace, trace,
param_env, param_env,
define_opaque_types, define_opaque_types,
structurally_relate_aliases,
ambient_variance, ambient_variance,
obligations: vec![], obligations: vec![],
cache: Default::default(), cache: Default::default(),
@ -353,7 +350,7 @@ fn param_env(&self) -> ty::ParamEnv<'tcx> {
} }
fn structurally_relate_aliases(&self) -> StructurallyRelateAliases { fn structurally_relate_aliases(&self) -> StructurallyRelateAliases {
self.structurally_relate_aliases StructurallyRelateAliases::No
} }
fn register_predicates( fn register_predicates(