Skip to content

Commit a932119

Browse files
matthiaskrgrmatthiaskrgr
authored
Rollup merge of rust-lang#104804 - nnethercote:MetaItemLit, r=petrochenkov
Rename `ast::Lit` as `ast::MetaItemLit`. And some other literal cleanups. r? `@petrochenkov`
2 parents e4df8fb + 7ad0a66 commit a932119

File tree

28 files changed

+125
-127
lines changed

28 files changed

+125
-127
lines changed

‎compiler/rustc_ast/src/ast.rs

+11-11
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(Lit),
492+
Lit(MetaItemLit),
493493
}
494494

495495
/// A spanned compile-time attribute item.
@@ -518,7 +518,7 @@ pub enum MetaItemKind {
518518
/// Name value meta item.
519519
///
520520
/// E.g., `feature = "foo"` as in `#[feature = "foo"]`.
521-
NameValue(Lit),
521+
NameValue(MetaItemLit),
522522
}
523523

524524
/// A block (`{ .. }`).
@@ -1571,12 +1571,12 @@ pub enum AttrArgs {
15711571
}
15721572

15731573
// The RHS of an `AttrArgs::Eq` starts out as an expression. Once macro
1574-
// expansion is completed, all cases end up either as a literal, which is the
1575-
// form used after lowering to HIR, or as an error.
1574+
// expansion is completed, all cases end up either as a meta item literal,
1575+
// which is the form used after lowering to HIR, or as an error.
15761576
#[derive(Clone, Encodable, Decodable, Debug)]
15771577
pub enum AttrArgsEq {
15781578
Ast(P<Expr>),
1579-
Hir(Lit),
1579+
Hir(MetaItemLit),
15801580
}
15811581

