diff options
| author | bors <bors@rust-lang.org> | 2020-09-02 07:56:44 +0000 |
|---|---|---|
| committer | bors <bors@rust-lang.org> | 2020-09-02 07:56:44 +0000 |
| commit | a62bab207686871ebef691448e06116e4b1bf8b8 (patch) | |
| tree | cc95885362bfec3bcc5788802772b1a875c0b046 | |
| parent | 48248af6307643072b337db3fe991fd6e638bfdd (diff) | |
| parent | a5754a1fad6eeb765bc825dcc657134985576787 (diff) | |
| download | rust-a62bab207686871ebef691448e06116e4b1bf8b8.tar.gz rust-a62bab207686871ebef691448e06116e4b1bf8b8.zip | |
Auto merge of #6000 - ebroto:sync-from-rust, r=ebroto
Sync from rust r? @ghost changelog: none
| -rw-r--r-- | clippy_lints/src/utils/ast_utils.rs | 4 |
1 files changed, 3 insertions, 1 deletions
diff --git a/clippy_lints/src/utils/ast_utils.rs b/clippy_lints/src/utils/ast_utils.rs index 7b419431c0f..fa8dd210eba 100644 --- a/clippy_lints/src/utils/ast_utils.rs +++ b/clippy_lints/src/utils/ast_utils.rs @@ -191,7 +191,9 @@ pub fn eq_stmt(l: &Stmt, r: &Stmt) -> bool { (Item(l), Item(r)) => eq_item(l, r, eq_item_kind), (Expr(l), Expr(r)) | (Semi(l), Semi(r)) => eq_expr(l, r), (Empty, Empty) => true, - (MacCall(l), MacCall(r)) => l.1 == r.1 && eq_mac_call(&l.0, &r.0) && over(&l.2, &r.2, |l, r| eq_attr(l, r)), + (MacCall(l), MacCall(r)) => { + l.style == r.style && eq_mac_call(&l.mac, &r.mac) && over(&l.attrs, &r.attrs, |l, r| eq_attr(l, r)) + }, _ => false, } } |