Skip to content

Commit 7ad0a66

Browse files
nnethercotennethercote
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 dac6920 commit 7ad0a66

File tree

19 files changed

+34
-41
lines changed

19 files changed

+34
-41
lines changed

‎compiler/rustc_ast/src/ast.rs

+1-1
Original file line numberDiff line numberDiff line change
@@ -489,7 +489,7 @@ pub enum NestedMetaItem {
489489
/// A literal.
490490
///
491491
/// E.g., `"foo"`, `64`, `true`.
492-
Literal(MetaItemLit),
492+
Lit(MetaItemLit),
493493
}
494494

495495
/// A spanned compile-time attribute item.

‎compiler/rustc_ast/src/attr/mod.rs

+6-6
Original file line numberDiff line numberDiff line change
@@ -51,9 +51,9 @@ impl NestedMetaItem {
5151
}
5252

5353
/// Returns the `MetaItemLit` if `self` is a `NestedMetaItem::Literal`s.
54-
pub fn literal(&self) -> Option<&MetaItemLit> {
54+
pub fn lit(&self) -> Option<&MetaItemLit> {
5555
match self {
56-
NestedMetaItem::Literal(lit) => Some(lit),
56+
NestedMetaItem::Lit(lit) => Some(lit),
5757
_ => None,
5858
}
5959
}
@@ -83,7 +83,7 @@ impl NestedMetaItem {
8383
meta_item.meta_item_list().and_then(|meta_item_list| {
8484
if meta_item_list.len() == 1
8585
&& let Some(ident) = meta_item.ident()
86-
&& let Some(lit) = meta_item_list[0].literal()
86+
&& let Some(lit) = meta_item_list[0].lit()
8787
{
8888
return Some((ident.name, lit));
8989
}
@@ -653,14 +653,14 @@ impl NestedMetaItem {
653653
pub fn span(&self) -> Span {
654654
match self {
655655
NestedMetaItem::MetaItem(item) => item.span,
656-
NestedMetaItem::Literal(lit) => lit.span,
656+
NestedMetaItem::Lit(lit) => lit.span,
657657
}
658658
}
659659

660660
fn token_trees(&self) -> Vec<TokenTree> {
661661
match self {
662662
NestedMetaItem::MetaItem(item) => item.token_trees(),
663-
NestedMetaItem::Literal(lit) => {
663+
NestedMetaItem::Lit(lit) => {
664664
vec![TokenTree::Token(lit.to_token(), Spacing::Alone)]
665665
}
666666
}
@@ -675,7 +675,7 @@ impl NestedMetaItem {
675675
if let Some(lit) = MetaItemLit::from_token(token) =>
676676
{
677677
tokens.next();
678-
return Some(NestedMetaItem::Literal(lit));
678+
return Some(NestedMetaItem::Lit(lit));
679679
}
680680
Some(TokenTree::Delimited(_, Delimiter::Invisible, inner_tokens)) => {
681681
let inner_tokens = inner_tokens.clone();

‎compiler/rustc_ast/src/mut_visit.rs

+1-1
Original file line numberDiff line numberDiff line change
@@ -628,7 +628,7 @@ pub fn noop_visit_macro_def<T: MutVisitor>(macro_def: &mut MacroDef, vis: &mut T
628628
pub fn noop_visit_meta_list_item<T: MutVisitor>(li: &mut NestedMetaItem, vis: &mut T) {
629629
match li {
630630
NestedMetaItem::MetaItem(mi) => vis.visit_meta_item(mi),
631-
NestedMetaItem::Literal(_lit) => {}
631+
NestedMetaItem::Lit(_lit) => {}
632632
}
633633
}
634634

‎compiler/rustc_ast_pretty/src/pprust/state.rs

+1-1
Original file line numberDiff line numberDiff line change
@@ -498,7 +498,7 @@ pub trait PrintState<'a>: std::ops::Deref<Target = pp::Printer> + std::ops::Dere
498498
fn print_meta_list_item(&mut self, item: &ast::NestedMetaItem) {
499499
match item {
500500
ast::NestedMetaItem::MetaItem(ref mi) => self.print_meta_item(mi),
501-
ast::NestedMetaItem::Literal(ref lit) => self.print_meta_item_lit(lit),
501+
ast::NestedMetaItem::Lit(ref lit) => self.print_meta_item_lit(lit),
502502
}
503503
}
504504

‎compiler/rustc_attr/src/builtin.rs

+6-8
Original file line numberDiff line numberDiff line change
@@ -486,7 +486,7 @@ where
486486
continue 'outer;
487487
}
488488
},
489-
NestedMetaItem::Literal(lit) => {
489+
NestedMetaItem::Lit(lit) => {
490490
handle_errors(
491491
&sess.parse_sess,
492492
lit.span,
@@ -658,13 +658,11 @@ pub fn eval_condition(
658658
ast::MetaItemKind::List(ref mis) if cfg.name_or_empty() == sym::version => {
659659
try_gate_cfg(sym::version, cfg.span, sess, features);
660660
let (min_version, span) = match &mis[..] {
661+
[NestedMetaItem::Lit(MetaItemLit { kind: LitKind::Str(sym, ..), span, .. })] => {
662+
(sym, span)
663+
}
661664
[
662-
NestedMetaItem::Literal(MetaItemLit {
663-
kind: LitKind::Str(sym, ..), span, ..
664-
}),
665-
] => (sym, span),
666-
[
667-
NestedMetaItem::Literal(MetaItemLit { span, .. })
665+
NestedMetaItem::Lit(MetaItemLit { span, .. })
668666
| NestedMetaItem::MetaItem(MetaItem { span, .. }),
669667
] => {
670668
sess.emit_err(session_diagnostics::ExpectedVersionLiteral { span: *span });
@@ -901,7 +899,7 @@ where
901899
continue 'outer;
902900
}
903901
},
904-
NestedMetaItem::Literal(lit) => {
902+
NestedMetaItem::Lit(lit) => {
905903
handle_errors(
906904
&sess.parse_sess,
907905
lit.span,

‎compiler/rustc_builtin_macros/src/derive.rs

+1-1
Original file line numberDiff line numberDiff line change
@@ -48,7 +48,7 @@ impl MultiItemModifier for Expander {
4848
.into_iter()
4949
.filter_map(|nested_meta| match nested_meta {
5050
NestedMetaItem::MetaItem(meta) => Some(meta),
51-
NestedMetaItem::Literal(lit) => {
51+
NestedMetaItem::Lit(lit) => {
5252
// Reject `#[derive("Debug")]`.
5353
report_unexpected_meta_item_lit(sess, &lit);
5454
None

‎compiler/rustc_hir_analysis/src/collect.rs

+1-1
Original file line numberDiff line numberDiff line change
@@ -2159,7 +2159,7 @@ fn check_link_ordinal(tcx: TyCtxt<'_>, attr: &ast::Attribute) -> Option<u16> {
21592159
let meta_item_list = attr.meta_item_list();
21602160
let meta_item_list = meta_item_list.as_deref();
21612161
let sole_meta_list = match meta_item_list {
2162-
Some([item]) => item.literal(),
2162+
Some([item]) => item.lit(),
21632163
Some(_) => {
21642164
tcx.sess
21652165
.struct_span_err(attr.span, "incorrect number of arguments to `#[link_ordinal]`")

‎compiler/rustc_interface/src/interface.rs

+1-1
Original file line numberDiff line numberDiff line change
@@ -194,7 +194,7 @@ pub fn parse_check_cfg(specs: Vec<String>) -> CheckCfg {
194194

195195
for val in values {
196196
if let Some(LitKind::Str(s, _)) =
197-
val.literal().map(|lit| &lit.kind)
197+
val.lit().map(|lit| &lit.kind)
198198
{
199199
ident_values.insert(s.to_string());
200200
} else {

‎compiler/rustc_lint/src/internal.rs

+2-2
Original file line numberDiff line numberDiff line change
@@ -466,8 +466,8 @@ impl LateLintPass<'_> for BadOptAccess {
466466
let Some(attr) = cx.tcx.get_attr(field.did, sym::rustc_lint_opt_deny_field_access) &&
467467
let Some(items) = attr.meta_item_list() &&
468468
let Some(item) = items.first() &&
469-
let Some(literal) = item.literal() &&
470-
let ast::LitKind::Str(val, _) = literal.kind
469+
let Some(lit) = item.lit() &&
470+
let ast::LitKind::Str(val, _) = lit.kind
471471
{
472472
cx.struct_span_lint(BAD_OPT_ACCESS, expr.span, val.as_str(), |lint|
473473
lint

‎compiler/rustc_middle/src/ty/context.rs

+1-1
Original file line numberDiff line numberDiff line change
@@ -1187,7 +1187,7 @@ impl<'tcx> TyCtxt<'tcx> {
11871187
debug!("layout_scalar_valid_range: attr={:?}", attr);
11881188
if let Some(
11891189
&[
1190-
ast::NestedMetaItem::Literal(ast::MetaItemLit {
1190+
ast::NestedMetaItem::Lit(ast::MetaItemLit {
11911191
kind: ast::LitKind::Int(a, _),
11921192
..
11931193
}),

‎compiler/rustc_parse/src/parser/attr.rs

+1-1
Original file line numberDiff line numberDiff line change
@@ -405,7 +405,7 @@ impl<'a> Parser<'a> {
405405
/// Matches `meta_item_inner : (meta_item | UNSUFFIXED_LIT) ;`.
406406
fn parse_meta_item_inner(&mut self) -> PResult<'a, ast::NestedMetaItem> {
407407
match self.parse_unsuffixed_meta_item_lit() {
408-
Ok(lit) => return Ok(ast::NestedMetaItem::Literal(lit)),
408+
Ok(lit) => return Ok(ast::NestedMetaItem::Lit(lit)),
409409
Err(err) => err.cancel(),
410410
}
411411

‎compiler/rustc_passes/src/check_attr.rs

+3-6
Original file line numberDiff line numberDiff line change
@@ -715,7 +715,7 @@ impl CheckAttrVisitor<'_> {
715715
if let Some(values) = meta.meta_item_list() {
716716
let mut errors = 0;
717717
for v in values {
718-
match v.literal() {
718+
match v.lit() {
719719
Some(l) => match l.kind {
720720
LitKind::Str(s, _) => {
721721
if !self.check_doc_alias_value(v, s, hir_id, target, true, aliases) {
@@ -1355,10 +1355,7 @@ impl CheckAttrVisitor<'_> {
13551355
return false;
13561356
};
13571357

1358-
if matches!(
1359-
&list[..],
1360-
&[NestedMetaItem::Literal(MetaItemLit { kind: LitKind::Int(..), .. })]
1361-
) {
1358+
if matches!(&list[..], &[NestedMetaItem::Lit(MetaItemLit { kind: LitKind::Int(..), .. })]) {
13621359
true
13631360
} else {
13641361
self.tcx.sess.emit_err(errors::RustcLayoutScalarValidRangeArg { attr_span: attr.span });
@@ -1421,7 +1418,7 @@ impl CheckAttrVisitor<'_> {
14211418
let arg_count = decl.inputs.len() as u128 + generics.params.len() as u128;
14221419
let mut invalid_args = vec![];
14231420
for meta in list {
1424-
if let Some(LitKind::Int(val, _)) = meta.literal().map(|lit| &lit.kind) {
1421+
if let Some(LitKind::Int(val, _)) = meta.lit().map(|lit| &lit.kind) {
14251422
if *val >= arg_count {
14261423
let span = meta.span();
14271424
self.tcx.sess.emit_err(errors::RustcLegacyConstGenericsIndexExceed {

‎compiler/rustc_resolve/src/lib.rs

+1-1
Original file line numberDiff line numberDiff line change
@@ -1984,7 +1984,7 @@ impl<'a> Resolver<'a> {
19841984
.find(|a| a.has_name(sym::rustc_legacy_const_generics))?;
19851985
let mut ret = Vec::new();
19861986
for meta in attr.meta_item_list()? {
1987-
match meta.literal()?.kind {
1987+
match meta.lit()?.kind {
19881988
LitKind::Int(a, _) => ret.push(a as usize),
19891989
_ => panic!("invalid arg index"),
19901990
}

‎src/librustdoc/clean/cfg.rs

+1-1
Original file line numberDiff line numberDiff line change
@@ -50,7 +50,7 @@ impl Cfg {
5050
) -> Result<Option<Cfg>, InvalidCfgError> {
5151
match nested_cfg {
5252
NestedMetaItem::MetaItem(ref cfg) => Cfg::parse_without(cfg, exclude),
53-
NestedMetaItem::Literal(ref lit) => {
53+
NestedMetaItem::Lit(ref lit) => {
5454
Err(InvalidCfgError { msg: "unexpected literal", span: lit.span })
5555
}
5656
}

‎src/librustdoc/clean/mod.rs

+1-1
Original file line numberDiff line numberDiff line change
@@ -893,7 +893,7 @@ fn clean_fn_decl_legacy_const_generics(func: &mut Function, attrs: &[ast::Attrib
893893
.filter(|a| a.has_name(sym::rustc_legacy_const_generics))
894894
.filter_map(|a| a.meta_item_list())
895895
{
896-
for (pos, literal) in meta_item_list.iter().filter_map(|meta| meta.literal()).enumerate() {
896+
for (pos, literal) in meta_item_list.iter().filter_map(|meta| meta.lit()).enumerate() {
897897
match literal.kind {
898898
ast::LitKind::Int(a, _) => {
899899
let gen = func.generics.params.remove(0);

‎src/librustdoc/clean/types.rs

+1-1
Original file line numberDiff line numberDiff line change
@@ -1306,7 +1306,7 @@ impl Attributes {
13061306
for attr in self.other_attrs.lists(sym::doc).filter(|a| a.has_name(sym::alias)) {
13071307
if let Some(values) = attr.meta_item_list() {
13081308
for l in values {
1309-
match l.literal().unwrap().kind {
1309+
match l.lit().unwrap().kind {
13101310
ast::LitKind::Str(s, _) => {
13111311
aliases.insert(s);
13121312
}

‎src/tools/rustfmt/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/tools/rustfmt/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/tools/rustfmt/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)