15821582
impl AttrArgs {
@@ -1698,19 +1698,18 @@ pub enum StrStyle {
16981698
Raw(u8),
16991699
}
17001700

1701-
/// An AST literal.
1701+
/// A literal in a meta item.
17021702
#[derive(Clone, Encodable, Decodable, Debug, HashStable_Generic)]
1703-
pub struct Lit {
1703+
pub struct MetaItemLit {
17041704
/// The original literal token as written in source code.
17051705
pub token_lit: token::Lit,
17061706
/// The "semantic" representation of the literal lowered from the original tokens.
17071707
/// Strings are unescaped, hexadecimal forms are eliminated, etc.
1708-
/// FIXME: Remove this and only create the semantic representation during lowering to HIR.
17091708
pub kind: LitKind,
17101709
pub span: Span,
17111710
}
17121711

1713-
/// Same as `Lit`, but restricted to string literals.
1712+
/// Similar to `MetaItemLit`, but restricted to string literals.
17141713
#[derive(Clone, Copy, Encodable, Decodable, Debug)]
17151714
pub struct StrLit {
17161715
/// The original literal token as written in source code.
@@ -1719,7 +1718,6 @@ pub struct StrLit {
17191718
pub suffix: Option<Symbol>,
17201719
pub span: Span,
17211720
/// The unescaped "semantic" representation of the literal lowered from the original token.
1722-
/// FIXME: Remove this and only create the semantic representation during lowering to HIR.
17231721
pub symbol_unescaped: Symbol,
17241722
}
17251723

@@ -1755,6 +1753,8 @@ pub enum LitFloatType {
17551753
Unsuffixed,
17561754
}
17571755

1756+
/// This type is used within both `ast::MetaItemLit` and `hir::Lit`.
1757+
///
17581758
/// Note that the entire literal (including the suffix) is considered when
17591759
/// deciding the `LitKind`. This means that float literals like `1f32` are
17601760
/// classified by this type as `Float`. This is different to `token::LitKind`
@@ -3068,9 +3068,9 @@ mod size_asserts {
30683068
static_assert_size!(Impl, 184);
30693069
static_assert_size!(Item, 184);
30703070
static_assert_size!(ItemKind, 112);
3071-
static_assert_size!(Lit, 48);
30723071
static_assert_size!(LitKind, 24);
30733072
static_assert_size!(Local, 72);
3073+
static_assert_size!(MetaItemLit, 48);
30743074
static_assert_size!(Param, 40);
30753075
static_assert_size!(Pat, 88);
30763076
static_assert_size!(Path, 24);

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

+14-14
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@
22
33
use crate::ast;
44
use crate::ast::{AttrArgs, AttrArgsEq, AttrId, AttrItem, AttrKind, AttrStyle, Attribute};
5-
use crate::ast::{DelimArgs, Lit, LitKind};
5+
use crate::ast::{DelimArgs, LitKind, MetaItemLit};
66
use crate::ast::{MacDelimiter, MetaItem, MetaItemKind, NestedMetaItem};
77
use crate::ast::{Path, PathSegment};
88
use crate::ptr::P;
@@ -50,10 +50,10 @@ impl NestedMetaItem {
5050
}
5151
}
5252

53-
/// Returns the `Lit` if `self` is a `NestedMetaItem::Literal`s.
54-
pub fn literal(&self) -> Option<&Lit> {
53+
/// Returns the `MetaItemLit` if `self` is a `NestedMetaItem::Literal`s.
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
}
@@ -78,12 +78,12 @@ impl NestedMetaItem {
7878
}
7979

8080
/// Returns a name and single literal value tuple of the `MetaItem`.
81-
pub fn name_value_literal(&self) -> Option<(Symbol, &Lit)> {
81+
pub fn name_value_literal(&self) -> Option<(Symbol, &MetaItemLit)> {
8282
self.meta_item().and_then(|meta_item| {
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
}
@@ -177,7 +177,7 @@ impl MetaItem {
177177
// Example:
178178
// #[attribute(name = "value")]
179179
// ^^^^^^^^^^^^^^
180-
pub fn name_value_literal(&self) -> Option<&Lit> {
180+
pub fn name_value_literal(&self) -> Option<&MetaItemLit> {
181181
match &self.kind {
182182
MetaItemKind::NameValue(v) => Some(v),
183183
_ => None,
@@ -332,7 +332,7 @@ pub fn mk_name_value_item_str(ident: Ident, str: Symbol, str_span: Span) -> Meta
332332
}
333333

334334
pub fn mk_name_value_item(ident: Ident, lit_kind: LitKind, lit_span: Span) -> MetaItem {
335-
let lit = Lit::from_lit_kind(lit_kind, lit_span);
335+
let lit = MetaItemLit::from_lit_kind(lit_kind, lit_span);
336336
let span = ident.span.to(lit_span);
337337
MetaItem { path: Path::from_ident(ident), span, kind: MetaItemKind::NameValue(lit) }
338338
}
@@ -602,7 +602,7 @@ impl MetaItemKind {
602602
MetaItemKind::name_value_from_tokens(&mut inner_tokens.into_trees())
603603
}
604604
Some(TokenTree::Token(token, _)) => {
605-
Lit::from_token(&token).map(MetaItemKind::NameValue)
605+
MetaItemLit::from_token(&token).map(MetaItemKind::NameValue)
606606
}
607607
_ => None,
608608
}
@@ -620,7 +620,7 @@ impl MetaItemKind {
620620
AttrArgs::Eq(_, AttrArgsEq::Ast(expr)) => match expr.kind {
621621
ast::ExprKind::Lit(token_lit) => {
622622
// Turn failures to `None`, we'll get parse errors elsewhere.
623-
Lit::from_token_lit(token_lit, expr.span)
623+
MetaItemLit::from_token_lit(token_lit, expr.span)
624624
.ok()
625625
.map(|lit| MetaItemKind::NameValue(lit))
626626
}
@@ -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
}
@@ -672,10 +672,10 @@ impl NestedMetaItem {
672672
{
673673
match tokens.peek() {
674674
Some(TokenTree::Token(token, _))
675-
if let Some(lit) = Lit::from_token(token) =>
675+
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/src/util/literal.rs

+12-20
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,7 @@
11
//! Code related to parsing literals.
22
3-
use crate::ast::{self, Lit, LitKind};
3+
use crate::ast::{self, LitKind, MetaItemLit};
44
use crate::token::{self, Token};
5-
use rustc_data_structures::sync::Lrc;
65
use rustc_lexer::unescape::{byte_from_char, unescape_byte, unescape_char, unescape_literal, Mode};
76
use rustc_span::symbol::{kw, sym, Symbol};
87
use rustc_span::Span;
@@ -196,33 +195,26 @@ impl LitKind {
196195
}
197196
}
198197

199-
impl Lit {
200-
/// Converts literal token into an AST literal.
201-
pub fn from_token_lit(token_lit: token::Lit, span: Span) -> Result<Lit, LitError> {
202-
Ok(Lit { token_lit, kind: LitKind::from_token_lit(token_lit)?, span })
198+
impl MetaItemLit {
199+
/// Converts token literal into a meta item literal.
200+
pub fn from_token_lit(token_lit: token::Lit, span: Span) -> Result<MetaItemLit, LitError> {
201+
Ok(MetaItemLit { token_lit, kind: LitKind::from_token_lit(token_lit)?, span })
203202
}
204203

205-
/// Converts an arbitrary token into an AST literal.
206-
pub fn from_token(token: &Token) -> Option<Lit> {
204+
/// Converts an arbitrary token into meta item literal.
205+
pub fn from_token(token: &Token) -> Option<MetaItemLit> {
207206
token::Lit::from_token(token)
208-
.and_then(|token_lit| Lit::from_token_lit(token_lit, token.span).ok())
207+
.and_then(|token_lit| MetaItemLit::from_token_lit(token_lit, token.span).ok())
209208
}
210209

211-
/// Attempts to recover an AST literal from semantic literal.
210+
/// Attempts to create a meta item literal from a `LitKind`.
212211
/// This function is used when the original token doesn't exist (e.g. the literal is created
213212
/// by an AST-based macro) or unavailable (e.g. from HIR pretty-printing).
214-
pub fn from_lit_kind(kind: LitKind, span: Span) -> Lit {
215-
Lit { token_lit: kind.to_token_lit(), kind, span }
213+
pub fn from_lit_kind(kind: LitKind, span: Span) -> MetaItemLit {
214+
MetaItemLit { token_lit: kind.to_token_lit(), kind, span }
216215
}
217216

218-
/// Recovers an AST literal from a string of bytes produced by `include_bytes!`.
219-
/// This requires ASCII-escaping the string, which can result in poor performance
220-
/// for very large strings of bytes.
221-
pub fn from_included_bytes(bytes: &Lrc<[u8]>, span: Span) -> Lit {
222-
Self::from_lit_kind(LitKind::ByteStr(bytes.clone()), span)
223-
}
224-
225-
/// Losslessly convert an AST literal into a token.
217+
/// Losslessly convert a meta item literal into a token.
226218
pub fn to_token(&self) -> Token {
227219
let kind = match self.token_lit.kind {
228220
token::Bool => token::Ident(self.token_lit.symbol, false),

‎compiler/rustc_ast_lowering/src/lib.rs

+5-10
Original file line numberDiff line numberDiff line change
@@ -941,17 +941,12 @@ impl<'a, 'hir> LoweringContext<'a, 'hir> {
941941
AttrArgs::Eq(eq_span, AttrArgsEq::Ast(expr)) => {
942942
// In valid code the value always ends up as a single literal. Otherwise, a dummy
943943
// literal suffices because the error is handled elsewhere.
944-
let lit = if let ExprKind::Lit(token_lit) = expr.kind {
945-
match Lit::from_token_lit(token_lit, expr.span) {
946-
Ok(lit) => lit,
947-
Err(_err) => Lit {
948-
token_lit: token::Lit::new(token::LitKind::Err, kw::Empty, None),
949-
kind: LitKind::Err,
950-
span: DUMMY_SP,
951-
},
952-
}
944+
let lit = if let ExprKind::Lit(token_lit) = expr.kind
945+
&& let Ok(lit) = MetaItemLit::from_token_lit(token_lit, expr.span)
946+
{
947+
lit
953948
} else {
954-
Lit {
949+
MetaItemLit {
955950
token_lit: token::Lit::new(token::LitKind::Err, kw::Empty, None),
956951
kind: LitKind::Err,
957952
span: DUMMY_SP,

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

+6-6
Original file line numberDiff line numberDiff line change
@@ -371,7 +371,7 @@ pub trait PrintState<'a>: std::ops::Deref<Target = pp::Printer> + std::ops::Dere
371371
}
372372
}
373373

374-
fn print_literal(&mut self, lit: &ast::Lit) {
374+
fn print_meta_item_lit(&mut self, lit: &ast::MetaItemLit) {
375375
self.print_token_literal(lit.token_lit, lit.span)
376376
}
377377

@@ -488,7 +488,7 @@ pub trait PrintState<'a>: std::ops::Deref<Target = pp::Printer> + std::ops::Dere
488488
self.print_path(&item.path, false, 0);
489489
self.space();
490490
self.word_space("=");
491-
let token_str = self.literal_to_string(lit);
491+
let token_str = self.meta_item_lit_to_string(lit);
492492
self.word(token_str);
493493
}
494494
}
@@ -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_literal(lit),
501+
ast::NestedMetaItem::Lit(ref lit) => self.print_meta_item_lit(lit),
502502
}
503503
}
504504

@@ -510,7 +510,7 @@ pub trait PrintState<'a>: std::ops::Deref<Target = pp::Printer> + std::ops::Dere
510510
self.print_path(&item.path, false, 0);
511511
self.space();
512512
self.word_space("=");
513-
self.print_literal(value);
513+
self.print_meta_item_lit(value);
514514
}
515515
ast::MetaItemKind::List(ref items) => {
516516
self.print_path(&item.path, false, 0);
@@ -825,8 +825,8 @@ pub trait PrintState<'a>: std::ops::Deref<Target = pp::Printer> + std::ops::Dere
825825
Self::to_string(|s| s.print_expr(e))
826826
}
827827

828-
fn literal_to_string(&self, lit: &ast::Lit) -> String {
829-
Self::to_string(|s| s.print_literal(lit))
828+
fn meta_item_lit_to_string(&self, lit: &ast::MetaItemLit) -> String {
829+
Self::to_string(|s| s.print_meta_item_lit(lit))
830830
}
831831

832832
fn tt_to_string(&self, tt: &TokenTree) -> String {

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

+2-2
Original file line numberDiff line numberDiff line change
@@ -328,8 +328,8 @@ impl<'a> State<'a> {
328328
self.print_token_literal(token_lit, expr.span);
329329
}
330330
ast::ExprKind::IncludedBytes(ref bytes) => {
331-
let lit = ast::Lit::from_included_bytes(bytes, expr.span);
332-
self.print_literal(&lit)
331+
let lit = ast::LitKind::ByteStr(bytes.clone()).to_token_lit();
332+
self.print_token_literal(lit, expr.span)
333333
}
334334
ast::ExprKind::Cast(ref expr, ref ty) => {
335335
let prec = AssocOp::As.precedence() as i8;

‎compiler/rustc_attr/src/builtin.rs

+5-5
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
//! Parsing and validation of builtin attributes
22
33
use rustc_ast as ast;
4-
use rustc_ast::{Attribute, Lit, LitKind, MetaItem, MetaItemKind, NestedMetaItem, NodeId};
4+
use rustc_ast::{Attribute, LitKind, MetaItem, MetaItemKind, MetaItemLit, NestedMetaItem, NodeId};
55
use rustc_ast_pretty::pprust;
66
use rustc_feature::{find_gated_cfg, is_builtin_attr_name, Features, GatedCfg};
77
use rustc_macros::HashStable_Generic;
@@ -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,11 +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::Literal(Lit { kind: LitKind::Str(sym, ..), span, .. })] => {
661+
[NestedMetaItem::Lit(MetaItemLit { kind: LitKind::Str(sym, ..), span, .. })] => {
662662
(sym, span)
663663
}
664664
[
665-
NestedMetaItem::Literal(Lit { span, .. })
665+
NestedMetaItem::Lit(MetaItemLit { span, .. })
666666
| NestedMetaItem::MetaItem(MetaItem { span, .. }),
667667
] => {
668668
sess.emit_err(session_diagnostics::ExpectedVersionLiteral { span: *span });
@@ -899,7 +899,7 @@ where
899899
continue 'outer;
900900
}
901901
},
902-
NestedMetaItem::Literal(lit) => {
902+
NestedMetaItem::Lit(lit) => {
903903
handle_errors(
904904
&sess.parse_sess,
905905
lit.span,

‎compiler/rustc_builtin_macros/src/derive.rs

+3-3
Original file line numberDiff line numberDiff line change
@@ -48,9 +48,9 @@ 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")]`.
53-
report_unexpected_literal(sess, &lit);
53+
report_unexpected_meta_item_lit(sess, &lit);
5454
None
5555
}
5656
})
@@ -127,7 +127,7 @@ fn report_bad_target(sess: &Session, item: &Annotatable, span: Span) -> bool {
127127
bad_target
128128
}
129129

130-
fn report_unexpected_literal(sess: &Session, lit: &ast::Lit) {
130+
fn report_unexpected_meta_item_lit(sess: &Session, lit: &ast::MetaItemLit) {
131131
let help_msg = match lit.token_lit.kind {
132132
token::Str if rustc_lexer::is_ident(lit.token_lit.symbol.as_str()) => {
133133
format!("try using `#[derive({})]`", lit.token_lit.symbol)

0 commit comments

Comments
 (0)