Skip to content

Commit 0628454

Browse files
committed
Give VariantData::Struct named fields, to clairfy recovered.
1 parent d165a38 commit 0628454

File tree

4 files changed

+7
-5
lines changed

4 files changed

+7
-5
lines changed

clippy_lints/src/item_name_repetitions.rs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -436,7 +436,7 @@ impl LateLintPass<'_> for ItemNameRepetitions {
436436
{
437437
match item.kind {
438438
ItemKind::Enum(def, _) => check_variant(cx, self.enum_threshold, &def, item_name, item.span),
439-
ItemKind::Struct(VariantData::Struct(fields, _), _) => {
439+
ItemKind::Struct(VariantData::Struct { fields, .. }, _) => {
440440
check_fields(cx, self.struct_threshold, item, fields);
441441
},
442442
_ => (),

clippy_lints/src/manual_non_exhaustive.rs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -103,7 +103,7 @@ impl EarlyLintPass for ManualNonExhaustiveStruct {
103103

104104
if let ast::ItemKind::Struct(variant_data, _) = &item.kind {
105105
let (fields, delimiter) = match variant_data {
106-
ast::VariantData::Struct(fields, _) => (&**fields, '{'),
106+
ast::VariantData::Struct { fields, .. } => (&**fields, '{'),
107107
ast::VariantData::Tuple(fields, _) => (&**fields, '('),
108108
ast::VariantData::Unit(_) => return,
109109
};

clippy_utils/src/ast_utils.rs

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -546,7 +546,9 @@ pub fn eq_variant_data(l: &VariantData, r: &VariantData) -> bool {
546546
use VariantData::*;
547547
match (l, r) {
548548
(Unit(_), Unit(_)) => true,
549-
(Struct(l, _), Struct(r, _)) | (Tuple(l, _), Tuple(r, _)) => over(l, r, eq_struct_field),
549+
(Struct { fields: l, .. }, Struct { fields: r, .. }) | (Tuple(l, _), Tuple(r, _)) => {
550+
over(l, r, eq_struct_field)
551+
},
550552
_ => false,
551553
}
552554
}

clippy_utils/src/check_proc_macro.rs

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -200,7 +200,7 @@ fn item_search_pat(item: &Item<'_>) -> (Pat, Pat) {
200200
ItemKind::ForeignMod { .. } => (Pat::Str("extern"), Pat::Str("}")),
201201
ItemKind::TyAlias(..) | ItemKind::OpaqueTy(_) => (Pat::Str("type"), Pat::Str(";")),
202202
ItemKind::Enum(..) => (Pat::Str("enum"), Pat::Str("}")),
203-
ItemKind::Struct(VariantData::Struct(..), _) => (Pat::Str("struct"), Pat::Str("}")),
203+
ItemKind::Struct(VariantData::Struct { .. }, _) => (Pat::Str("struct"), Pat::Str("}")),
204204
ItemKind::Struct(..) => (Pat::Str("struct"), Pat::Str(";")),
205205
ItemKind::Union(..) => (Pat::Str("union"), Pat::Str("}")),
206206
ItemKind::Trait(_, Unsafety::Unsafe, ..)
@@ -255,7 +255,7 @@ fn field_def_search_pat(def: &FieldDef<'_>) -> (Pat, Pat) {
255255

256256
fn variant_search_pat(v: &Variant<'_>) -> (Pat, Pat) {
257257
match v.data {
258-
VariantData::Struct(..) => (Pat::Sym(v.ident.name), Pat::Str("}")),
258+
VariantData::Struct { .. } => (Pat::Sym(v.ident.name), Pat::Str("}")),
259259
VariantData::Tuple(..) => (Pat::Sym(v.ident.name), Pat::Str("")),
260260
VariantData::Unit(..) => (Pat::Sym(v.ident.name), Pat::Sym(v.ident.name)),
261261
}

0 commit comments

Comments
 (0)