diff options
| author | bors <bors@rust-lang.org> | 2023-08-08 02:27:38 +0000 |
|---|---|---|
| committer | bors <bors@rust-lang.org> | 2023-08-08 02:27:38 +0000 |
| commit | 8e7fd551311d424e4e63fa45906a2a928fce96a7 (patch) | |
| tree | d3afa2d901c697b08d0039dee07833fd15f48e47 /compiler/rustc_query_system/src/query/job.rs | |
| parent | 443c3161dd04f4c1b656a626f9079921bee9c326 (diff) | |
| parent | 07b2c971a1f9a2db803bb93e6751f8a451fc664d (diff) | |
| download | rust-8e7fd551311d424e4e63fa45906a2a928fce96a7.tar.gz rust-8e7fd551311d424e4e63fa45906a2a928fce96a7.zip | |
Auto merge of #114604 - matthiaskrgr:rollup-o1jltfn, r=matthiaskrgr
Rollup of 7 pull requests Successful merges: - #114376 (Avoid exporting __rust_alloc_error_handler_should_panic more than once.) - #114413 (Warn when #[macro_export] is applied on decl macros) - #114497 (Revert #98333 "Re-enable atomic loads and stores for all RISC-V targets") - #114500 (Remove arm crypto target feature) - #114566 (Store the laziness of type aliases in their `DefKind`) - #114594 (Structurally normalize weak and inherent in new solver) - #114596 (Rename method in `opt-dist`) r? `@ghost` `@rustbot` modify labels: rollup
Diffstat (limited to 'compiler/rustc_query_system/src/query/job.rs')
| -rw-r--r-- | compiler/rustc_query_system/src/query/job.rs | 5 |
1 files changed, 4 insertions, 1 deletions
diff --git a/compiler/rustc_query_system/src/query/job.rs b/compiler/rustc_query_system/src/query/job.rs index bfc51da170d..1b124892441 100644 --- a/compiler/rustc_query_system/src/query/job.rs +++ b/compiler/rustc_query_system/src/query/job.rs @@ -592,7 +592,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) |