diff options
| author | bors <bors@rust-lang.org> | 2022-07-31 13:26:27 +0000 |
|---|---|---|
| committer | bors <bors@rust-lang.org> | 2022-07-31 13:26:27 +0000 |
| commit | e5a7d8f945f4259fb6b8c4953a65248243c054d1 (patch) | |
| tree | 00c56cd7266df82399b9982b57ac9f5485618692 /compiler/rustc_middle/src/mir/tcx.rs | |
| parent | 76822a28780a9a93be04409e52c5df21663aab97 (diff) | |
| parent | 990bce4da0a02a15a11abb22b00aacc5d329ce42 (diff) | |
| download | rust-e5a7d8f945f4259fb6b8c4953a65248243c054d1.tar.gz rust-e5a7d8f945f4259fb6b8c4953a65248243c054d1.zip | |
Auto merge of #99979 - Dylan-DPC:rollup-ikkejgy, r=Dylan-DPC
Rollup of 5 pull requests Successful merges: - #99186 (Use LocalDefId for closures more) - #99741 (Use `impl`'s generics when suggesting fix on bad `impl Copy`) - #99844 (Introduce an ArchiveBuilderBuilder) - #99921 (triagebot.yml: CC Enselic when rustdoc-json-types changes) - #99974 (Suggest removing a semicolon and boxing the expressions for if-else) Failed merges: r? `@ghost` `@rustbot` modify labels: rollup
Diffstat (limited to 'compiler/rustc_middle/src/mir/tcx.rs')
| -rw-r--r-- | compiler/rustc_middle/src/mir/tcx.rs | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/compiler/rustc_middle/src/mir/tcx.rs b/compiler/rustc_middle/src/mir/tcx.rs index fd3359ea80f..405003156c4 100644 --- a/compiler/rustc_middle/src/mir/tcx.rs +++ b/compiler/rustc_middle/src/mir/tcx.rs @@ -205,9 +205,9 @@ impl<'tcx> Rvalue<'tcx> { AggregateKind::Adt(did, _, substs, _, _) => { tcx.bound_type_of(did).subst(tcx, substs) } - AggregateKind::Closure(did, substs) => tcx.mk_closure(did, substs), + AggregateKind::Closure(did, substs) => tcx.mk_closure(did.to_def_id(), substs), AggregateKind::Generator(did, substs, movability) => { - tcx.mk_generator(did, substs, movability) + tcx.mk_generator(did.to_def_id(), substs, movability) } }, Rvalue::ShallowInitBox(_, ty) => tcx.mk_box(ty), |