Skip to content
Open
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
5 changes: 3 additions & 2 deletions compiler/rustc_hir_analysis/src/collect/resolve_bound_vars.rs
Original file line number Diff line number Diff line change
Expand Up @@ -1695,7 +1695,8 @@ impl<'a, 'tcx> BoundVarContext<'a, 'tcx> {
| DefKind::Union
| DefKind::Enum
| DefKind::TyAlias
| DefKind::Trait,
| DefKind::Trait
| DefKind::TraitAlias,
def_id,
) if depth == 0 => Some(def_id),
_ => None,
Expand Down Expand Up @@ -1865,7 +1866,7 @@ impl<'a, 'tcx> BoundVarContext<'a, 'tcx> {
if constraint.gen_args.parenthesized == hir::GenericArgsParentheses::ReturnTypeNotation
{
let bound_vars = if let Some(type_def_id) = type_def_id
&& self.tcx.def_kind(type_def_id) == DefKind::Trait
&& let DefKind::Trait | DefKind::TraitAlias = self.tcx.def_kind(type_def_id)
&& let Some((mut bound_vars, assoc_fn)) = BoundVarContext::supertrait_hrtb_vars(
self.tcx,
type_def_id,
Expand Down
Original file line number Diff line number Diff line change
@@ -0,0 +1,13 @@
// Regression test for <https://github.com/rust-lang/rust/issues/152158>.
//@ check-pass
#![feature(return_type_notation, trait_alias)]

trait Tr {
fn f() -> impl Sized;
}

trait Al = Tr;

fn f<T: Al<f(..): Copy>>() {}

fn main() {}
14 changes: 14 additions & 0 deletions tests/ui/associated-type-bounds/trait-alias-bound-vars.rs
Original file line number Diff line number Diff line change
@@ -0,0 +1,14 @@
// Check that we're successfully collecting bound vars behind trait aliases.
// Regression test for <https://github.com/rust-lang/rust/issues/152244>.
//@ check-pass
//@ needs-rustc-debug-assertions
#![feature(trait_alias)]

trait A<'a> { type X; }
trait B: for<'a> A<'a> {}
trait C = B;

fn f<T>() where T: C<X: Copy> {}
fn g<T>() where T: C<X: for<'r> A<'r>> {}

fn main() {}