diff options
| author | bors <bors@rust-lang.org> | 2023-08-02 13:38:36 +0000 |
|---|---|---|
| committer | bors <bors@rust-lang.org> | 2023-08-02 13:38:36 +0000 |
| commit | 7637653b9fdd2b2f2dc3b378891eb5cf6aea9f5d (patch) | |
| tree | 52cd9c48d6a97c32e49c73dc3282eb4bcc419170 /compiler/rustc_mir_transform/src/generator.rs | |
| parent | d1708334312f654204edd21b3e93cf29da847187 (diff) | |
| parent | da2b237b6a9d09f0b2a04b02b12a33f786d6eab6 (diff) | |
Auto merge of #114368 - Nilstrieb:rollup-pgvm9cf, r=Nilstrieb
Rollup of 5 pull requests Successful merges: - #114079 (Use `upvar_tys` in more places, make it return a list) - #114166 (Add regression test for resolving `--extern libc=test.rlib`) - #114321 (get auto traits for parallel rustc) - #114335 (fix and extend ptr_comparison test) - #114347 (x.py print more detailed format files and untracked files count) r? `@ghost` `@rustbot` modify labels: rollup
Diffstat (limited to 'compiler/rustc_mir_transform/src/generator.rs')
| -rw-r--r-- | compiler/rustc_mir_transform/src/generator.rs | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/compiler/rustc_mir_transform/src/generator.rs b/compiler/rustc_mir_transform/src/generator.rs index 669135f80bc..797a1a86846 100644 --- a/compiler/rustc_mir_transform/src/generator.rs +++ b/compiler/rustc_mir_transform/src/generator.rs @@ -856,7 +856,7 @@ fn sanitize_witness<'tcx>( tcx: TyCtxt<'tcx>, body: &Body<'tcx>, witness: Ty<'tcx>, - upvars: Vec<Ty<'tcx>>, + upvars: &'tcx ty::List<Ty<'tcx>>, layout: &GeneratorLayout<'tcx>, ) { let did = body.source.def_id(); @@ -1471,7 +1471,7 @@ impl<'tcx> MirPass<'tcx> for StateTransform { let args = args.as_generator(); ( args.discr_ty(tcx), - args.upvar_tys().collect::<Vec<_>>(), + args.upvar_tys(), args.witness(), movability == hir::Movability::Movable, ) |
