Skip to content

Commit cfed918

Browse files
committedNov 27, 2020
Auto merge of rust-lang#79266 - b-naber:gat_trait_path_parser, r=petrochenkov
Generic Associated Types in Trait Paths - Ast part The Ast part of rust-lang#78978 r? `@petrochenkov`
2 parents cb56a44 + 5c4568d commit cfed918

Some content is hidden

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

41 files changed

+447
-60
lines changed
 

‎compiler/rustc_ast/src/ast.rs

+1
Original file line numberDiff line numberDiff line change
@@ -1845,6 +1845,7 @@ impl UintTy {
18451845
pub struct AssocTyConstraint {
18461846
pub id: NodeId,
18471847
pub ident: Ident,
1848+
pub gen_args: Option<GenericArgs>,
18481849
pub kind: AssocTyConstraintKind,
18491850
pub span: Span,
18501851
}

‎compiler/rustc_ast/src/mut_visit.rs

+4-1
Original file line numberDiff line numberDiff line change
@@ -441,11 +441,14 @@ pub fn noop_flat_map_arm<T: MutVisitor>(mut arm: Arm, vis: &mut T) -> SmallVec<[
441441
}
442442

443443
pub fn noop_visit_ty_constraint<T: MutVisitor>(
444-
AssocTyConstraint { id, ident, kind, span }: &mut AssocTyConstraint,
444+
AssocTyConstraint { id, ident, gen_args, kind, span }: &mut AssocTyConstraint,
445445
vis: &mut T,
446446
) {
447447
vis.visit_id(id);
448448
vis.visit_ident(ident);
449+
if let Some(ref mut gen_args) = gen_args {
450+
vis.visit_generic_args(gen_args);
451+
}
449452
match kind {
450453
AssocTyConstraintKind::Equality { ref mut ty } => {
451454
vis.visit_ty(ty);

0 commit comments

Comments
 (0)