Auto merge of #125741 - petrochenkov:atvisord, r=davidtwco · compiler-errors/rust@d929a42 (original) (raw)

`@@ -429,10 +429,10 @@ pub fn noop_flat_map_pat_field<T: MutVisitor>(

429

`) -> SmallVec<[PatField; 1]> {

430

`let PatField { attrs, id, ident, is_placeholder: _, is_shorthand: _, pat, span } = &mut fp;

431

` vis.visit_id(id);

432

visit_attrs(attrs, vis);

432

433

` vis.visit_ident(ident);

433

434

` vis.visit_pat(pat);

434

435

` vis.visit_span(span);

435

visit_attrs(attrs, vis);

436

`smallvec![fp]

437

438

`@@ -443,8 +443,8 @@ fn noop_visit_use_tree<T: MutVisitor>(use_tree: &mut UseTree, vis: &mut T) {

443

`UseTreeKind::Simple(rename) => visit_opt(rename, |rename| vis.visit_ident(rename)),

444

`UseTreeKind::Nested { items, .. } => {

445

`for (tree, id) in items {

446

vis.visit_use_tree(tree);

447

446

` vis.visit_id(id);

447

vis.visit_use_tree(tree);

448

449

450

`UseTreeKind::Glob => {}

`@@ -454,8 +454,8 @@ fn noop_visit_use_tree<T: MutVisitor>(use_tree: &mut UseTree, vis: &mut T) {

454

455

`pub fn noop_flat_map_arm<T: MutVisitor>(mut arm: Arm, vis: &mut T) -> SmallVec<[Arm; 1]> {

456

`let Arm { attrs, pat, guard, body, span, id, is_placeholder: _ } = &mut arm;

457

visit_attrs(attrs, vis);

458

457

` vis.visit_id(id);

458

visit_attrs(attrs, vis);

459

` vis.visit_pat(pat);

460

`visit_opt(guard, |guard| vis.visit_expr(guard));

461

`visit_opt(body, |body| vis.visit_expr(body));

`@@ -548,10 +548,10 @@ pub fn noop_flat_map_variant<T: MutVisitor>(

548

`visitor: &mut T,

549

`) -> SmallVec<[Variant; 1]> {

550

`let Variant { ident, vis, attrs, id, data, disr_expr, span, is_placeholder: _ } = &mut variant;

551

visitor.visit_id(id);

552

visit_attrs(attrs, visitor);

551

553

` visitor.visit_ident(ident);

552

554

` visitor.visit_vis(vis);

553

visit_attrs(attrs, visitor);

554

visitor.visit_id(id);

555

` visitor.visit_variant_data(data);

556

`visit_opt(disr_expr, |disr_expr| visitor.visit_anon_const(disr_expr));

557

` visitor.visit_span(span);

`@@ -565,8 +565,8 @@ fn noop_visit_ident<T: MutVisitor>(Ident { name: _, span }: &mut Ident, vis: &mu

565

`fn noop_visit_path<T: MutVisitor>(Path { segments, span, tokens }: &mut Path, vis: &mut T) {

566

` vis.visit_span(span);

567

`for PathSegment { ident, id, args } in segments {

568

vis.visit_ident(ident);

569

568

` vis.visit_id(id);

569

vis.visit_ident(ident);

570

`visit_opt(args, |args| vis.visit_generic_args(args));

571

572

`visit_lazy_tts(tokens, vis);

`@@ -620,6 +620,7 @@ fn noop_visit_parenthesized_parameter_data<T: MutVisitor>(

620

`fn noop_visit_local<T: MutVisitor>(local: &mut P, vis: &mut T) {

621

`let Local { id, pat, ty, kind, span, colon_sp, attrs, tokens } = local.deref_mut();

622

` vis.visit_id(id);

623

visit_attrs(attrs, vis);

623

624

` vis.visit_pat(pat);

624

625

`visit_opt(ty, |ty| vis.visit_ty(ty));

625

626

`match kind {

`@@ -634,7 +635,6 @@ fn noop_visit_local<T: MutVisitor>(local: &mut P, vis: &mut T) {

634

635

636

` vis.visit_span(span);

636

637

`visit_opt(colon_sp, |sp| vis.visit_span(sp));

637

visit_attrs(attrs, vis);

638

`visit_lazy_tts(tokens, vis);

639

640

`@@ -894,9 +894,9 @@ fn noop_visit_coroutine_kind<T: MutVisitor>(coroutine_kind: &mut CoroutineKind,

894

`CoroutineKind::Async { span, closure_id, return_impl_trait_id }

895

` | CoroutineKind::Gen { span, closure_id, return_impl_trait_id }

896

` | CoroutineKind::AsyncGen { span, closure_id, return_impl_trait_id } => {

897

vis.visit_span(span);

898

897

` vis.visit_id(closure_id);

899

898

` vis.visit_id(return_impl_trait_id);

899

vis.visit_span(span);

900

901

902

`@@ -932,8 +932,8 @@ fn noop_visit_precise_capturing_arg<T: MutVisitor>(arg: &mut PreciseCapturingArg

932

` vis.visit_lifetime(lt);

933

934

`PreciseCapturingArg::Arg(path, id) => {

935

vis.visit_path(path);

936

935

` vis.visit_id(id);

936

vis.visit_path(path);

937

938

939

`@@ -944,11 +944,11 @@ pub fn noop_flat_map_generic_param<T: MutVisitor>(

944

`) -> SmallVec<[GenericParam; 1]> {

945

`let GenericParam { id, ident, attrs, bounds, kind, colon_span, is_placeholder: _ } = &mut param;

946

` vis.visit_id(id);

947

visit_attrs(attrs, vis);

947

948

` vis.visit_ident(ident);

948

949

`if let Some(colon_span) = colon_span {

949

950

` vis.visit_span(colon_span);

950

951

visit_attrs(attrs, vis);

952

`visit_vec(bounds, |bound| noop_visit_param_bound(bound, vis));

953

`match kind {

954

`GenericParamKind::Lifetime => {}

`@@ -1015,16 +1015,16 @@ fn noop_visit_variant_data<T: MutVisitor>(vdata: &mut VariantData, vis: &mut T)

1015

` fields.flat_map_in_place(|field| vis.flat_map_field_def(field));

1016

1017

`VariantData::Tuple(fields, id) => {

1018

fields.flat_map_in_place(|field| vis.flat_map_field_def(field));

1019

1018

` vis.visit_id(id);

1019

fields.flat_map_in_place(|field| vis.flat_map_field_def(field));

1020

1021

`VariantData::Unit(id) => vis.visit_id(id),

1022

1023

1024

1025

`fn noop_visit_trait_ref<T: MutVisitor>(TraitRef { path, ref_id }: &mut TraitRef, vis: &mut T) {

1026

vis.visit_path(path);

1027

1026

` vis.visit_id(ref_id);

1027

vis.visit_path(path);

1028

1029

1030

`fn noop_visit_poly_trait_ref<T: MutVisitor>(p: &mut PolyTraitRef, vis: &mut T) {

`@@ -1039,12 +1039,12 @@ pub fn noop_flat_map_field_def<T: MutVisitor>(

1039

`visitor: &mut T,

1040

`) -> SmallVec<[FieldDef; 1]> {

1041

`let FieldDef { span, ident, vis, id, ty, attrs, is_placeholder: _ } = &mut fd;

1042

visitor.visit_id(id);

1043

visit_attrs(attrs, visitor);

1042

1044

` visitor.visit_span(span);

1043

1045

`visit_opt(ident, |ident| visitor.visit_ident(ident));

1044

1046

` visitor.visit_vis(vis);

1045

visitor.visit_id(id);

1046

1047

` visitor.visit_ty(ty);

1047

visit_attrs(attrs, visitor);

1048

`smallvec![fd]

1049

1050

`@@ -1053,11 +1053,11 @@ pub fn noop_flat_map_expr_field<T: MutVisitor>(

1053

`vis: &mut T,

1054

`) -> SmallVec<[ExprField; 1]> {

1055

`let ExprField { ident, expr, span, is_shorthand: _, attrs, id, is_placeholder: _ } = &mut f;

1056

vis.visit_id(id);

1057

visit_attrs(attrs, vis);

1056

1058

` vis.visit_ident(ident);

1057

1059

` vis.visit_expr(expr);

1058

vis.visit_id(id);

1059

1060

` vis.visit_span(span);

1060

visit_attrs(attrs, vis);

1061

`smallvec![f]

1062

1063

`@@ -1429,6 +1429,8 @@ pub fn noop_visit_expr<T: MutVisitor>(

1429

`Expr { kind, id, span, attrs, tokens }: &mut Expr,

1430

`vis: &mut T,

1431

`) {

1432

vis.visit_id(id);

1433

visit_attrs(attrs, vis);

1432

1434

`match kind {

1433

1435

`ExprKind::Array(exprs) => visit_thin_exprs(exprs, vis),

1434

1436

`ExprKind::ConstBlock(anon_const) => {

`@@ -1449,8 +1451,8 @@ pub fn noop_visit_expr<T: MutVisitor>(

1449

1451

`args: call_args,

1450

1452

` span,

1451

1453

`}) => {

1452

vis.visit_ident(ident);

1453

1454

` vis.visit_id(id);

1455

vis.visit_ident(ident);

1454

1456

`visit_opt(seg_args, |args| vis.visit_generic_args(args));

1455

1457

` vis.visit_method_receiver_expr(receiver);

1456

1458

`visit_thin_exprs(call_args, vis);

`@@ -1601,9 +1603,7 @@ pub fn noop_visit_expr<T: MutVisitor>(

1601

1603

`ExprKind::TryBlock(body) => vis.visit_block(body),

1602

1604

`ExprKind::Lit() | ExprKind::IncludedBytes(..) | ExprKind::Err() | ExprKind::Dummy => {}

1603

1605

1604

vis.visit_id(id);

1605

1606

` vis.visit_span(span);

1606

visit_attrs(attrs, vis);

1607

`visit_lazy_tts(tokens, vis);

1608

1609

`@@ -1645,8 +1645,8 @@ fn noop_flat_map_stmt_kind<T: MutVisitor>(kind: StmtKind, vis: &mut T) -> SmallV

1645

`StmtKind::Empty => smallvec![StmtKind::Empty],

1646

`StmtKind::MacCall(mut mac) => {

1647

`let MacCallStmt { mac: mac_, style: _, attrs, tokens } = mac.deref_mut();

1648

vis.visit_mac_call(mac_);

1649

1648

`visit_attrs(attrs, vis);

1649

vis.visit_mac_call(mac_);

1650

`visit_lazy_tts(tokens, vis);

1651

`smallvec![StmtKind::MacCall(mac)]

1652

`@@ -1657,8 +1657,8 @@ fn noop_visit_vis<T: MutVisitor>(visibility: &mut Visibility, vis: &mut T) {

1657

`match &mut visibility.kind {

1658

`VisibilityKind::Public | VisibilityKind::Inherited => {}

1659

`VisibilityKind::Restricted { path, id, shorthand: _ } => {

1660

vis.visit_path(path);

1661

1660

` vis.visit_id(id);

1661

vis.visit_path(path);

1662

1663

1664

` vis.visit_span(&mut visibility.span);