bjoernager/rust
bjoernager/rust
1
Fork 0
Code Activity

Rename NestedMetaItem::[Ll]iteral as NestedMetaItem::[Ll]it.

Browse source 
We already use a mix of `Literal` and `Lit`. The latter is better
because it is shorter without causing any ambiguity.
This commit is contained in:
Nicholas Nethercote 2022-11-24 15:00:09 +11:00
parent 1c65264f3c
commit a60e337c88
19 changed files with 34 additions and 41 deletions
Download patch file Download diff file Expand all files Collapse all files

14
compiler/rustc_attr/src/builtin.rs
View file

@ -486,7 +486,7 @@ where
continue 'outer;
}
},
NestedMetaItem::Literal(lit) => {
NestedMetaItem::Lit(lit) => {
handle_errors(
&sess.parse_sess,
lit.span,
@ -658,13 +658,11 @@ pub fn eval_condition(
ast::MetaItemKind::List(ref mis) if cfg.name_or_empty() == sym::version => {
try_gate_cfg(sym::version, cfg.span, sess, features);
let (min_version, span) = match &mis[..] {
[NestedMetaItem::Lit(MetaItemLit { kind: LitKind::Str(sym, ..), span, .. })] => {
(sym, span)
}
[
NestedMetaItem::Literal(MetaItemLit {
kind: LitKind::Str(sym, ..), span, ..
}),
] => (sym, span),
[
NestedMetaItem::Literal(MetaItemLit { span, .. })
NestedMetaItem::Lit(MetaItemLit { span, .. })
| NestedMetaItem::MetaItem(MetaItem { span, .. }),
] => {
sess.emit_err(session_diagnostics::ExpectedVersionLiteral { span: *span });
@ -901,7 +899,7 @@ where
continue 'outer;
}
},
NestedMetaItem::Literal(lit) => {
NestedMetaItem::Lit(lit) => {
handle_errors(
&sess.parse_sess,
lit.span,