diff options
| author | bors <bors@rust-lang.org> | 2024-02-07 19:40:25 +0000 |
|---|---|---|
| committer | bors <bors@rust-lang.org> | 2024-02-07 19:40:25 +0000 |
| commit | 8ace7ea1f7cbba7b4f031e66c54ca237a0d65de6 (patch) | |
| tree | 166df9c239ad5725751614bbb9773b53f23ab01d /compiler/rustc_hir_analysis/src | |
| parent | cfb42e5d7f6d5fc39f532ec251e1cea4bbafc746 (diff) | |
| parent | b715d9303e77dfae291c7d651c8e65f8eec94b93 (diff) | |
| download | rust-8ace7ea1f7cbba7b4f031e66c54ca237a0d65de6.tar.gz rust-8ace7ea1f7cbba7b4f031e66c54ca237a0d65de6.zip | |
Auto merge of #120748 - Nadrieril:rollup-dj0qwv5, r=Nadrieril
Rollup of 13 pull requests Successful merges: - #110482 (Add armv8r-none-eabihf target for the Cortex-R52.) - #119162 (Add unstable `-Z direct-access-external-data` cmdline flag for `rustc`) - #120302 (various const interning cleanups) - #120455 ( Add FileCheck annotations to MIR-opt SROA tests) - #120470 (Mark "unused binding" suggestion as maybe incorrect) - #120479 (Suggest turning `if let` into irrefutable `let` if appropriate) - #120564 (coverage: Split out counter increment sites from BCB node/edge counters) - #120633 (pattern_analysis: gather up place-relevant info) - #120664 (Add parallel rustc ui tests) - #120726 (Don't use bashism in checktools.sh) - #120733 (MirPass: make name more const) - #120735 (Remove some `unchecked_claim_error_was_emitted` calls) - #120746 (Record coroutine kind in coroutine generics) r? `@ghost` `@rustbot` modify labels: rollup
Diffstat (limited to 'compiler/rustc_hir_analysis/src')
| -rw-r--r-- | compiler/rustc_hir_analysis/src/collect/generics_of.rs | 13 |
1 files changed, 10 insertions, 3 deletions
diff --git a/compiler/rustc_hir_analysis/src/collect/generics_of.rs b/compiler/rustc_hir_analysis/src/collect/generics_of.rs index 1dabb6feb5e..4860555de20 100644 --- a/compiler/rustc_hir_analysis/src/collect/generics_of.rs +++ b/compiler/rustc_hir_analysis/src/collect/generics_of.rs @@ -344,11 +344,18 @@ pub(super) fn generics_of(tcx: TyCtxt<'_>, def_id: LocalDefId) -> ty::Generics { kind: hir::ExprKind::Closure(hir::Closure { kind, .. }), .. }) = node { + // See `ClosureArgsParts`, `CoroutineArgsParts`, and `CoroutineClosureArgsParts` + // for info on the usage of each of these fields. let dummy_args = match kind { ClosureKind::Closure => &["<closure_kind>", "<closure_signature>", "<upvars>"][..], - ClosureKind::Coroutine(_) => { - &["<resume_ty>", "<yield_ty>", "<return_ty>", "<witness>", "<upvars>"][..] - } + ClosureKind::Coroutine(_) => &[ + "<coroutine_kind>", + "<resume_ty>", + "<yield_ty>", + "<return_ty>", + "<witness>", + "<upvars>", + ][..], ClosureKind::CoroutineClosure(_) => &[ "<closure_kind>", "<closure_signature_parts>", |