bjoernager/rust
bjoernager/rust
1
Fork 0
Code Activity

Store the laziness of type aliases in the DefKind

Browse source
This commit is contained in:
León Orell Valerian Liehr 2023-08-06 23:02:27 +02:00
parent 34ccd04859
commit 5468336d6b
No known key found for this signature in database
GPG key ID: D17A07215F68E713
49 changed files with 208 additions and 93 deletions
Download patch file Download diff file Expand all files Collapse all files

5
compiler/rustc_query_system/src/query/job.rs
View file

@ -593,7 +593,10 @@ pub(crate) fn report_cycle<'a, D: DepKind>(
});
}
let alias = if stack.iter().all(|entry| entry.query.def_kind == Some(DefKind::TyAlias)) {
let alias = if stack
.iter()
.all(|entry| matches!(entry.query.def_kind, Some(DefKind::TyAlias { .. })))
{
Some(crate::error::Alias::Ty)
} else if stack.iter().all(|entry| entry.query.def_kind == Some(DefKind::TraitAlias)) {
Some(crate::error::Alias::Trait)