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_const_eval/src/transform | |
| parent | d1708334312f654204edd21b3e93cf29da847187 (diff) | |
| parent | da2b237b6a9d09f0b2a04b02b12a33f786d6eab6 (diff) | |
| download | rust-7637653b9fdd2b2f2dc3b378891eb5cf6aea9f5d.tar.gz rust-7637653b9fdd2b2f2dc3b378891eb5cf6aea9f5d.zip | |
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_const_eval/src/transform')
| -rw-r--r-- | compiler/rustc_const_eval/src/transform/validate.rs | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/compiler/rustc_const_eval/src/transform/validate.rs b/compiler/rustc_const_eval/src/transform/validate.rs index 31effadd2c2..83004492c8b 100644 --- a/compiler/rustc_const_eval/src/transform/validate.rs +++ b/compiler/rustc_const_eval/src/transform/validate.rs @@ -630,7 +630,7 @@ impl<'a, 'tcx> Visitor<'tcx> for TypeChecker<'a, 'tcx> { } ty::Closure(_, args) => { let args = args.as_closure(); - let Some(f_ty) = args.upvar_tys().nth(f.as_usize()) else { + let Some(&f_ty) = args.upvar_tys().get(f.as_usize()) else { fail_out_of_bounds(self, location); return; }; @@ -667,7 +667,8 @@ impl<'a, 'tcx> Visitor<'tcx> for TypeChecker<'a, 'tcx> { f_ty.ty } else { - let Some(f_ty) = args.as_generator().prefix_tys().nth(f.index()) else { + let Some(&f_ty) = args.as_generator().prefix_tys().get(f.index()) + else { fail_out_of_bounds(self, location); return; }; |
