bjoernager/rust
bjoernager/rust
1
Fork 0
Code Activity

Auto merge of #84472 - Aaron1011:conservative-paramenv-and, r=lcnr

Browse source 
Be more conservative about discarding caller_bound in `ParamEnv::and`
This commit is contained in:
bors 2021-05-04 00:48:42 +00:00
commit 14f863c443
3 changed files with 74 additions and 2 deletions
Download patch file Download diff file Expand all files Collapse all files

6
compiler/rustc_middle/src/ty/flags.rs
View file

@ -141,7 +141,9 @@ impl FlagComputation {
&ty::Infer(infer) => {
self.add_flags(TypeFlags::STILL_FURTHER_SPECIALIZABLE);
match infer {
ty::FreshTy(_) | ty::FreshIntTy(_) | ty::FreshFloatTy(_) => {}
ty::FreshTy(_) | ty::FreshIntTy(_) | ty::FreshFloatTy(_) => {
self.add_flags(TypeFlags::HAS_TY_FRESH)
}
ty::TyVar(_) | ty::IntVar(_) | ty::FloatVar(_) => {
self.add_flags(TypeFlags::HAS_TY_INFER)
@ -278,7 +280,7 @@ impl FlagComputation {
ty::ConstKind::Infer(infer) => {
self.add_flags(TypeFlags::STILL_FURTHER_SPECIALIZABLE);
match infer {
InferConst::Fresh(_) => {}
InferConst::Fresh(_) => self.add_flags(TypeFlags::HAS_CT_FRESH),
InferConst::Var(_) => self.add_flags(TypeFlags::HAS_CT_INFER),
}
}