diff options
| author | bors <bors@rust-lang.org> | 2022-11-21 15:22:54 +0000 |
|---|---|---|
| committer | bors <bors@rust-lang.org> | 2022-11-21 15:22:54 +0000 |
| commit | 1cbc45942d5c0f6eb5d94e3b10762ba541958035 (patch) | |
| tree | b70de974f4890d3269fc5587be1033311a9b9186 /compiler/rustc_hir_analysis/src | |
| parent | 7fe6f36224e92db6fbde952e0b7e50863161f6ee (diff) | |
| parent | 932626127946acc84cc98aa0de30ec890f6ba587 (diff) | |
| download | rust-1cbc45942d5c0f6eb5d94e3b10762ba541958035.tar.gz rust-1cbc45942d5c0f6eb5d94e3b10762ba541958035.zip | |
Auto merge of #104673 - matthiaskrgr:rollup-85f65ov, r=matthiaskrgr
Rollup of 9 pull requests Successful merges: - #104420 (Fix doc example for `wrapping_abs`) - #104499 (rustdoc JSON: Use `Function` everywhere and remove `Method`) - #104500 (`rustc_ast`: remove `ref` patterns) - #104511 (Mark functions created for `raw-dylib` on x86 with DllImport storage class) - #104595 (Add `PolyExistentialPredicate` type alias) - #104605 (deduplicate constant evaluation in cranelift backend) - #104628 (Revert "Update CI to use Android NDK r25b") - #104662 (Streamline deriving on packed structs.) - #104667 (Revert formatting changes of a test) Failed merges: r? `@ghost` `@rustbot` modify labels: rollup
Diffstat (limited to 'compiler/rustc_hir_analysis/src')
| -rw-r--r-- | compiler/rustc_hir_analysis/src/astconv/mod.rs | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/compiler/rustc_hir_analysis/src/astconv/mod.rs b/compiler/rustc_hir_analysis/src/astconv/mod.rs index e8098ea66b2..e744ed2dcc5 100644 --- a/compiler/rustc_hir_analysis/src/astconv/mod.rs +++ b/compiler/rustc_hir_analysis/src/astconv/mod.rs @@ -3000,7 +3000,7 @@ impl<'o, 'tcx> dyn AstConv<'tcx> + 'o { fn compute_object_lifetime_bound( &self, span: Span, - existential_predicates: &'tcx ty::List<ty::Binder<'tcx, ty::ExistentialPredicate<'tcx>>>, + existential_predicates: &'tcx ty::List<ty::PolyExistentialPredicate<'tcx>>, ) -> Option<ty::Region<'tcx>> // if None, use the default { let tcx = self.tcx(); |