Skip to content

Commit 22e9fe6

Browse files
committedJun 23, 2023
Auto merge of rust-lang#112974 - matthiaskrgr:rollup-hnk7ans, r=matthiaskrgr
Rollup of 8 pull requests Successful merges: - rust-lang#112616 (Improve tests on targets without unwinding) - rust-lang#112643 (Always register sized obligation for argument) - rust-lang#112740 (Add link to rustdoc book search chapter in help popover) - rust-lang#112810 (Don't ICE on unnormalized struct tail in layout computation) - rust-lang#112870 (Migrate `item_bounds` to `ty::Clause`) - rust-lang#112925 (Stop hiding const eval limit in external macros) - rust-lang#112960 ([tests/rustdoc] Add `@files` command) - rust-lang#112962 (Fix rustdoc gui tester) r? `@ghost` `@rustbot` modify labels: rollup
2 parents c79d6be + 9d7f297 commit 22e9fe6

File tree

78 files changed

+579
-271
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

78 files changed

+579
-271
lines changed
 

‎compiler/rustc_borrowck/src/diagnostics/conflict_errors.rs

+1-1
Original file line numberDiff line numberDiff line change
@@ -705,7 +705,7 @@ impl<'cx, 'tcx> MirBorrowckCtxt<'cx, 'tcx> {
705705
ty::Alias(ty::Opaque, ty::AliasTy { def_id, substs, .. }) => tcx
706706
.explicit_item_bounds(def_id)
707707
.subst_iter_copied(tcx, substs)
708-
.find_map(find_fn_kind_from_did),
708+
.find_map(|(clause, span)| find_fn_kind_from_did((clause.as_predicate(), span))),
709709
ty::Closure(_, substs) => match substs.as_closure().kind() {
710710
ty::ClosureKind::Fn => Some(hir::Mutability::Not),
711711
ty::ClosureKind::FnMut => Some(hir::Mutability::Mut),

‎compiler/rustc_hir_analysis/src/check/mod.rs

+1-3
Original file line numberDiff line numberDiff line change
@@ -409,9 +409,7 @@ fn fn_sig_suggestion<'tcx>(
409409
output = if let ty::Alias(_, alias_ty) = *output.kind() {
410410
tcx.explicit_item_bounds(alias_ty.def_id)
411411
.subst_iter_copied(tcx, alias_ty.substs)
412-
.find_map(|(bound, _)| {
413-
bound.to_opt_poly_projection_pred()?.no_bound_vars()?.term.ty()
414-
})
412+
.find_map(|(bound, _)| bound.as_projection_clause()?.no_bound_vars()?.term.ty())
415413
.unwrap_or_else(|| {
416414
span_bug!(
417415
ident.span,

0 commit comments

Comments
 (0)
Please sign in to comment.