diff options
| author | bors <bors@rust-lang.org> | 2020-06-26 10:11:43 +0000 |
|---|---|---|
| committer | bors <bors@rust-lang.org> | 2020-06-26 10:11:43 +0000 |
| commit | 81810fa8f400b1d941b8bf14b2d085cf0a045ae1 (patch) | |
| tree | db49e4fcb2d7a1932f1dad8aec5a51b265e5a2ad | |
| parent | f5ce0e5fe960d09db01cf912c475cd1a52131120 (diff) | |
| parent | a671ea4d3f9d416d9520d2ea902cb9f48eb35898 (diff) | |
| download | rust-81810fa8f400b1d941b8bf14b2d085cf0a045ae1.tar.gz rust-81810fa8f400b1d941b8bf14b2d085cf0a045ae1.zip | |
Auto merge of #73756 - Manishearth:rollup-aehswb2, r=Manishearth
Rollup of 13 pull requests Successful merges: - #72620 (Omit DW_AT_linkage_name when it is the same as DW_AT_name) - #72967 (Don't move cursor in search box when using arrows to navigate results) - #73102 (proc_macro: Stop flattening groups with dummy spans) - #73297 (Support configurable deny-warnings for all in-tree crates.) - #73507 (Cleanup MinGW LLVM linkage workaround) - #73588 (Fix handling of reserved registers for ARM inline asm) - #73597 (Record span of `const` kw in GenericParamKind) - #73629 (Make AssocOp Copy) - #73681 (Update Chalk to 0.14) - #73707 (Fix links in `SliceIndex` documentation) - #73719 (emitter: column width defaults to 140) - #73729 (disable collectionbenches for android) - #73748 (Add code block to code in documentation of `List::rebase_onto`) Failed merges: r? @ghost
| -rwxr-xr-x | clippy_lints/src/utils/ast_utils.rs | 2 |
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)) |
