Replace kw_span by full span.

cjgillot · cjgillot · commit 8133ae491c76 · 2024-07-02T14:42:45.000Z
diff --git a/compiler/rustc_ast/src/ast.rs b/compiler/rustc_ast/src/ast.rs
@@ -351,7 +351,7 @@ pub enum GenericParamKind {
     Const {
         ty: P<Ty>,
         /// Span of the `const` keyword.
-        kw_span: Span,
+        span: Span,
         /// Optional default value for the const generic param
         default: Option<AnonConst>,
     },
@@ -375,10 +375,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/mut_visit.rs b/compiler/rustc_ast/src/mut_visit.rs
@@ -941,8 +941,9 @@ pub fn noop_flat_map_generic_param<T: MutVisitor>(
         GenericParamKind::Type { default } => {
             visit_opt(default, |default| vis.visit_ty(default));
         }
-        GenericParamKind::Const { ty, kw_span: _, default } => {
+        GenericParamKind::Const { ty, span, default } => {
             vis.visit_ty(ty);
+            vis.visit_span(span);
             visit_opt(default, |default| vis.visit_anon_const(default));
         }
     }
diff --git a/compiler/rustc_ast/src/visit.rs b/compiler/rustc_ast/src/visit.rs
@@ -758,7 +758,7 @@ pub fn walk_generic_param<'a, V: Visitor<'a>>(
     match kind {
         GenericParamKind::Lifetime => (),
         GenericParamKind::Type { default } => visit_opt!(visitor, visit_ty, default),
-        GenericParamKind::Const { ty, default, kw_span: _ } => {
+        GenericParamKind::Const { ty, default, span: _ } => {
             try_visit!(visitor.visit_ty(ty));
             visit_opt!(visitor, visit_anon_const, default);
         }
diff --git a/compiler/rustc_ast_lowering/src/lib.rs b/compiler/rustc_ast_lowering/src/lib.rs
@@ -2209,7 +2209,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
@@ -889,11 +889,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/generic/mod.rs b/compiler/rustc_builtin_macros/src/deriving/generic/mod.rs
@@ -668,10 +668,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_parse/src/parser/generics.rs b/compiler/rustc_parse/src/parser/generics.rs
@@ -116,13 +116,18 @@ impl<'a> Parser<'a> {
 
         // Parse optional const generics default value.
         let default = if self.eat(&token::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,
         })
@@ -139,6 +144,11 @@ impl<'a> Parser<'a> {
 
         // Parse optional const generics default value.
         let default = if self.eat(&token::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(
@@ -158,7 +168,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
@@ -1498,7 +1498,7 @@ impl<'a: 'ast, 'b, 'ast, 'tcx> LateResolutionVisitor<'a, 'b, 'ast, 'tcx> {
                             .bindings
                             .remove(&Ident::with_dummy_span(param.ident.name));
                     }
-                    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
@@ -2547,7 +2547,7 @@ impl<'a: 'ast, 'ast, 'tcx> LateResolutionVisitor<'a, '_, 'ast, '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.rs b/src/tools/clippy/clippy_utils/src/ast_utils.rs
@@ -762,13 +762,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, rd, eq_anon_const),
             _ => false,
diff --git a/src/tools/rustfmt/src/spanned.rs b/src/tools/rustfmt/src/spanned.rs
@@ -120,7 +120,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
@@ -603,7 +603,7 @@ impl Rewrite for ast::GenericParam {
 
         let param_start = if let ast::GenericParamKind::Const {
             ref ty,
-            kw_span,
+            span,
             default,
         } = &self.kind
         {
@@ -621,7 +621,7 @@ impl Rewrite for ast::GenericParam {
                 let rewrite = default.rewrite(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
`@@ -351,7 +351,7 @@ pub enum GenericParamKind {`
`351`	`351`	`Const {`
`352`	`352`	`ty: P<Ty>,`
`353`	`353`	/// Span of the `const` keyword.
`354`		`- kw_span: Span,`
	`354`	`+ span: Span,`
`355`	`355`	`/// Optional default value for the const generic param`
`356`	`356`	`default: Option<AnonConst>,`
`357`	`357`	`},`
`@@ -375,10 +375,7 @@ impl GenericParam {`
`375`	`375`	`self.ident.span`
`376`	`376`	`}`
`377`	`377`	`GenericParamKind::Type { default: Some(ty) } => self.ident.span.to(ty.span),`
`378`		`- GenericParamKind::Const { kw_span, default: Some(default), .. } => {`
`379`		`- kw_span.to(default.value.span)`
`380`		`- }`
`381`		`- GenericParamKind::Const { kw_span, default: None, ty } => kw_span.to(ty.span),`
	`378`	`+ GenericParamKind::Const { span, .. } => *span,`
`382`	`379`	`}`
`383`	`380`	`}`
`384`	`381`	`}`
Original file line number	Diff line number	Diff line change
`@@ -941,8 +941,9 @@ pub fn noop_flat_map_generic_param<T: MutVisitor>(`
`941`	`941`	`GenericParamKind::Type { default } => {`
`942`	`942`	`visit_opt(default, \|default\| vis.visit_ty(default));`
`943`	`943`	`}`
`944`		`- GenericParamKind::Const { ty, kw_span: _, default } => {`
	`944`	`+ GenericParamKind::Const { ty, span, default } => {`
`945`	`945`	`vis.visit_ty(ty);`
	`946`	`+ vis.visit_span(span);`
`946`	`947`	`visit_opt(default, \|default\| vis.visit_anon_const(default));`
`947`	`948`	`}`
`948`	`949`	`}`
Original file line number	Diff line number	Diff line change
`@@ -758,7 +758,7 @@ pub fn walk_generic_param<'a, V: Visitor<'a>>(`
`758`	`758`	`match kind {`
`759`	`759`	`GenericParamKind::Lifetime => (),`
`760`	`760`	`GenericParamKind::Type { default } => visit_opt!(visitor, visit_ty, default),`
`761`		`- GenericParamKind::Const { ty, default, kw_span: _ } => {`
	`761`	`+ GenericParamKind::Const { ty, default, span: _ } => {`
`762`	`762`	`try_visit!(visitor.visit_ty(ty));`
`763`	`763`	`visit_opt!(visitor, visit_anon_const, default);`
`764`	`764`	`}`
Original file line number	Diff line number	Diff line change
`@@ -2209,7 +2209,7 @@ impl<'a, 'hir> LoweringContext<'a, 'hir> {`
`2209`	`2209`
`2210`	`2210`	`(hir::ParamName::Plain(self.lower_ident(param.ident)), kind)`
`2211`	`2211`	`}`
`2212`		`- GenericParamKind::Const { ty, kw_span: _, default } => {`
	`2212`	`+ GenericParamKind::Const { ty, span: _, default } => {`
`2213`	`2213`	`let ty = self`
`2214`	`2214`	`.lower_ty(ty, ImplTraitContext::Disallowed(ImplTraitPosition::GenericDefault));`
`2215`	`2215`
Original file line number	Diff line number	Diff line change
`@@ -889,11 +889,11 @@ fn validate_generic_param_order(dcx: DiagCtxtHandle<'_>, generics: &[GenericPara`
`889`	`889`	`}`
`890`	`890`	`GenericParamKind::Type { default: None } => (),`
`891`	`891`	`GenericParamKind::Lifetime => (),`
`892`		`- GenericParamKind::Const { ty: _, kw_span: _, default: Some(default) } => {`
	`892`	`+ GenericParamKind::Const { ty: _, span: _, default: Some(default) } => {`
`893`	`893`	`ordered_params += " = ";`
`894`	`894`	`ordered_params += &pprust::expr_to_string(&default.value);`
`895`	`895`	`}`
`896`		`- GenericParamKind::Const { ty: _, kw_span: _, default: None } => (),`
	`896`	`+ GenericParamKind::Const { ty: _, span: _, default: None } => (),`
`897`	`897`	`}`
`898`	`898`	`first = false;`
`899`	`899`	`}`
Original file line number	Diff line number	Diff line change
`@@ -1498,7 +1498,7 @@ impl<'a: 'ast, 'b, 'ast, 'tcx> LateResolutionVisitor<'a, 'b, 'ast, 'tcx> {`
`1498`	`1498`	`.bindings`
`1499`	`1499`	`.remove(&Ident::with_dummy_span(param.ident.name));`
`1500`	`1500`	`}`
`1501`		`- GenericParamKind::Const { ref ty, kw_span: _, ref default } => {`
	`1501`	`+ GenericParamKind::Const { ref ty, span: _, ref default } => {`
`1502`	`1502`	`// Const parameters can't have param bounds.`
`1503`	`1503`	`assert!(param.bounds.is_empty());`
`1504`	`1504`