about summary refs log tree commit diff
diff options
context:
space:
mode:
authorManish Goregaokar <manishsmail@gmail.com>2020-06-26 00:39:08 -0700
committerGitHub <noreply@github.com>2020-06-26 00:39:08 -0700
commita671ea4d3f9d416d9520d2ea902cb9f48eb35898 (patch)
treecbe6eae64fa28823b4a4f9248b64bd49fdd9bf57
parent80bcbf521c7ff95e38a7567432b5519cc18e5b2a (diff)
parent7c1b3aa0ddb81954a804455ca45fcf09fdb17dd8 (diff)
downloadrust-a671ea4d3f9d416d9520d2ea902cb9f48eb35898.tar.gz
rust-a671ea4d3f9d416d9520d2ea902cb9f48eb35898.zip
Rollup merge of #73597 - ayazhafiz:i/const-span, r=ecstatic-morse
Record span of `const` kw in GenericParamKind

Context: this is needed for a fix of https://github.com/rust-lang/rustfmt/issues/4263,
which currently records the span of a const generic param incorrectly
because the location of the `const` kw is not known.

I am not sure how to add tests for this; any guidance in how to do so
would be appreciated :slightly_smiling_face:
-rwxr-xr-xclippy_lints/src/utils/ast_utils.rs2
1 files changed, 1 insertions, 1 deletions
diff --git a/clippy_lints/src/utils/ast_utils.rs b/clippy_lints/src/utils/ast_utils.rs
index e60e2a81e07..e19a79dd8da 100755
--- a/clippy_lints/src/utils/ast_utils.rs
+++ b/clippy_lints/src/utils/ast_utils.rs
@@ -476,7 +476,7 @@ pub fn eq_generic_param(l: &GenericParam, r: &GenericParam) -> bool {
         && match (&l.kind, &r.kind) {
             (Lifetime, Lifetime) => true,
             (Type { default: l }, Type { default: r }) => both(l, r, |l, r| eq_ty(l, r)),
-            (Const { ty: l }, Const { ty: r }) => eq_ty(l, r),
+            (Const { ty: l, kw_span: _ }, Const { ty: r, kw_span: _ }) => eq_ty(l, r),
             _ => false,
         }
         && over(&l.attrs, &r.attrs, |l, r| eq_attr(l, r))