Skip to content

Commit 53300bd

Browse files
eddybeddyb
committed
syntax: rename MetaItem's ident field to path.
1 parent 9abc231 commit 53300bd

File tree

14 files changed

+36
-36
lines changed

14 files changed

+36
-36
lines changed

‎src/librustc/ich/impls_syntax.rs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -380,7 +380,7 @@ impl_stable_hash_for!(enum ::syntax::ast::NestedMetaItemKind {
380380
});
381381

382382
impl_stable_hash_for!(struct ::syntax::ast::MetaItem {
383-
ident,
383+
path,
384384
node,
385385
span
386386
});

‎src/librustc/lint/levels.rs

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -233,7 +233,7 @@ impl<'a> LintLevelsBuilder<'a> {
233233
ast::MetaItemKind::Word => {} // actual lint names handled later
234234
ast::MetaItemKind::NameValue(ref name_value) => {
235235
let gate_reasons = !self.sess.features_untracked().lint_reasons;
236-
if item.ident == "reason" {
236+
if item.path == "reason" {
237237
// found reason, reslice meta list to exclude it
238238
metas = &metas[0..metas.len()-1];
239239
// FIXME (#55112): issue unused-attributes lint if we thereby
@@ -274,7 +274,7 @@ impl<'a> LintLevelsBuilder<'a> {
274274
let mut err = bad_attr(li.span);
275275
if let Some(item) = li.meta_item() {
276276
if let ast::MetaItemKind::NameValue(_) = item.node {
277-
if item.ident == "reason" {
277+
if item.path == "reason" {
278278
err.help("reason in lint attribute must come last");
279279
}
280280
}
@@ -290,7 +290,7 @@ impl<'a> LintLevelsBuilder<'a> {
290290
lint_tool.span,
291291
E0710,
292292
"an unknown tool name found in scoped lint: `{}`",
293-
word.ident
293+
word.path
294294
);
295295
continue;
296296
}

‎src/librustc/session/config.rs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1766,7 +1766,7 @@ pub fn parse_cfgspecs(cfgspecs: Vec<String>) -> ast::CrateConfig {
17661766

17671767
match &mut parser.parse_meta_item() {
17681768
Ok(meta_item) if parser.token == token::Eof => {
1769-
if meta_item.ident.segments.len() != 1 {
1769+
if meta_item.path.segments.len() != 1 {
17701770
error!("argument key must be an identifier");
17711771
}
17721772
match &meta_item.node {

‎src/librustc_driver/lib.rs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1071,7 +1071,7 @@ impl RustcDefaultCalls {
10711071

10721072
let mut cfgs = sess.parse_sess.config.iter().filter_map(|&(name, ref value)| {
10731073
let gated_cfg = GatedCfg::gate(&ast::MetaItem {
1074-
ident: ast::Path::from_ident(ast::Ident::with_empty_ctxt(name)),
1074+
path: ast::Path::from_ident(ast::Ident::with_empty_ctxt(name)),
10751075
node: ast::MetaItemKind::Word,
10761076
span: DUMMY_SP,
10771077
});

‎src/librustc_mir/dataflow/mod.rs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -151,7 +151,7 @@ impl<'a, 'gcx: 'tcx, 'tcx: 'a, BD> DataflowAnalysis<'a, 'tcx, BD> where BD: BitD
151151
} else {
152152
sess.span_err(
153153
item.span,
154-
&format!("{} attribute requires a path", item.ident));
154+
&format!("{} attribute requires a path", item.path));
155155
return None;
156156
}
157157
}

‎src/libsyntax/ast.rs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -430,7 +430,7 @@ pub enum NestedMetaItemKind {
430430
/// E.g. `#[test]`, `#[derive(..)]`, `#[rustfmt::skip]` or `#[feature = "foo"]`
431431
#[derive(Clone, RustcEncodable, RustcDecodable, Debug)]
432432
pub struct MetaItem {
433-
pub ident: Path,
433+
pub path: Path,
434434
pub node: MetaItemKind,
435435
pub span: Span,
436436
}

‎src/libsyntax/attr/builtin.rs

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -499,8 +499,8 @@ pub fn cfg_matches(cfg: &ast::MetaItem, sess: &ParseSess, features: Option<&Feat
499499
gated_cfg.check_and_emit(sess, feats);
500500
}
501501
let error = |span, msg| { sess.span_diagnostic.span_err(span, msg); true };
502-
if cfg.ident.segments.len() != 1 {
503-
return error(cfg.ident.span, "`cfg` predicate key must be an identifier");
502+
if cfg.path.segments.len() != 1 {
503+
return error(cfg.path.span, "`cfg` predicate key must be an identifier");
504504
}
505505
match &cfg.node {
506506
MetaItemKind::List(..) => {

‎src/libsyntax/attr/mod.rs

Lines changed: 16 additions & 16 deletions
Original file line numberDiff line numberDiff line change
@@ -216,7 +216,7 @@ impl Attribute {
216216

217217
impl MetaItem {
218218
pub fn name(&self) -> Name {
219-
name_from_path(&self.ident)
219+
name_from_path(&self.path)
220220
}
221221

222222
// #[attribute(name = "value")]
@@ -269,8 +269,8 @@ impl MetaItem {
269269
}
270270

271271
pub fn is_scoped(&self) -> Option<Ident> {
272-
if self.ident.segments.len() > 1 {
273-
Some(self.ident.segments[0].ident)
272+
if self.path.segments.len() > 1 {
273+
Some(self.path.segments[0].ident)
274274
} else {
275275
None
276276
}
@@ -282,7 +282,7 @@ impl Attribute {
282282
pub fn meta(&self) -> Option<MetaItem> {
283283
let mut tokens = self.tokens.trees().peekable();
284284
Some(MetaItem {
285-
ident: self.path.clone(),
285+
path: self.path.clone(),
286286
node: if let Some(node) = MetaItemKind::from_tokens(&mut tokens) {
287287
if tokens.peek().is_some() {
288288
return None;
@@ -328,7 +328,7 @@ impl Attribute {
328328

329329
pub fn parse_meta<'a>(&self, sess: &'a ParseSess) -> PResult<'a, MetaItem> {
330330
Ok(MetaItem {
331-
ident: self.path.clone(),
331+
path: self.path.clone(),
332332
node: self.parse(sess, |parser| parser.parse_meta_item_kind())?,
333333
span: self.span,
334334
})
@@ -366,15 +366,15 @@ pub fn mk_name_value_item_str(ident: Ident, value: Spanned<Symbol>) -> MetaItem
366366
}
367367

368368
pub fn mk_name_value_item(span: Span, ident: Ident, value: ast::Lit) -> MetaItem {
369-
MetaItem { ident: Path::from_ident(ident), span, node: MetaItemKind::NameValue(value) }
369+
MetaItem { path: Path::from_ident(ident), span, node: MetaItemKind::NameValue(value) }
370370
}
371371

372372
pub fn mk_list_item(span: Span, ident: Ident, items: Vec<NestedMetaItem>) -> MetaItem {
373-
MetaItem { ident: Path::from_ident(ident), span, node: MetaItemKind::List(items) }
373+
MetaItem { path: Path::from_ident(ident), span, node: MetaItemKind::List(items) }
374374
}
375375

376376
pub fn mk_word_item(ident: Ident) -> MetaItem {
377-
MetaItem { ident: Path::from_ident(ident), span: ident.span, node: MetaItemKind::Word }
377+
MetaItem { path: Path::from_ident(ident), span: ident.span, node: MetaItemKind::Word }
378378
}
379379

380380
pub fn mk_nested_word_item(ident: Ident) -> NestedMetaItem {
@@ -402,7 +402,7 @@ pub fn mk_spanned_attr_inner(sp: Span, id: AttrId, item: MetaItem) -> Attribute
402402
Attribute {
403403
id,
404404
style: ast::AttrStyle::Inner,
405-
path: item.ident,
405+
path: item.path,
406406
tokens: item.node.tokens(item.span),
407407
is_sugared_doc: false,
408408
span: sp,
@@ -419,7 +419,7 @@ pub fn mk_spanned_attr_outer(sp: Span, id: AttrId, item: MetaItem) -> Attribute
419419
Attribute {
420420
id,
421421
style: ast::AttrStyle::Outer,
422-
path: item.ident,
422+
path: item.path,
423423
tokens: item.node.tokens(item.span),
424424
is_sugared_doc: false,
425425
span: sp,
@@ -470,7 +470,7 @@ impl MetaItem {
470470
fn tokens(&self) -> TokenStream {
471471
let mut idents = vec![];
472472
let mut last_pos = BytePos(0 as u32);
473-
for (i, segment) in self.ident.segments.iter().enumerate() {
473+
for (i, segment) in self.path.segments.iter().enumerate() {
474474
let is_first = i == 0;
475475
if !is_first {
476476
let mod_sep_span = Span::new(last_pos,
@@ -490,7 +490,7 @@ impl MetaItem {
490490
where I: Iterator<Item = TokenTree>,
491491
{
492492
// FIXME: Share code with `parse_path`.
493-
let ident = match tokens.next() {
493+
let path = match tokens.next() {
494494
Some(TokenTree::Token(span, Token::Ident(ident, _))) => {
495495
if let Some(TokenTree::Token(_, Token::ModSep)) = tokens.peek() {
496496
let mut segments = vec![PathSegment::from_ident(ident.with_span_pos(span))];
@@ -526,11 +526,11 @@ impl MetaItem {
526526
let node = MetaItemKind::from_tokens(tokens)?;
527527
let hi = match node {
528528
MetaItemKind::NameValue(ref lit) => lit.span.hi(),
529-
MetaItemKind::List(..) => list_closing_paren_pos.unwrap_or(ident.span.hi()),
530-
_ => ident.span.hi(),
529+
MetaItemKind::List(..) => list_closing_paren_pos.unwrap_or(path.span.hi()),
530+
_ => path.span.hi(),
531531
};
532-
let span = ident.span.with_hi(hi);
533-
Some(MetaItem { ident, node, span })
532+
let span = path.span.with_hi(hi);
533+
Some(MetaItem { path, node, span })
534534
}
535535
}
536536

‎src/libsyntax/ext/expand.rs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -934,7 +934,7 @@ impl<'a, 'b> MacroExpander<'a, 'b> {
934934
invoc.expansion_data.mark.set_expn_info(expn_info);
935935
let span = span.with_ctxt(self.cx.backtrace());
936936
let dummy = ast::MetaItem { // FIXME(jseyfried) avoid this
937-
ident: Path::from_ident(keywords::Invalid.ident()),
937+
path: Path::from_ident(keywords::Invalid.ident()),
938938
span: DUMMY_SP,
939939
node: ast::MetaItemKind::Word,
940940
};

‎src/libsyntax/fold.rs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -581,7 +581,7 @@ pub fn noop_fold_meta_list_item<T: Folder>(li: NestedMetaItem, fld: &mut T)
581581

582582
pub fn noop_fold_meta_item<T: Folder>(mi: MetaItem, fld: &mut T) -> MetaItem {
583583
MetaItem {
584-
ident: mi.ident,
584+
path: fld.fold_path(mi.path),
585585
node: match mi.node {
586586
MetaItemKind::Word => MetaItemKind::Word,
587587
MetaItemKind::List(mis) => {

‎src/libsyntax/parse/attr.rs

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -157,7 +157,7 @@ impl<'a> Parser<'a> {
157157
};
158158
Ok(if let Some(meta) = meta {
159159
self.bump();
160-
(meta.ident, meta.node.tokens(meta.span))
160+
(meta.path, meta.node.tokens(meta.span))
161161
} else {
162162
let path = self.parse_path(PathStyle::Mod)?;
163163
let tokens = if self.check(&token::OpenDelim(DelimToken::Paren)) ||
@@ -248,10 +248,10 @@ impl<'a> Parser<'a> {
248248
}
249249

250250
let lo = self.span;
251-
let ident = self.parse_path(PathStyle::Mod)?;
251+
let path = self.parse_path(PathStyle::Mod)?;
252252
let node = self.parse_meta_item_kind()?;
253253
let span = lo.to(self.prev_span);
254-
Ok(ast::MetaItem { ident, node, span })
254+
Ok(ast::MetaItem { path, node, span })
255255
}
256256

257257
crate fn parse_meta_item_kind(&mut self) -> PResult<'a, ast::MetaItemKind> {

‎src/libsyntax/parse/parser.rs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2095,7 +2095,7 @@ impl<'a> Parser<'a> {
20952095
let meta_ident = match self.token {
20962096
token::Interpolated(ref nt) => match nt.0 {
20972097
token::NtMeta(ref meta) => match meta.node {
2098-
ast::MetaItemKind::Word => Some(meta.ident.clone()),
2098+
ast::MetaItemKind::Word => Some(meta.path.clone()),
20992099
_ => None,
21002100
},
21012101
_ => None,

‎src/libsyntax/print/pprust.rs

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -779,15 +779,15 @@ pub trait PrintState<'a> {
779779
fn print_meta_item(&mut self, item: &ast::MetaItem) -> io::Result<()> {
780780
self.ibox(INDENT_UNIT)?;
781781
match item.node {
782-
ast::MetaItemKind::Word => self.print_attribute_path(&item.ident)?,
782+
ast::MetaItemKind::Word => self.print_attribute_path(&item.path)?,
783783
ast::MetaItemKind::NameValue(ref value) => {
784-
self.print_attribute_path(&item.ident)?;
784+
self.print_attribute_path(&item.path)?;
785785
self.writer().space()?;
786786
self.word_space("=")?;
787787
self.print_literal(value)?;
788788
}
789789
ast::MetaItemKind::List(ref items) => {
790-
self.print_attribute_path(&item.ident)?;
790+
self.print_attribute_path(&item.path)?;
791791
self.popen()?;
792792
self.commasep(Consistent,
793793
&items[..],

‎src/libsyntax/test.rs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -443,7 +443,7 @@ fn get_test_runner(sd: &errors::Handler, krate: &ast::Crate) -> Option<ast::Path
443443
sd.span_fatal(test_attr.span(),
444444
"#![test_runner(..)] accepts exactly 1 argument").raise()
445445
}
446-
Some(meta_list[0].word().as_ref().unwrap().ident.clone())
446+
Some(meta_list[0].word().as_ref().unwrap().path.clone())
447447
} else {
448448
sd.span_fatal(test_attr.span(),
449449
"test_runner must be of the form #[test_runner(..)]").raise()

0 commit comments

Comments
 (0)