Skip to content

Commit c7e4abd

Browse files
committed
Rename NestedMetaItem::[Ll]iteral as NestedMetaItem::[Ll]it.
We already use a mix of `Literal` and `Lit`. The latter is better because it is shorter without causing any ambiguity.
1 parent cdff11c commit c7e4abd

File tree

3 files changed

+5
-7
lines changed

3 files changed

+5
-7
lines changed

src/attr.rs

+2-4
Original file line numberDiff line numberDiff line change
@@ -260,9 +260,7 @@ impl Rewrite for ast::NestedMetaItem {
260260
fn rewrite(&self, context: &RewriteContext<'_>, shape: Shape) -> Option<String> {
261261
match self {
262262
ast::NestedMetaItem::MetaItem(ref meta_item) => meta_item.rewrite(context, shape),
263-
ast::NestedMetaItem::Literal(ref l) => {
264-
rewrite_literal(context, l.token_lit, l.span, shape)
265-
}
263+
ast::NestedMetaItem::Lit(ref l) => rewrite_literal(context, l.token_lit, l.span, shape),
266264
}
267265
}
268266
}
@@ -537,7 +535,7 @@ pub(crate) trait MetaVisitor<'ast> {
537535
fn visit_nested_meta_item(&mut self, nm: &'ast ast::NestedMetaItem) {
538536
match nm {
539537
ast::NestedMetaItem::MetaItem(ref meta_item) => self.visit_meta_item(meta_item),
540-
ast::NestedMetaItem::Literal(ref lit) => self.visit_meta_item_lit(lit),
538+
ast::NestedMetaItem::Lit(ref lit) => self.visit_meta_item_lit(lit),
541539
}
542540
}
543541

src/overflow.rs

+2-2
Original file line numberDiff line numberDiff line change
@@ -125,7 +125,7 @@ impl<'a> OverflowableItem<'a> {
125125
OverflowableItem::MacroArg(MacroArg::Keyword(..)) => true,
126126
OverflowableItem::MacroArg(MacroArg::Expr(expr)) => is_simple_expr(expr),
127127
OverflowableItem::NestedMetaItem(nested_meta_item) => match nested_meta_item {
128-
ast::NestedMetaItem::Literal(..) => true,
128+
ast::NestedMetaItem::Lit(..) => true,
129129
ast::NestedMetaItem::MetaItem(ref meta_item) => {
130130
matches!(meta_item.kind, ast::MetaItemKind::Word)
131131
}
@@ -169,7 +169,7 @@ impl<'a> OverflowableItem<'a> {
169169
},
170170
OverflowableItem::NestedMetaItem(nested_meta_item) if len == 1 => {
171171
match nested_meta_item {
172-
ast::NestedMetaItem::Literal(..) => false,
172+
ast::NestedMetaItem::Lit(..) => false,
173173
ast::NestedMetaItem::MetaItem(..) => true,
174174
}
175175
}

src/utils.rs

+1-1
Original file line numberDiff line numberDiff line change
@@ -263,7 +263,7 @@ fn is_skip(meta_item: &MetaItem) -> bool {
263263
fn is_skip_nested(meta_item: &NestedMetaItem) -> bool {
264264
match meta_item {
265265
NestedMetaItem::MetaItem(ref mi) => is_skip(mi),
266-
NestedMetaItem::Literal(_) => false,
266+
NestedMetaItem::Lit(_) => false,
267267
}
268268
}
269269

0 commit comments

Comments
 (0)