diff options
| author | bors <bors@rust-lang.org> | 2022-07-14 11:00:30 +0000 |
|---|---|---|
| committer | bors <bors@rust-lang.org> | 2022-07-14 11:00:30 +0000 |
| commit | f1a8854f9be2e5cad764d630a53d26c7b72f8162 (patch) | |
| tree | da672c94369d7608aab329ee795f2c6576d4e77e /compiler/rustc_mir_build/src | |
| parent | 0ed9c64c3e63acac9bd77abce62501696c390450 (diff) | |
| parent | c1b43ef5892052454459d0be65d0dcae38aa86a2 (diff) | |
| download | rust-f1a8854f9be2e5cad764d630a53d26c7b72f8162.tar.gz rust-f1a8854f9be2e5cad764d630a53d26c7b72f8162.zip | |
Auto merge of #99231 - Dylan-DPC:rollup-0tl8c0o, r=Dylan-DPC
Rollup of 5 pull requests Successful merges: - #97720 (Always create elided lifetime parameters for functions) - #98315 (Stabilize `core::ffi:c_*` and rexport in `std::ffi`) - #98705 (Implement `for<>` lifetime binder for closures) - #99126 (remove allow(rustc::potential_query_instability) in rustc_span) - #99139 (Give a better error when `x dist` fails for an optional tool) Failed merges: r? `@ghost` `@rustbot` modify labels: rollup
Diffstat (limited to 'compiler/rustc_mir_build/src')
| -rw-r--r-- | compiler/rustc_mir_build/src/build/mod.rs | 7 |
1 files changed, 4 insertions, 3 deletions
diff --git a/compiler/rustc_mir_build/src/build/mod.rs b/compiler/rustc_mir_build/src/build/mod.rs index e6d42af9817..7ae26cccb38 100644 --- a/compiler/rustc_mir_build/src/build/mod.rs +++ b/compiler/rustc_mir_build/src/build/mod.rs @@ -68,9 +68,10 @@ fn mir_build(tcx: TyCtxt<'_>, def: ty::WithOptConstParam<LocalDefId>) -> Body<'_ // Figure out what primary body this item has. let (body_id, return_ty_span, span_with_body) = match tcx.hir().get(id) { - Node::Expr(hir::Expr { kind: hir::ExprKind::Closure { fn_decl, body, .. }, .. }) => { - (*body, fn_decl.output.span(), None) - } + Node::Expr(hir::Expr { + kind: hir::ExprKind::Closure(hir::Closure { fn_decl, body, .. }), + .. + }) => (*body, fn_decl.output.span(), None), Node::Item(hir::Item { kind: hir::ItemKind::Fn(hir::FnSig { decl, .. }, _, body_id), span, |