Skip to content

Commit 63116d3

Browse files
petrochenkovpetrochenkov
committed
Rename MetaItem::ident to MetaItem::path 
1 parent 6ad55b3 commit 63116d3

File tree

16 files changed

+52
-53
lines changed

16 files changed

+52
-53
lines changed

‎src/librustc/ich/impls_syntax.rs

+1-1
Original file line numberDiff line numberDiff line change
@@ -368,7 +368,7 @@ impl_stable_hash_for!(enum ::syntax::ast::NestedMetaItemKind {
368368
});
369369

370370
impl_stable_hash_for!(struct ::syntax::ast::MetaItem {
371-
ident,
371+
path,
372372
node,
373373
span
374374
});

‎src/librustc/lint/levels.rs

+6-6
Original file line numberDiff line numberDiff line change
@@ -221,7 +221,7 @@ impl<'a> LintLevelsBuilder<'a> {
221221
match item.node {
222222
ast::MetaItemKind::Word => {} // actual lint names handled later
223223
ast::MetaItemKind::NameValue(ref name_value) => {
224-
if item.ident == "reason" {
224+
if item.path == "reason" {
225225
// found reason, reslice meta list to exclude it
226226
metas = &metas[0..metas.len()-1];
227227
// FIXME (#55112): issue unused-attributes lint if we thereby
@@ -261,7 +261,7 @@ impl<'a> LintLevelsBuilder<'a> {
261261
let mut err = bad_attr(li.span);
262262
if let Some(item) = li.meta_item() {
263263
if let ast::MetaItemKind::NameValue(_) = item.node {
264-
if item.ident == "reason" {
264+
if item.path == "reason" {
265265
err.help("reason in lint attribute must come last");
266266
}
267267
}
@@ -270,15 +270,15 @@ impl<'a> LintLevelsBuilder<'a> {
270270
continue;
271271
}
272272
};
273-
let tool_name = if meta_item.ident.segments.len() > 1 {
274-
let tool_ident = meta_item.ident.segments[0].ident;
273+
let tool_name = if meta_item.path.segments.len() > 1 {
274+
let tool_ident = meta_item.path.segments[0].ident;
275275
if !attr::is_known_lint_tool(tool_ident) {
276276
span_err!(
277277
sess,
278278
tool_ident.span,
279279
E0710,
280280
"an unknown tool name found in scoped lint: `{}`",
281-
meta_item.ident
281+
meta_item.path
282282
);
283283
continue;
284284
}
@@ -287,7 +287,7 @@ impl<'a> LintLevelsBuilder<'a> {
287287
} else {
288288
None
289289
};
290-
let name = meta_item.ident.segments.last().expect("empty lint name").ident.name;
290+
let name = meta_item.path.segments.last().expect("empty lint name").ident.name;
291291
match store.check_lint_name(&name.as_str(), tool_name) {
292292
CheckLintNameResult::Ok(ids) => {
293293
let src = LintSource::Node(name, li.span, reason);

‎src/librustc/session/config.rs

+1-1
Original file line numberDiff line numberDiff line change
@@ -1839,7 +1839,7 @@ pub fn parse_cfgspecs(cfgspecs: Vec<String>) -> FxHashSet<(String, Option<String
18391839

18401840
match &mut parser.parse_meta_item() {
18411841
Ok(meta_item) if parser.token == token::Eof => {
1842-
if meta_item.ident.segments.len() != 1 {
1842+
if meta_item.path.segments.len() != 1 {
18431843
error!("argument key must be an identifier");
18441844
}
18451845
match &meta_item.node {

‎src/librustc_driver/lib.rs

+1-1
Original file line numberDiff line numberDiff line change
@@ -683,7 +683,7 @@ impl RustcDefaultCalls {
683683

684684
let mut cfgs = sess.parse_sess.config.iter().filter_map(|&(name, ref value)| {
685685
let gated_cfg = GatedCfg::gate(&ast::MetaItem {
686-
ident: ast::Path::from_ident(ast::Ident::with_empty_ctxt(name)),
686+
path: ast::Path::from_ident(ast::Ident::with_empty_ctxt(name)),
687687
node: ast::MetaItemKind::Word,
688688
span: DUMMY_SP,
689689
});

‎src/librustc_mir/dataflow/mod.rs

+1-1
Original file line numberDiff line numberDiff line change
@@ -146,7 +146,7 @@ impl<'a, 'gcx: 'tcx, 'tcx: 'a, BD> DataflowAnalysis<'a, 'tcx, BD> where BD: BitD
146146
} else {
147147
sess.span_err(
148148
item.span,
149-
&format!("{} attribute requires a path", item.ident));
149+
&format!("{} attribute requires a path", item.path));
150150
return None;
151151
}
152152
}

‎src/librustdoc/clean/cfg.rs

+5-5
Original file line numberDiff line numberDiff line change
@@ -430,7 +430,7 @@ mod test {
430430

431431
fn dummy_meta_item_word(name: &str) -> MetaItem {
432432
MetaItem {
433-
ident: Path::from_ident(Ident::from_str(name)),
433+
path: Path::from_ident(Ident::from_str(name)),
434434
node: MetaItemKind::Word,
435435
span: DUMMY_SP,
436436
}
@@ -439,7 +439,7 @@ mod test {
439439
macro_rules! dummy_meta_item_list {
440440
($name:ident, [$($list:ident),* $(,)?]) => {
441441
MetaItem {
442-
ident: Path::from_ident(Ident::from_str(stringify!($name))),
442+
path: Path::from_ident(Ident::from_str(stringify!($name))),
443443
node: MetaItemKind::List(vec![
444444
$(
445445
dummy_spanned(NestedMetaItemKind::MetaItem(
@@ -453,7 +453,7 @@ mod test {
453453

454454
($name:ident, [$($list:expr),* $(,)?]) => {
455455
MetaItem {
456-
ident: Path::from_ident(Ident::from_str(stringify!($name))),
456+
path: Path::from_ident(Ident::from_str(stringify!($name))),
457457
node: MetaItemKind::List(vec![
458458
$(
459459
dummy_spanned(NestedMetaItemKind::MetaItem($list)),
@@ -593,7 +593,7 @@ mod test {
593593
assert_eq!(Cfg::parse(&mi), Ok(word_cfg("all")));
594594

595595
let mi = MetaItem {
596-
ident: Path::from_ident(Ident::from_str("all")),
596+
path: Path::from_ident(Ident::from_str("all")),
597597
node: MetaItemKind::NameValue(dummy_spanned(LitKind::Str(
598598
Symbol::intern("done"),
599599
StrStyle::Cooked,
@@ -628,7 +628,7 @@ mod test {
628628
fn test_parse_err() {
629629
with_globals(|| {
630630
let mi = MetaItem {
631-
ident: Path::from_ident(Ident::from_str("foo")),
631+
path: Path::from_ident(Ident::from_str("foo")),
632632
node: MetaItemKind::NameValue(dummy_spanned(LitKind::Bool(false))),
633633
span: DUMMY_SP,
634634
};

‎src/librustdoc/html/render.rs

+1-1
Original file line numberDiff line numberDiff line change
@@ -3713,7 +3713,7 @@ fn item_enum(w: &mut fmt::Formatter<'_>, cx: &Context, it: &clean::Item,
37133713
}
37143714

37153715
fn render_attribute(attr: &ast::MetaItem) -> Option<String> {
3716-
let path = attr.ident.to_string();
3716+
let path = attr.path.to_string();
37173717

37183718
if attr.is_word() {
37193719
Some(path)

‎src/libsyntax/ast.rs

+1-1
Original file line numberDiff line numberDiff line change
@@ -464,7 +464,7 @@ pub enum NestedMetaItemKind {
464464
/// E.g., `#[test]`, `#[derive(..)]`, `#[rustfmt::skip]` or `#[feature = "foo"]`.
465465
#[derive(Clone, RustcEncodable, RustcDecodable, Debug)]
466466
pub struct MetaItem {
467-
pub ident: Path,
467+
pub path: Path,
468468
pub node: MetaItemKind,
469469
pub span: Span,
470470
}

‎src/libsyntax/attr/builtin.rs

+9-9
Original file line numberDiff line numberDiff line change
@@ -203,7 +203,7 @@ fn find_stability_generic<'a, I>(sess: &ParseSess,
203203
let meta = meta.as_ref().unwrap();
204204
let get = |meta: &MetaItem, item: &mut Option<Symbol>| {
205205
if item.is_some() {
206-
handle_errors(sess, meta.span, AttrError::MultipleItem(meta.ident.to_string()));
206+
handle_errors(sess, meta.span, AttrError::MultipleItem(meta.path.to_string()));
207207
return false
208208
}
209209
if let Some(v) = meta.value_str() {
@@ -232,7 +232,7 @@ fn find_stability_generic<'a, I>(sess: &ParseSess,
232232
handle_errors(
233233
sess,
234234
mi.span,
235-
AttrError::UnknownMetaItem(mi.ident.to_string(), expected),
235+
AttrError::UnknownMetaItem(mi.path.to_string(), expected),
236236
);
237237
continue 'outer
238238
}
@@ -315,7 +315,7 @@ fn find_stability_generic<'a, I>(sess: &ParseSess,
315315
sess,
316316
meta.span,
317317
AttrError::UnknownMetaItem(
318-
mi.ident.to_string(),
318+
mi.path.to_string(),
319319
&["feature", "reason", "issue"]
320320
),
321321
);
@@ -387,7 +387,7 @@ fn find_stability_generic<'a, I>(sess: &ParseSess,
387387
sess,
388388
meta.span,
389389
AttrError::UnknownMetaItem(
390-
mi.ident.to_string(), &["since", "note"],
390+
mi.path.to_string(), &["since", "note"],
391391
),
392392
);
393393
continue 'outer
@@ -482,8 +482,8 @@ pub fn cfg_matches(cfg: &ast::MetaItem, sess: &ParseSess, features: Option<&Feat
482482
gated_cfg.check_and_emit(sess, feats);
483483
}
484484
let error = |span, msg| { sess.span_diagnostic.span_err(span, msg); true };
485-
if cfg.ident.segments.len() != 1 {
486-
return error(cfg.ident.span, "`cfg` predicate key must be an identifier");
485+
if cfg.path.segments.len() != 1 {
486+
return error(cfg.path.span, "`cfg` predicate key must be an identifier");
487487
}
488488
match &cfg.node {
489489
MetaItemKind::List(..) => {
@@ -549,7 +549,7 @@ pub fn eval_condition<F>(cfg: &ast::MetaItem, sess: &ParseSess, eval: &mut F)
549549
},
550550
_ => {
551551
span_err!(sess.span_diagnostic, cfg.span, E0537,
552-
"invalid predicate `{}`", cfg.ident);
552+
"invalid predicate `{}`", cfg.path);
553553
false
554554
}
555555
}
@@ -604,7 +604,7 @@ fn find_deprecation_generic<'a, I>(sess: &ParseSess,
604604
let get = |meta: &MetaItem, item: &mut Option<Symbol>| {
605605
if item.is_some() {
606606
handle_errors(
607-
sess, meta.span, AttrError::MultipleItem(meta.ident.to_string())
607+
sess, meta.span, AttrError::MultipleItem(meta.path.to_string())
608608
);
609609
return false
610610
}
@@ -642,7 +642,7 @@ fn find_deprecation_generic<'a, I>(sess: &ParseSess,
642642
handle_errors(
643643
sess,
644644
meta.span(),
645-
AttrError::UnknownMetaItem(mi.ident.to_string(),
645+
AttrError::UnknownMetaItem(mi.path.to_string(),
646646
&["since", "note"]),
647647
);
648648
continue 'outer

‎src/libsyntax/attr/mod.rs

+16-16
Original file line numberDiff line numberDiff line change
@@ -208,8 +208,8 @@ impl Attribute {
208208
impl MetaItem {
209209
/// For a single-segment meta-item returns its name, otherwise returns `None`.
210210
pub fn ident(&self) -> Option<Ident> {
211-
if self.ident.segments.len() == 1 {
212-
Some(self.ident.segments[0].ident)
211+
if self.path.segments.len() == 1 {
212+
Some(self.path.segments[0].ident)
213213
} else {
214214
None
215215
}
@@ -256,7 +256,7 @@ impl MetaItem {
256256
pub fn span(&self) -> Span { self.span }
257257

258258
pub fn check_name(&self, name: &str) -> bool {
259-
self.ident == name
259+
self.path == name
260260
}
261261

262262
pub fn is_value_str(&self) -> bool {
@@ -273,7 +273,7 @@ impl Attribute {
273273
pub fn meta(&self) -> Option<MetaItem> {
274274
let mut tokens = self.tokens.trees().peekable();
275275
Some(MetaItem {
276-
ident: self.path.clone(),
276+
path: self.path.clone(),
277277
node: if let Some(node) = MetaItemKind::from_tokens(&mut tokens) {
278278
if tokens.peek().is_some() {
279279
return None;
@@ -319,7 +319,7 @@ impl Attribute {
319319

320320
pub fn parse_meta<'a>(&self, sess: &'a ParseSess) -> PResult<'a, MetaItem> {
321321
Ok(MetaItem {
322-
ident: self.path.clone(),
322+
path: self.path.clone(),
323323
node: self.parse(sess, |parser| parser.parse_meta_item_kind())?,
324324
span: self.span,
325325
})
@@ -357,15 +357,15 @@ pub fn mk_name_value_item_str(ident: Ident, value: Spanned<Symbol>) -> MetaItem
357357
}
358358

359359
pub fn mk_name_value_item(span: Span, ident: Ident, value: ast::Lit) -> MetaItem {
360-
MetaItem { ident: Path::from_ident(ident), span, node: MetaItemKind::NameValue(value) }
360+
MetaItem { path: Path::from_ident(ident), span, node: MetaItemKind::NameValue(value) }
361361
}
362362

363363
pub fn mk_list_item(span: Span, ident: Ident, items: Vec<NestedMetaItem>) -> MetaItem {
364-
MetaItem { ident: Path::from_ident(ident), span, node: MetaItemKind::List(items) }
364+
MetaItem { path: Path::from_ident(ident), span, node: MetaItemKind::List(items) }
365365
}
366366

367367
pub fn mk_word_item(ident: Ident) -> MetaItem {
368-
MetaItem { ident: Path::from_ident(ident), span: ident.span, node: MetaItemKind::Word }
368+
MetaItem { path: Path::from_ident(ident), span: ident.span, node: MetaItemKind::Word }
369369
}
370370

371371
pub fn mk_nested_word_item(ident: Ident) -> NestedMetaItem {
@@ -393,7 +393,7 @@ pub fn mk_spanned_attr_inner(sp: Span, id: AttrId, item: MetaItem) -> Attribute
393393
Attribute {
394394
id,
395395
style: ast::AttrStyle::Inner,
396-
path: item.ident,
396+
path: item.path,
397397
tokens: item.node.tokens(item.span),
398398
is_sugared_doc: false,
399399
span: sp,
@@ -410,7 +410,7 @@ pub fn mk_spanned_attr_outer(sp: Span, id: AttrId, item: MetaItem) -> Attribute
410410
Attribute {
411411
id,
412412
style: ast::AttrStyle::Outer,
413-
path: item.ident,
413+
path: item.path,
414414
tokens: item.node.tokens(item.span),
415415
is_sugared_doc: false,
416416
span: sp,
@@ -461,7 +461,7 @@ impl MetaItem {
461461
fn tokens(&self) -> TokenStream {
462462
let mut idents = vec![];
463463
let mut last_pos = BytePos(0 as u32);
464-
for (i, segment) in self.ident.segments.iter().enumerate() {
464+
for (i, segment) in self.path.segments.iter().enumerate() {
465465
let is_first = i == 0;
466466
if !is_first {
467467
let mod_sep_span = Span::new(last_pos,
@@ -481,7 +481,7 @@ impl MetaItem {
481481
where I: Iterator<Item = TokenTree>,
482482
{
483483
// FIXME: Share code with `parse_path`.
484-
let ident = match tokens.next() {
484+
let path = match tokens.next() {
485485
Some(TokenTree::Token(span, token @ Token::Ident(..))) |
486486
Some(TokenTree::Token(span, token @ Token::ModSep)) => 'arm: {
487487
let mut segments = if let Token::Ident(ident, _) = token {
@@ -522,11 +522,11 @@ impl MetaItem {
522522
let node = MetaItemKind::from_tokens(tokens)?;
523523
let hi = match node {
524524
MetaItemKind::NameValue(ref lit) => lit.span.hi(),
525-
MetaItemKind::List(..) => list_closing_paren_pos.unwrap_or(ident.span.hi()),
526-
_ => ident.span.hi(),
525+
MetaItemKind::List(..) => list_closing_paren_pos.unwrap_or(path.span.hi()),
526+
_ => path.span.hi(),
527527
};
528-
let span = ident.span.with_hi(hi);
529-
Some(MetaItem { ident, node, span })
528+
let span = path.span.with_hi(hi);
529+
Some(MetaItem { path, node, span })
530530
}
531531
}
532532

‎src/libsyntax/ext/expand.rs

+1-1
Original file line numberDiff line numberDiff line change
@@ -929,7 +929,7 @@ impl<'a, 'b> MacroExpander<'a, 'b> {
929929
invoc.expansion_data.mark.set_expn_info(expn_info);
930930
let span = span.with_ctxt(self.cx.backtrace());
931931
let dummy = ast::MetaItem { // FIXME(jseyfried) avoid this
932-
ident: Path::from_ident(keywords::Invalid.ident()),
932+
path: Path::from_ident(keywords::Invalid.ident()),
933933
span: DUMMY_SP,
934934
node: ast::MetaItemKind::Word,
935935
};

‎src/libsyntax/mut_visit.rs

+1-2
Original file line numberDiff line numberDiff line change
@@ -548,7 +548,7 @@ pub fn noop_visit_meta_list_item<T: MutVisitor>(li: &mut NestedMetaItem, vis: &m
548548
}
549549

550550
pub fn noop_visit_meta_item<T: MutVisitor>(mi: &mut MetaItem, vis: &mut T) {
551-
let MetaItem { ident: _, node, span } = mi;
551+
let MetaItem { path: _, node, span } = mi;
552552
match node {
553553
MetaItemKind::Word => {}
554554
MetaItemKind::List(mis) => visit_vec(mis, |mi| vis.visit_meta_list_item(mi)),
@@ -1340,4 +1340,3 @@ mod tests {
13401340
})
13411341
}
13421342
}
1343-

‎src/libsyntax/parse/attr.rs

+3-3
Original file line numberDiff line numberDiff line change
@@ -149,7 +149,7 @@ impl<'a> Parser<'a> {
149149
};
150150
Ok(if let Some(meta) = meta {
151151
self.bump();
152-
(meta.ident, meta.node.tokens(meta.span))
152+
(meta.path, meta.node.tokens(meta.span))
153153
} else {
154154
let path = self.parse_path(PathStyle::Mod)?;
155155
let tokens = if self.check(&token::OpenDelim(DelimToken::Paren)) ||
@@ -250,10 +250,10 @@ impl<'a> Parser<'a> {
250250
}
251251

252252
let lo = self.span;
253-
let ident = self.parse_path(PathStyle::Mod)?;
253+
let path = self.parse_path(PathStyle::Mod)?;
254254
let node = self.parse_meta_item_kind()?;
255255
let span = lo.to(self.prev_span);
256-
Ok(ast::MetaItem { ident, node, span })
256+
Ok(ast::MetaItem { path, node, span })
257257
}
258258

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

‎src/libsyntax/parse/parser.rs

+1-1
Original file line numberDiff line numberDiff line change
@@ -2333,7 +2333,7 @@ impl<'a> Parser<'a> {
23332333
let meta_ident = match self.token {
23342334
token::Interpolated(ref nt) => match **nt {
23352335
token::NtMeta(ref meta) => match meta.node {
2336-
ast::MetaItemKind::Word => Some(meta.ident.clone()),
2336+
ast::MetaItemKind::Word => Some(meta.path.clone()),
23372337
_ => None,
23382338
},
23392339
_ => None,

0 commit comments

Comments
 (0)