Unrolled build for #143380

rust-timer · web-flow · commit 770d9f65eff9 · 2025-07-04T09:21:33.000+02:00
Rollup merge of #143380 - cjgillot:kw_span, r=compiler-errors Replace kw_span by full span for generic const parameters. Small simplification extracted from #127241
diff --git a/compiler/rustc_ast/src/ast.rs b/compiler/rustc_ast/src/ast.rs
@@ -385,8 +385,8 @@ pub enum GenericParamKind {
     },
     Const {
         ty: P<Ty>,
-        /// Span of the `const` keyword.
-        kw_span: Span,
+        /// Span of the whole parameter definition, including default.
+        span: Span,
         /// Optional default value for the const generic param.
         default: Option<AnonConst>,
     },
@@ -410,10 +410,7 @@ impl GenericParam {
                 self.ident.span
             }
             GenericParamKind::Type { default: Some(ty) } => self.ident.span.to(ty.span),
-            GenericParamKind::Const { kw_span, default: Some(default), .. } => {
-                kw_span.to(default.value.span)
-            }
-            GenericParamKind::Const { kw_span, default: None, ty } => kw_span.to(ty.span),
+            GenericParamKind::Const { span, .. } => *span,
         }
     }
 }
diff --git a/compiler/rustc_ast/src/visit.rs b/compiler/rustc_ast/src/visit.rs
@@ -1350,9 +1350,10 @@ macro_rules! common_visitor_and_walkers {
             match kind {
                 GenericParamKind::Lifetime => (),
                 GenericParamKind::Type { default } => visit_opt!(vis, visit_ty, default),
-                GenericParamKind::Const { ty, default, kw_span: _ } => {
+                GenericParamKind::Const { ty, default, span } => {
                     try_visit!(vis.visit_ty(ty));
                     visit_opt!(vis, visit_anon_const, default);
+                    try_visit!(visit_span(vis, span));
                 }
             }
             if let Some(sp) = colon_span {
diff --git a/compiler/rustc_ast_lowering/src/lib.rs b/compiler/rustc_ast_lowering/src/lib.rs
@@ -1960,7 +1960,7 @@ impl<'a, 'hir> LoweringContext<'a, 'hir> {
 
                 (hir::ParamName::Plain(self.lower_ident(param.ident)), kind)
             }
-            GenericParamKind::Const { ty, kw_span: _, default } => {
+            GenericParamKind::Const { ty, span: _, default } => {
                 let ty = self
                     .lower_ty(ty, ImplTraitContext::Disallowed(ImplTraitPosition::GenericDefault));
 
diff --git a/compiler/rustc_ast_passes/src/ast_validation.rs b/compiler/rustc_ast_passes/src/ast_validation.rs
@@ -909,11 +909,11 @@ fn validate_generic_param_order(dcx: DiagCtxtHandle<'_>, generics: &[GenericPara
                 }
                 GenericParamKind::Type { default: None } => (),
                 GenericParamKind::Lifetime => (),
-                GenericParamKind::Const { ty: _, kw_span: _, default: Some(default) } => {
+                GenericParamKind::Const { ty: _, span: _, default: Some(default) } => {
                     ordered_params += " = ";
                     ordered_params += &pprust::expr_to_string(&default.value);
                 }
-                GenericParamKind::Const { ty: _, kw_span: _, default: None } => (),
+                GenericParamKind::Const { ty: _, span: _, default: None } => (),
             }
             first = false;
         }
diff --git a/compiler/rustc_builtin_macros/src/deriving/coerce_pointee.rs b/compiler/rustc_builtin_macros/src/deriving/coerce_pointee.rs
@@ -124,7 +124,7 @@ pub(crate) fn expand_deriving_coerce_pointee(
                                 GenericParamKind::Type { default: _ } => {
                                     cx.typaram(p.span(), p.ident, p.bounds.clone(), None)
                                 }
-                                GenericParamKind::Const { ty, kw_span: _, default: _ } => cx
+                                GenericParamKind::Const { ty, span: _, default: _ } => cx
                                     .const_param(
                                         p.span(),
                                         p.ident,
diff --git a/compiler/rustc_builtin_macros/src/deriving/generic/mod.rs b/compiler/rustc_builtin_macros/src/deriving/generic/mod.rs
@@ -664,10 +664,10 @@ impl<'a> TraitDef<'a> {
 
                     cx.typaram(param.ident.span.with_ctxt(ctxt), param.ident, bounds, None)
                 }
-                GenericParamKind::Const { ty, kw_span, .. } => {
+                GenericParamKind::Const { ty, span, .. } => {
                     let const_nodefault_kind = GenericParamKind::Const {
                         ty: ty.clone(),
-                        kw_span: kw_span.with_ctxt(ctxt),
+                        span: span.with_ctxt(ctxt),
 
                         // We can't have default values inside impl block
                         default: None,
diff --git a/compiler/rustc_expand/src/build.rs b/compiler/rustc_expand/src/build.rs
@@ -172,7 +172,7 @@ impl<'a> ExtCtxt<'a> {
             attrs: AttrVec::new(),
             bounds,
             is_placeholder: false,
-            kind: ast::GenericParamKind::Const { ty, kw_span: DUMMY_SP, default },
+            kind: ast::GenericParamKind::Const { ty, span: DUMMY_SP, default },
             colon_span: None,
         }
     }
diff --git a/compiler/rustc_parse/src/parser/generics.rs b/compiler/rustc_parse/src/parser/generics.rs
@@ -114,13 +114,18 @@ impl<'a> Parser<'a> {
 
         // Parse optional const generics default value.
         let default = if self.eat(exp!(Eq)) { Some(self.parse_const_arg()?) } else { None };
+        let span = if let Some(ref default) = default {
+            const_span.to(default.value.span)
+        } else {
+            const_span.to(ty.span)
+        };
 
         Ok(GenericParam {
             ident,
             id: ast::DUMMY_NODE_ID,
             attrs: preceding_attrs,
             bounds: Vec::new(),
-            kind: GenericParamKind::Const { ty, kw_span: const_span, default },
+            kind: GenericParamKind::Const { ty, span, default },
             is_placeholder: false,
             colon_span: None,
         })
@@ -137,6 +142,11 @@ impl<'a> Parser<'a> {
 
         // Parse optional const generics default value.
         let default = if self.eat(exp!(Eq)) { Some(self.parse_const_arg()?) } else { None };
+        let span = if let Some(ref default) = default {
+            mistyped_const_ident.span.to(default.value.span)
+        } else {
+            mistyped_const_ident.span.to(ty.span)
+        };
 
         self.dcx()
             .struct_span_err(
@@ -156,7 +166,7 @@ impl<'a> Parser<'a> {
             id: ast::DUMMY_NODE_ID,
             attrs: preceding_attrs,
             bounds: Vec::new(),
-            kind: GenericParamKind::Const { ty, kw_span: mistyped_const_ident.span, default },
+            kind: GenericParamKind::Const { ty, span, default },
             is_placeholder: false,
             colon_span: None,
         })
diff --git a/compiler/rustc_resolve/src/late.rs b/compiler/rustc_resolve/src/late.rs
@@ -1656,7 +1656,7 @@ impl<'a, 'ast, 'ra, 'tcx> LateResolutionVisitor<'a, 'ast, 'ra, 'tcx> {
                         forward_ty_ban_rib.bindings.swap_remove(i);
                         forward_ty_ban_rib_const_param_ty.bindings.swap_remove(i);
                     }
-                    GenericParamKind::Const { ref ty, kw_span: _, ref default } => {
+                    GenericParamKind::Const { ref ty, span: _, ref default } => {
                         // Const parameters can't have param bounds.
                         assert!(param.bounds.is_empty());
 
diff --git a/compiler/rustc_resolve/src/late/diagnostics.rs b/compiler/rustc_resolve/src/late/diagnostics.rs
@@ -2940,7 +2940,7 @@ impl<'ast, 'ra, 'tcx> LateResolutionVisitor<'_, 'ast, 'ra, 'tcx> {
                         let span = if let [.., bound] = &param.bounds[..] {
                             bound.span()
                         } else if let GenericParam {
-                            kind: GenericParamKind::Const { ty, kw_span: _, default  }, ..
+                            kind: GenericParamKind::Const { ty, span: _, default  }, ..
                         } = param {
                             default.as_ref().map(|def| def.value.span).unwrap_or(ty.span)
                         } else {
diff --git a/src/tools/clippy/clippy_utils/src/ast_utils/mod.rs b/src/tools/clippy/clippy_utils/src/ast_utils/mod.rs
@@ -886,13 +886,13 @@ pub fn eq_generic_param(l: &GenericParam, r: &GenericParam) -> bool {
             (
                 Const {
                     ty: lt,
-                    kw_span: _,
                     default: ld,
+                    span: _,
                 },
                 Const {
                     ty: rt,
-                    kw_span: _,
                     default: rd,
+                    span: _,
                 },
             ) => eq_ty(lt, rt) && both(ld.as_ref(), rd.as_ref(), eq_anon_const),
             _ => false,
diff --git a/src/tools/rustfmt/src/spanned.rs b/src/tools/rustfmt/src/spanned.rs
@@ -122,7 +122,7 @@ impl Spanned for ast::GenericParam {
     fn span(&self) -> Span {
         let lo = match self.kind {
             _ if !self.attrs.is_empty() => self.attrs[0].span.lo(),
-            ast::GenericParamKind::Const { kw_span, .. } => kw_span.lo(),
+            ast::GenericParamKind::Const { span, .. } => span.lo(),
             _ => self.ident.span.lo(),
         };
         let hi = if self.bounds.is_empty() {
diff --git a/src/tools/rustfmt/src/types.rs b/src/tools/rustfmt/src/types.rs
@@ -689,7 +689,7 @@ impl Rewrite for ast::GenericParam {
 
         let param_start = if let ast::GenericParamKind::Const {
             ref ty,
-            kw_span,
+            span,
             default,
         } = &self.kind
         {
@@ -711,7 +711,7 @@ impl Rewrite for ast::GenericParam {
                     default.rewrite_result(context, Shape::legacy(budget, shape.indent))?;
                 param.push_str(&rewrite);
             }
-            kw_span.lo()
+            span.lo()
         } else {
             param.push_str(rewrite_ident(context, self.ident));
             self.ident.span.lo()

Original file line number	Diff line number	Diff line change
`@@ -385,8 +385,8 @@ pub enum GenericParamKind {`
`385`	`385`	`},`
`386`	`386`	`Const {`
`387`	`387`	`ty: P<Ty>,`
`388`		- /// Span of the `const` keyword.
`389`		`- kw_span: Span,`
	`388`	`+ /// Span of the whole parameter definition, including default.`
	`389`	`+ span: Span,`
`390`	`390`	`/// Optional default value for the const generic param.`
`391`	`391`	`default: Option<AnonConst>,`
`392`	`392`	`},`
`@@ -410,10 +410,7 @@ impl GenericParam {`
`410`	`410`	`self.ident.span`
`411`	`411`	`}`
`412`	`412`	`GenericParamKind::Type { default: Some(ty) } => self.ident.span.to(ty.span),`
`413`		`- GenericParamKind::Const { kw_span, default: Some(default), .. } => {`
`414`		`- kw_span.to(default.value.span)`
`415`		`- }`
`416`		`- GenericParamKind::Const { kw_span, default: None, ty } => kw_span.to(ty.span),`
	`413`	`+ GenericParamKind::Const { span, .. } => *span,`
`417`	`414`	`}`
`418`	`415`	`}`
`419`	`416`	`}`
Original file line number	Diff line number	Diff line change
`@@ -1350,9 +1350,10 @@ macro_rules! common_visitor_and_walkers {`
`1350`	`1350`	`match kind {`
`1351`	`1351`	`GenericParamKind::Lifetime => (),`
`1352`	`1352`	`GenericParamKind::Type { default } => visit_opt!(vis, visit_ty, default),`
`1353`		`- GenericParamKind::Const { ty, default, kw_span: _ } => {`
	`1353`	`+ GenericParamKind::Const { ty, default, span } => {`
`1354`	`1354`	`try_visit!(vis.visit_ty(ty));`
`1355`	`1355`	`visit_opt!(vis, visit_anon_const, default);`
	`1356`	`+ try_visit!(visit_span(vis, span));`
`1356`	`1357`	`}`
`1357`	`1358`	`}`
`1358`	`1359`	`if let Some(sp) = colon_span {`
Original file line number	Diff line number	Diff line change
`@@ -1960,7 +1960,7 @@ impl<'a, 'hir> LoweringContext<'a, 'hir> {`
`1960`	`1960`
`1961`	`1961`	`(hir::ParamName::Plain(self.lower_ident(param.ident)), kind)`
`1962`	`1962`	`}`
`1963`		`- GenericParamKind::Const { ty, kw_span: _, default } => {`
	`1963`	`+ GenericParamKind::Const { ty, span: _, default } => {`
`1964`	`1964`	`let ty = self`
`1965`	`1965`	`.lower_ty(ty, ImplTraitContext::Disallowed(ImplTraitPosition::GenericDefault));`
`1966`	`1966`
Original file line number	Diff line number	Diff line change
`@@ -909,11 +909,11 @@ fn validate_generic_param_order(dcx: DiagCtxtHandle<'_>, generics: &[GenericPara`
`909`	`909`	`}`
`910`	`910`	`GenericParamKind::Type { default: None } => (),`
`911`	`911`	`GenericParamKind::Lifetime => (),`
`912`		`- GenericParamKind::Const { ty: _, kw_span: _, default: Some(default) } => {`
	`912`	`+ GenericParamKind::Const { ty: _, span: _, default: Some(default) } => {`
`913`	`913`	`ordered_params += " = ";`
`914`	`914`	`ordered_params += &pprust::expr_to_string(&default.value);`
`915`	`915`	`}`
`916`		`- GenericParamKind::Const { ty: _, kw_span: _, default: None } => (),`
	`916`	`+ GenericParamKind::Const { ty: _, span: _, default: None } => (),`
`917`	`917`	`}`
`918`	`918`	`first = false;`
`919`	`919`	`}`
Original file line number	Diff line number	Diff line change
`@@ -124,7 +124,7 @@ pub(crate) fn expand_deriving_coerce_pointee(`
`124`	`124`	`GenericParamKind::Type { default: _ } => {`
`125`	`125`	`cx.typaram(p.span(), p.ident, p.bounds.clone(), None)`
`126`	`126`	`}`
`127`		`- GenericParamKind::Const { ty, kw_span: _, default: _ } => cx`
	`127`	`+ GenericParamKind::Const { ty, span: _, default: _ } => cx`
`128`	`128`	`.const_param(`
`129`	`129`	`p.span(),`
`130`	`130`	`p.ident,`
Original file line number	Diff line number	Diff line change
`@@ -172,7 +172,7 @@ impl<'a> ExtCtxt<'a> {`
`172`	`172`	`attrs: AttrVec::new(),`
`173`	`173`	`bounds,`
`174`	`174`	`is_placeholder: false,`
`175`		`- kind: ast::GenericParamKind::Const { ty, kw_span: DUMMY_SP, default },`
	`175`	`+ kind: ast::GenericParamKind::Const { ty, span: DUMMY_SP, default },`
`176`	`176`	`colon_span: None,`
`177`	`177`	`}`
`178`	`178`	`}`
Original file line number	Diff line number	Diff line change
`@@ -1656,7 +1656,7 @@ impl<'a, 'ast, 'ra, 'tcx> LateResolutionVisitor<'a, 'ast, 'ra, 'tcx> {`
`1656`	`1656`	`forward_ty_ban_rib.bindings.swap_remove(i);`
`1657`	`1657`	`forward_ty_ban_rib_const_param_ty.bindings.swap_remove(i);`
`1658`	`1658`	`}`
`1659`		`- GenericParamKind::Const { ref ty, kw_span: _, ref default } => {`
	`1659`	`+ GenericParamKind::Const { ref ty, span: _, ref default } => {`
`1660`	`1660`	`// Const parameters can't have param bounds.`
`1661`	`1661`	`assert!(param.bounds.is_empty());`
`1662`	`1662`