Skip to content

Commit

Permalink
ast: Keep expansion status for out-of-line module items
Browse files Browse the repository at this point in the history
Also remove `ast::Mod` which is mostly redundant now
  • Loading branch information
petrochenkov committed Feb 18, 2021
1 parent a149f61 commit b185fa3
Showing 1 changed file with 6 additions and 3 deletions.
9 changes: 6 additions & 3 deletions clippy_lints/src/utils/ast_utils.rs
Expand Up @@ -241,9 +241,12 @@ pub fn eq_item_kind(l: &ItemKind, r: &ItemKind) -> bool {
&& eq_generics(lg, rg)
&& both(lb, rb, |l, r| eq_block(l, r))
}
(Mod(l), Mod(r)) => {
l.inline == r.inline && over(&l.items, &r.items, |l, r| eq_item(l, r, eq_item_kind))
}
(Mod(lu, lmk), Mod(ru, rmk)) => lu == ru && match (lmk, rmk) {
(ModKind::Loaded(litems, linline, _), ModKind::Loaded(ritems, rinline, _)) =>
linline == rinline && over(litems, ritems, |l, r| eq_item(l, r, eq_item_kind)),
(ModKind::Unloaded, ModKind::Unloaded) => true,
_ => false,
},
(ForeignMod(l), ForeignMod(r)) => {
both(&l.abi, &r.abi, |l, r| eq_str_lit(l, r))
&& over(&l.items, &r.items, |l, r| eq_item(l, r, eq_foreign_item_kind))
Expand Down

0 comments on commit b185fa3

Please sign in to comment.