Auto merge of #120525 - klensy:FieldDef-span, r=<try>

bors · bors · commit d9df9c55666c · 2024-01-31T14:04:35.000Z
rustc_ast: FieldDef: remove span

it can be calculated from Visibility + Ty, at least tests passed?

perf me, please
diff --git a/compiler/rustc_ast/src/ast.rs b/compiler/rustc_ast/src/ast.rs
@@ -2794,14 +2794,19 @@ impl VisibilityKind {
 pub struct FieldDef {
     pub attrs: AttrVec,
     pub id: NodeId,
-    pub span: Span,
     pub vis: Visibility,
     pub ident: Option<Ident>,
 
     pub ty: P<Ty>,
     pub is_placeholder: bool,
 }
 
+impl FieldDef {
+    pub fn span(&self) -> Span {
+        self.vis.span.to(self.ty.span)
+    }
+}
+
 /// Fields and constructor ids of enum variants and structs.
 #[derive(Clone, Encodable, Decodable, Debug)]
 pub enum VariantData {
diff --git a/compiler/rustc_ast/src/mut_visit.rs b/compiler/rustc_ast/src/mut_visit.rs
@@ -1003,8 +1003,7 @@ pub fn noop_flat_map_field_def<T: MutVisitor>(
     mut fd: FieldDef,
     visitor: &mut T,
 ) -> SmallVec<[FieldDef; 1]> {
-    let FieldDef { span, ident, vis, id, ty, attrs, is_placeholder: _ } = &mut fd;
-    visitor.visit_span(span);
+    let FieldDef { ident, vis, id, ty, attrs, is_placeholder: _ } = &mut fd;
     visit_opt(ident, |ident| visitor.visit_ident(ident));
     visitor.visit_vis(vis);
     visitor.visit_id(id);
diff --git a/compiler/rustc_ast_lowering/src/item.rs b/compiler/rustc_ast_lowering/src/item.rs
@@ -722,13 +722,13 @@ impl<'hir> LoweringContext<'_, 'hir> {
         let hir_id = self.lower_node_id(f.id);
         self.lower_attrs(hir_id, &f.attrs);
         hir::FieldDef {
-            span: self.lower_span(f.span),
+            span: self.lower_span(f.span()),
             hir_id,
             def_id: self.local_def_id(f.id),
             ident: match f.ident {
                 Some(ident) => self.lower_ident(ident),
                 // FIXME(jseyfried): positional field hygiene.
-                None => Ident::new(sym::integer(index), self.lower_span(f.span)),
+                None => Ident::new(sym::integer(index), self.lower_span(f.span())),
             },
             vis_span: self.lower_span(f.vis.span),
             ty,
diff --git a/compiler/rustc_ast_passes/src/ast_validation.rs b/compiler/rustc_ast_passes/src/ast_validation.rs
@@ -306,8 +306,10 @@ impl<'a> AstValidator<'a> {
         if let Some(ident) = field.ident
             && ident.name == kw::Underscore
         {
-            self.dcx()
-                .emit_err(errors::InvalidUnnamedField { span: field.span, ident_span: ident.span });
+            self.dcx().emit_err(errors::InvalidUnnamedField {
+                span: field.span(),
+                ident_span: ident.span,
+            });
         }
     }
 
diff --git a/compiler/rustc_ast_pretty/src/pprust/state/item.rs b/compiler/rustc_ast_pretty/src/pprust/state/item.rs
@@ -450,7 +450,7 @@ impl<'a> State<'a> {
 
             for field in fields {
                 self.hardbreak_if_not_bol();
-                self.maybe_print_comment(field.span.lo());
+                self.maybe_print_comment(field.span().lo());
                 self.print_outer_attributes(&field.attrs);
                 self.print_visibility(&field.vis);
                 self.print_ident(field.ident.unwrap());
@@ -478,7 +478,7 @@ impl<'a> State<'a> {
                 if let ast::VariantData::Tuple(..) = struct_def {
                     self.popen();
                     self.commasep(Inconsistent, struct_def.fields(), |s, field| {
-                        s.maybe_print_comment(field.span.lo());
+                        s.maybe_print_comment(field.span().lo());
                         s.print_outer_attributes(&field.attrs);
                         s.print_visibility(&field.vis);
                         s.print_type(&field.ty)
diff --git a/compiler/rustc_builtin_macros/src/deriving/clone.rs b/compiler/rustc_builtin_macros/src/deriving/clone.rs
@@ -116,7 +116,7 @@ fn cs_clone_simple(
                     cx,
                     &mut stmts,
                     field.ty.clone(),
-                    field.span,
+                    field.span(),
                     &[sym::clone, sym::AssertParamIsClone],
                 );
             }
diff --git a/compiler/rustc_builtin_macros/src/deriving/cmp/eq.rs b/compiler/rustc_builtin_macros/src/deriving/cmp/eq.rs
@@ -70,7 +70,7 @@ fn cs_total_eq_assert(
                     cx,
                     &mut stmts,
                     field.ty.clone(),
-                    field.span,
+                    field.span(),
                     &[sym::cmp, sym::AssertParamIsEq],
                 );
             }
diff --git a/compiler/rustc_builtin_macros/src/deriving/generic/mod.rs b/compiler/rustc_builtin_macros/src/deriving/generic/mod.rs
@@ -1432,7 +1432,7 @@ impl<'a> TraitDef<'a> {
         let mut named_idents = Vec::new();
         let mut just_spans = Vec::new();
         for field in struct_def.fields() {
-            let sp = field.span.with_ctxt(self.span.ctxt());
+            let sp = field.span().with_ctxt(self.span.ctxt());
             match field.ident {
                 Some(ident) => named_idents.push((ident, sp)),
                 _ => just_spans.push(sp),
@@ -1466,7 +1466,7 @@ impl<'a> TraitDef<'a> {
             .map(|prefix| {
                 let pieces_iter =
                     struct_def.fields().iter().enumerate().map(|(i, struct_field)| {
-                        let sp = struct_field.span.with_ctxt(self.span.ctxt());
+                        let sp = struct_field.span().with_ctxt(self.span.ctxt());
                         let ident = self.mk_pattern_ident(prefix, i);
                         let path = ident.with_span_pos(sp);
                         (
@@ -1528,7 +1528,7 @@ impl<'a> TraitDef<'a> {
             .map(|(i, struct_field)| {
                 // For this field, get an expr for each selflike_arg. E.g. for
                 // `PartialEq::eq`, one for each of `&self` and `other`.
-                let sp = struct_field.span.with_ctxt(self.span.ctxt());
+                let sp = struct_field.span().with_ctxt(self.span.ctxt());
                 let mut exprs: Vec<_> = mk_exprs(i, struct_field, sp);
                 let self_expr = exprs.remove(0);
                 let other_selflike_exprs = exprs;
@@ -1583,7 +1583,7 @@ impl<'a> TraitDef<'a> {
                         ast::ExprKind::Field(
                             selflike_arg.clone(),
                             struct_field.ident.unwrap_or_else(|| {
-                                Ident::from_str_and_span(&i.to_string(), struct_field.span)
+                                Ident::from_str_and_span(&i.to_string(), struct_field.span())
                             }),
                         ),
                     );
@@ -1631,7 +1631,7 @@ impl<'a> TraitDef<'a> {
                         } else {
                             // Wrap the expression in `{...}`, causing a copy.
                             field_expr = cx.expr_block(
-                                cx.block(struct_field.span, thin_vec![cx.stmt_expr(field_expr)]),
+                                cx.block(struct_field.span(), thin_vec![cx.stmt_expr(field_expr)]),
                             );
                         }
                     }
diff --git a/compiler/rustc_expand/src/base.rs b/compiler/rustc_expand/src/base.rs
@@ -73,7 +73,7 @@ impl Annotatable {
             Annotatable::PatField(fp) => fp.pat.span,
             Annotatable::GenericParam(gp) => gp.ident.span,
             Annotatable::Param(p) => p.span,
-            Annotatable::FieldDef(sf) => sf.span,
+            Annotatable::FieldDef(sf) => sf.span(),
             Annotatable::Variant(v) => v.span,
             Annotatable::Crate(c) => c.spans.inner_span,
         }
diff --git a/compiler/rustc_expand/src/placeholders.rs b/compiler/rustc_expand/src/placeholders.rs
@@ -167,7 +167,6 @@ pub fn placeholder(
             attrs: Default::default(),
             id,
             ident: None,
-            span,
             ty: ty(),
             vis,
             is_placeholder: true,
diff --git a/compiler/rustc_parse/src/parser/item.rs b/compiler/rustc_parse/src/parser/item.rs
@@ -1724,7 +1724,6 @@ impl<'a> Parser<'a> {
                     // encountered another parse error.
                     snapshot = Some(p.create_snapshot_for_diagnostic());
                 }
-                let lo = p.token.span;
                 let vis = match p.parse_visibility(FollowedByType::Yes) {
                     Ok(vis) => vis,
                     Err(err) => {
@@ -1746,7 +1745,6 @@ impl<'a> Parser<'a> {
 
                 Ok((
                     FieldDef {
-                        span: lo.to(ty.span),
                         vis,
                         ident: None,
                         id: DUMMY_NODE_ID,
@@ -1932,15 +1930,7 @@ impl<'a> Parser<'a> {
             let sp = ty.span.shrink_to_hi().to(const_expr.value.span);
             self.dcx().emit_err(errors::EqualsStructDefault { span: sp });
         }
-        Ok(FieldDef {
-            span: lo.to(self.prev_token.span),
-            ident: Some(name),
-            vis,
-            id: DUMMY_NODE_ID,
-            ty,
-            attrs,
-            is_placeholder: false,
-        })
+        Ok(FieldDef { ident: Some(name), vis, id: DUMMY_NODE_ID, ty, attrs, is_placeholder: false })
     }
 
     /// Parses a field identifier. Specialized version of `parse_ident_common`
diff --git a/compiler/rustc_resolve/src/def_collector.rs b/compiler/rustc_resolve/src/def_collector.rs
@@ -78,7 +78,7 @@ impl<'a, 'b, 'tcx> DefCollector<'a, 'b, 'tcx> {
             self.visit_macro_invoc(field.id);
         } else {
             let name = field.ident.map_or_else(|| sym::integer(index(self)), |ident| ident.name);
-            let def = self.create_def(field.id, name, DefKind::Field, field.span);
+            let def = self.create_def(field.id, name, DefKind::Field, field.span());
             self.with_parent(def, |this| visit::walk_field_def(this, field));
         }
     }
diff --git a/src/tools/clippy/clippy_lints/src/manual_non_exhaustive.rs b/src/tools/clippy/clippy_lints/src/manual_non_exhaustive.rs
@@ -136,7 +136,7 @@ impl EarlyLintPass for ManualNonExhaustiveStruct {
                                 Applicability::Unspecified,
                             );
                         }
-                        diag.span_help(field.span, "remove this field");
+                        diag.span_help(field.span(), "remove this field");
                     },
                 );
             }
diff --git a/src/tools/rustfmt/src/items.rs b/src/tools/rustfmt/src/items.rs
@@ -1558,15 +1558,15 @@ fn format_tuple_struct(
             .snippet_provider
             .span_after(mk_sp(lo, span.hi()), "(")
     } else {
-        fields[0].span.lo()
+        fields[0].span().lo()
     };
     let body_hi = if fields.is_empty() {
         context
             .snippet_provider
             .span_after(mk_sp(body_lo, span.hi()), ")")
     } else {
         // This is a dirty hack to work around a missing `)` from the span of the last field.
-        let last_arg_span = fields[fields.len() - 1].span;
+        let last_arg_span = fields[fields.len() - 1].span();
         context
             .snippet_provider
             .opt_span_after(mk_sp(last_arg_span.hi(), span.hi()), ")")
@@ -1874,9 +1874,9 @@ pub(crate) fn rewrite_struct_field(
     let attrs_str = field.attrs.rewrite(context, shape)?;
     let attrs_extendable = field.ident.is_none() && is_attributes_extendable(&attrs_str);
     let missing_span = if field.attrs.is_empty() {
-        mk_sp(field.span.lo(), field.span.lo())
+        mk_sp(field.span().lo(), field.span().lo())
     } else {
-        mk_sp(field.attrs.last().unwrap().span.hi(), field.span.lo())
+        mk_sp(field.attrs.last().unwrap().span.hi(), field.span().lo())
     };
     let mut spacing = String::from(if field.ident.is_some() {
         type_annotation_spacing.1
diff --git a/src/tools/rustfmt/src/spanned.rs b/src/tools/rustfmt/src/spanned.rs
@@ -143,7 +143,7 @@ impl Spanned for ast::GenericParam {
 
 impl Spanned for ast::FieldDef {
     fn span(&self) -> Span {
-        span_with_attrs_lo_hi!(self, self.span.lo(), self.ty.span.hi())
+        span_with_attrs_lo_hi!(self, self.span().lo(), self.ty.span.hi())
     }
 }
 
diff --git a/src/tools/rustfmt/src/vertical.rs b/src/tools/rustfmt/src/vertical.rs
@@ -45,9 +45,9 @@ impl AlignedItem for ast::FieldDef {
     fn rewrite_prefix(&self, context: &RewriteContext<'_>, shape: Shape) -> Option<String> {
         let attrs_str = self.attrs.rewrite(context, shape)?;
         let missing_span = if self.attrs.is_empty() {
-            mk_sp(self.span.lo(), self.span.lo())
+            mk_sp(self.span().lo(), self.span().lo())
         } else {
-            mk_sp(self.attrs.last().unwrap().span.hi(), self.span.lo())
+            mk_sp(self.attrs.last().unwrap().span.hi(), self.span().lo())
         };
         let attrs_extendable = self.ident.is_none() && is_attributes_extendable(&attrs_str);
         rewrite_struct_field_prefix(context, self).and_then(|field_str| {
diff --git a/tests/ui/stats/hir-stats.stderr b/tests/ui/stats/hir-stats.stderr
@@ -15,7 +15,7 @@ ast-stats-1 Arm                       96 ( 1.5%)             2            48
 ast-stats-1 ForeignItem               96 ( 1.5%)             1            96
 ast-stats-1 - Fn                        96 ( 1.5%)             1
 ast-stats-1 FnDecl                   120 ( 1.8%)             5            24
-ast-stats-1 FieldDef                 160 ( 2.4%)             2            80
+ast-stats-1 FieldDef                 144 ( 2.2%)             2            72
 ast-stats-1 Stmt                     160 ( 2.4%)             5            32
 ast-stats-1 - Local                     32 ( 0.5%)             1
 ast-stats-1 - MacCall                   32 ( 0.5%)             1
@@ -53,7 +53,7 @@ ast-stats-1 - Impl                     136 ( 2.1%)             1
 ast-stats-1 - Fn                       272 ( 4.2%)             2
 ast-stats-1 - Use                      408 ( 6.2%)             3
 ast-stats-1 ----------------------------------------------------------------
-ast-stats-1 Total                  6_552
+ast-stats-1 Total                  6_536
 ast-stats-1
 ast-stats-2 POST EXPANSION AST STATS
 ast-stats-2 Name                Accumulated Size         Count     Item Size
@@ -73,7 +73,7 @@ ast-stats-2 FnDecl                   120 ( 1.7%)             5            24
 ast-stats-2 Attribute                128 ( 1.8%)             4            32
 ast-stats-2 - DocComment                32 ( 0.4%)             1
 ast-stats-2 - Normal                    96 ( 1.3%)             3
-ast-stats-2 FieldDef                 160 ( 2.2%)             2            80
+ast-stats-2 FieldDef                 144 ( 2.0%)             2            72
 ast-stats-2 Stmt                     160 ( 2.2%)             5            32
 ast-stats-2 - Local                     32 ( 0.4%)             1
 ast-stats-2 - Semi                      32 ( 0.4%)             1
@@ -87,7 +87,7 @@ ast-stats-2 AssocItem                352 ( 4.9%)             4            88
 ast-stats-2 - Type                     176 ( 2.5%)             2
 ast-stats-2 - Fn                       176 ( 2.5%)             2
 ast-stats-2 GenericParam             480 ( 6.7%)             5            96
-ast-stats-2 Pat                      504 ( 7.0%)             7            72
+ast-stats-2 Pat                      504 ( 7.1%)             7            72
 ast-stats-2 - Struct                    72 ( 1.0%)             1
 ast-stats-2 - Wild                      72 ( 1.0%)             1
 ast-stats-2 - Ident                    360 ( 5.0%)             5
@@ -99,12 +99,12 @@ ast-stats-2 - InlineAsm                 72 ( 1.0%)             1
 ast-stats-2 - Lit                      144 ( 2.0%)             2
 ast-stats-2 - Block                    216 ( 3.0%)             3
 ast-stats-2 PathSegment              792 (11.1%)            33            24
-ast-stats-2 Ty                       896 (12.5%)            14            64
+ast-stats-2 Ty                       896 (12.6%)            14            64
 ast-stats-2 - Ptr                       64 ( 0.9%)             1
 ast-stats-2 - Ref                       64 ( 0.9%)             1
 ast-stats-2 - ImplicitSelf             128 ( 1.8%)             2
-ast-stats-2 - Path                     640 ( 8.9%)            10
-ast-stats-2 Item                   1_496 (20.9%)            11           136
+ast-stats-2 - Path                     640 ( 9.0%)            10
+ast-stats-2 Item                   1_496 (21.0%)            11           136
 ast-stats-2 - Trait                    136 ( 1.9%)             1
 ast-stats-2 - Enum                     136 ( 1.9%)             1
 ast-stats-2 - ExternCrate              136 ( 1.9%)             1
@@ -113,7 +113,7 @@ ast-stats-2 - Impl                     136 ( 1.9%)             1
 ast-stats-2 - Fn                       272 ( 3.8%)             2
 ast-stats-2 - Use                      544 ( 7.6%)             4
 ast-stats-2 ----------------------------------------------------------------
-ast-stats-2 Total                  7_152
+ast-stats-2 Total                  7_136
 ast-stats-2
 hir-stats HIR STATS
 hir-stats Name                Accumulated Size         Count     Item Size

Original file line number	Diff line number	Diff line change
`@@ -306,8 +306,10 @@ impl<'a> AstValidator<'a> {`
`306`	`306`	`if let Some(ident) = field.ident`
`307`	`307`	`&& ident.name == kw::Underscore`
`308`	`308`	`{`
`309`		`- self.dcx()`
`310`		`- .emit_err(errors::InvalidUnnamedField { span: field.span, ident_span: ident.span });`
	`309`	`+ self.dcx().emit_err(errors::InvalidUnnamedField {`
	`310`	`+ span: field.span(),`
	`311`	`+ ident_span: ident.span,`
	`312`	`+ });`
`311`	`313`	`}`
`312`	`314`	`}`
`313`	`315`
Original file line number	Diff line number	Diff line change
`@@ -116,7 +116,7 @@ fn cs_clone_simple(`
`116`	`116`	`cx,`
`117`	`117`	`&mut stmts,`
`118`	`118`	`field.ty.clone(),`
`119`		`- field.span,`
	`119`	`+ field.span(),`
`120`	`120`	`&[sym::clone, sym::AssertParamIsClone],`
`121`	`121`	`);`
`122`	`122`	`}`
Original file line number	Diff line number	Diff line change
`@@ -70,7 +70,7 @@ fn cs_total_eq_assert(`
`70`	`70`	`cx,`
`71`	`71`	`&mut stmts,`
`72`	`72`	`field.ty.clone(),`
`73`		`- field.span,`
	`73`	`+ field.span(),`
`74`	`74`	`&[sym::cmp, sym::AssertParamIsEq],`
`75`	`75`	`);`
`76`	`76`	`}`
Original file line number	Diff line number	Diff line change
`@@ -73,7 +73,7 @@ impl Annotatable {`
`73`	`73`	`Annotatable::PatField(fp) => fp.pat.span,`
`74`	`74`	`Annotatable::GenericParam(gp) => gp.ident.span,`
`75`	`75`	`Annotatable::Param(p) => p.span,`
`76`		`- Annotatable::FieldDef(sf) => sf.span,`
	`76`	`+ Annotatable::FieldDef(sf) => sf.span(),`
`77`	`77`	`Annotatable::Variant(v) => v.span,`
`78`	`78`	`Annotatable::Crate(c) => c.spans.inner_span,`
`79`	`79`	`}`