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

Rollup merge of #112777 - compiler-errors:normalize-weak-more, r=oli-obk

Browse Source 
Continue folding in query normalizer on weak aliases

Fixes #112752
Fixes #112731 (same root cause, so didn't make a test for it)
fixes #112776

r? ```@oli-obk```
This commit is contained in:
Matthias Krüger 2023-06-19 19:26:27 +02:00 committed by GitHub
commit 68f2f1e32c
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 18 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
compiler/rustc_trait_selection/src/traits/query/normalize.rs
View File

@ -322,8 +322,12 @@ fn try_fold_ty(&mut self, ty: Ty<'tcx>) -> Result<Ty<'tcx>, Self::Error> {
}; };
// `tcx.normalize_projection_ty` may normalize to a type that still has // `tcx.normalize_projection_ty` may normalize to a type that still has
// unevaluated consts, so keep normalizing here if that's the case. // unevaluated consts, so keep normalizing here if that's the case.
if res != ty && res.has_type_flags(ty::TypeFlags::HAS_CT_PROJECTION) { // Similarly, `tcx.normalize_weak_ty` will only unwrap one layer of type
res.try_super_fold_with(self)? // and we need to continue folding it to reveal the TAIT behind it.
if res != ty
&& (res.has_type_flags(ty::TypeFlags::HAS_CT_PROJECTION) || kind == ty::Weak)
{
res.try_fold_with(self)?
} else { } else {
res res
} }

12
tests/ui/type-alias-impl-trait/debug-ty-with-weak.rs Normal file
View File

@ -0,0 +1,12 @@
// compile-flags: --crate-type=lib -Cdebuginfo=2
// build-pass
#![feature(type_alias_impl_trait)]
type Debuggable = impl core::fmt::Debug;
static mut TEST: Option<Debuggable> = None;
fn foo() -> Debuggable {
0u32
}