Skip to content

Commit 8719d1e

Browse files
petrochenkovpetrochenkov
committed
Rename PathSegment::identifier to ident 
1 parent baae274 commit 8719d1e

File tree

19 files changed

+67
-102
lines changed

19 files changed

+67
-102
lines changed

‎src/librustc/hir/lowering.rs

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1607,7 +1607,7 @@ impl<'a> LoweringContext<'a> {
16071607
}
16081608

16091609
hir::PathSegment::new(
1610-
self.lower_ident(segment.identifier),
1610+
self.lower_ident(segment.ident),
16111611
parameters,
16121612
infer_types,
16131613
)
@@ -2356,11 +2356,11 @@ impl<'a> LoweringContext<'a> {
23562356

23572357
// Correctly resolve `self` imports
23582358
if path.segments.len() > 1
2359-
&& path.segments.last().unwrap().identifier.name == keywords::SelfValue.name()
2359+
&& path.segments.last().unwrap().ident.name == keywords::SelfValue.name()
23602360
{
23612361
let _ = path.segments.pop();
23622362
if rename.is_none() {
2363-
*name = path.segments.last().unwrap().identifier.name;
2363+
*name = path.segments.last().unwrap().ident.name;
23642364
}
23652365
}
23662366

‎src/librustc/ich/impls_syntax.rs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -211,7 +211,7 @@ impl<'a> HashStable<StableHashingContext<'a>> for ast::Attribute {
211211
style.hash_stable(hcx, hasher);
212212
path.segments.len().hash_stable(hcx, hasher);
213213
for segment in &path.segments {
214-
segment.identifier.name.hash_stable(hcx, hasher);
214+
segment.ident.name.hash_stable(hcx, hasher);
215215
}
216216
for tt in tokens.trees() {
217217
tt.hash_stable(hcx, hasher);

‎src/librustc_resolve/build_reduced_graph.rs

Lines changed: 2 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -115,7 +115,7 @@ impl<'a> Resolver<'a> {
115115

116116
let mut module_path: Vec<_> = prefix.segments.iter()
117117
.chain(path.segments.iter())
118-
.map(|seg| respan(seg.span, seg.identifier))
118+
.map(|seg| respan(seg.span, seg.ident))
119119
.collect();
120120

121121
match use_tree.kind {
@@ -196,11 +196,7 @@ impl<'a> Resolver<'a> {
196196
ast::UseTreeKind::Nested(ref items) => {
197197
let prefix = ast::Path {
198198
segments: module_path.iter()
199-
.map(|s| ast::PathSegment {
200-
identifier: s.node,
201-
span: s.span,
202-
parameters: None,
203-
})
199+
.map(|s| ast::PathSegment::from_ident(s.node, s.span))
204200
.collect(),
205201
span: path.span,
206202
};

‎src/librustc_resolve/lib.rs

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -2351,7 +2351,7 @@ impl<'a> Resolver<'a> {
23512351
let mut new_id = None;
23522352
if let Some(trait_ref) = opt_trait_ref {
23532353
let path: Vec<_> = trait_ref.path.segments.iter()
2354-
.map(|seg| respan(seg.span, seg.identifier))
2354+
.map(|seg| respan(seg.span, seg.ident))
23552355
.collect();
23562356
let def = self.smart_resolve_path_fragment(
23572357
trait_ref.ref_id,
@@ -2786,7 +2786,7 @@ impl<'a> Resolver<'a> {
27862786
source: PathSource)
27872787
-> PathResolution {
27882788
let segments = &path.segments.iter()
2789-
.map(|seg| respan(seg.span, seg.identifier))
2789+
.map(|seg| respan(seg.span, seg.ident))
27902790
.collect::<Vec<_>>();
27912791
self.smart_resolve_path_fragment(id, qself, segments, path.span, source)
27922792
}
@@ -2924,7 +2924,7 @@ impl<'a> Resolver<'a> {
29242924
}
29252925
ExprKind::MethodCall(ref segment, ..) => {
29262926
err.span_label(parent.span, format!("did you mean `{}::{}(...)`?",
2927-
path_str, segment.identifier));
2927+
path_str, segment.ident));
29282928
return (err, candidates);
29292929
}
29302930
_ => {}
@@ -3750,7 +3750,7 @@ impl<'a> Resolver<'a> {
37503750
ExprKind::MethodCall(ref segment, ..) => {
37513751
debug!("(recording candidate traits for expr) recording traits for {}",
37523752
expr.id);
3753-
let traits = self.get_traits_containing_item(segment.identifier, ValueNS);
3753+
let traits = self.get_traits_containing_item(segment.ident, ValueNS);
37543754
self.trait_map.insert(expr.id, traits);
37553755
}
37563756
_ => {
@@ -4222,7 +4222,7 @@ impl<'a> Resolver<'a> {
42224222
if attr.path.segments.len() > 1 {
42234223
continue
42244224
}
4225-
let ident = attr.path.segments[0].identifier;
4225+
let ident = attr.path.segments[0].ident;
42264226
let result = self.resolve_lexical_macro_path_segment(ident,
42274227
MacroNS,
42284228
false,
@@ -4267,7 +4267,7 @@ fn names_to_string(idents: &[SpannedIdent]) -> String {
42674267

42684268
fn path_names_to_string(path: &Path) -> String {
42694269
names_to_string(&path.segments.iter()
4270-
.map(|seg| respan(seg.span, seg.identifier))
4270+
.map(|seg| respan(seg.span, seg.ident))
42714271
.collect::<Vec<_>>())
42724272
}
42734273

‎src/librustc_resolve/macros.rs

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -137,9 +137,9 @@ impl<'a> base::Resolver for Resolver<'a> {
137137

138138
impl<'a, 'b> Folder for EliminateCrateVar<'a, 'b> {
139139
fn fold_path(&mut self, mut path: ast::Path) -> ast::Path {
140-
let ident = path.segments[0].identifier;
140+
let ident = path.segments[0].ident;
141141
if ident.name == keywords::DollarCrate.name() {
142-
path.segments[0].identifier.name = keywords::CrateRoot.name();
142+
path.segments[0].ident.name = keywords::CrateRoot.name();
143143
let module = self.0.resolve_crate_root(ident.span.ctxt(), true);
144144
if !module.is_local() {
145145
let span = path.segments[0].span;
@@ -249,7 +249,7 @@ impl<'a> base::Resolver for Resolver<'a> {
249249
if traits[j].segments.len() > 1 {
250250
continue
251251
}
252-
let trait_name = traits[j].segments[0].identifier.name;
252+
let trait_name = traits[j].segments[0].ident.name;
253253
let legacy_name = Symbol::intern(&format!("derive_{}", trait_name));
254254
if !self.global_macros.contains_key(&legacy_name) {
255255
continue
@@ -268,7 +268,7 @@ impl<'a> base::Resolver for Resolver<'a> {
268268
if k > 0 {
269269
tokens.push(TokenTree::Token(path.span, Token::ModSep).into());
270270
}
271-
let tok = Token::from_ast_ident(segment.identifier);
271+
let tok = Token::from_ast_ident(segment.ident);
272272
tokens.push(TokenTree::Token(path.span, tok).into());
273273
}
274274
}
@@ -365,7 +365,7 @@ impl<'a> Resolver<'a> {
365365
}
366366

367367
let attr_name = match path.segments.len() {
368-
1 => path.segments[0].identifier.name,
368+
1 => path.segments[0].ident.name,
369369
_ => return Err(determinacy),
370370
};
371371
for path in traits {
@@ -413,7 +413,7 @@ impl<'a> Resolver<'a> {
413413
kind: MacroKind, force: bool)
414414
-> Result<Def, Determinacy> {
415415
let ast::Path { ref segments, span } = *path;
416-
let path: Vec<_> = segments.iter().map(|seg| respan(seg.span, seg.identifier)).collect();
416+
let path: Vec<_> = segments.iter().map(|seg| respan(seg.span, seg.ident)).collect();
417417
let invocation = self.invocations[&scope];
418418
let module = invocation.module.get();
419419
self.current_module = if module.is_trait() { module.parent.unwrap() } else { module };

‎src/librustdoc/clean/mod.rs

Lines changed: 2 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -1146,16 +1146,8 @@ fn resolve(cx: &DocContext, path_str: &str, is_val: bool) -> Result<(Def, Option
11461146
fn macro_resolve(cx: &DocContext, path_str: &str) -> Option<Def> {
11471147
use syntax::ext::base::{MacroKind, SyntaxExtension};
11481148
use syntax::ext::hygiene::Mark;
1149-
let segment = ast::PathSegment {
1150-
identifier: ast::Ident::from_str(path_str),
1151-
span: DUMMY_SP,
1152-
parameters: None,
1153-
};
1154-
let path = ast::Path {
1155-
span: DUMMY_SP,
1156-
segments: vec![segment],
1157-
};
1158-
1149+
let segment = ast::PathSegment::from_ident(ast::Ident::from_str(path_str), DUMMY_SP);
1150+
let path = ast::Path { segments: vec![segment], span: DUMMY_SP };
11591151
let mut resolver = cx.resolver.borrow_mut();
11601152
let mark = Mark::root();
11611153
let res = resolver

‎src/libsyntax/ast.rs

Lines changed: 8 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -82,7 +82,7 @@ pub struct Path {
8282

8383
impl<'a> PartialEq<&'a str> for Path {
8484
fn eq(&self, string: &&'a str) -> bool {
85-
self.segments.len() == 1 && self.segments[0].identifier.name == *string
85+
self.segments.len() == 1 && self.segments[0].ident.name == *string
8686
}
8787
}
8888

@@ -101,17 +101,17 @@ impl fmt::Display for Path {
101101
impl Path {
102102
// convert a span and an identifier to the corresponding
103103
// 1-segment path
104-
pub fn from_ident(s: Span, identifier: Ident) -> Path {
104+
pub fn from_ident(s: Span, ident: Ident) -> Path {
105105
Path {
106106
span: s,
107-
segments: vec![PathSegment::from_ident(identifier, s)],
107+
segments: vec![PathSegment::from_ident(ident, s)],
108108
}
109109
}
110110

111111
// Make a "crate root" segment for this path unless it already has it
112112
// or starts with something like `self`/`super`/`$crate`/etc.
113113
pub fn make_root(&self) -> Option<PathSegment> {
114-
if let Some(ident) = self.segments.get(0).map(|seg| seg.identifier) {
114+
if let Some(ident) = self.segments.get(0).map(|seg| seg.ident) {
115115
if ::parse::token::is_path_segment_keyword(ident) &&
116116
ident.name != keywords::Crate.name() {
117117
return None;
@@ -121,7 +121,7 @@ impl Path {
121121
}
122122

123123
pub fn is_global(&self) -> bool {
124-
!self.segments.is_empty() && self.segments[0].identifier.name == keywords::CrateRoot.name()
124+
!self.segments.is_empty() && self.segments[0].ident.name == keywords::CrateRoot.name()
125125
}
126126
}
127127

@@ -131,7 +131,7 @@ impl Path {
131131
#[derive(Clone, PartialEq, Eq, RustcEncodable, RustcDecodable, Hash, Debug)]
132132
pub struct PathSegment {
133133
/// The identifier portion of this path segment.
134-
pub identifier: Ident,
134+
pub ident: Ident,
135135
/// Span of the segment identifier.
136136
pub span: Span,
137137

@@ -146,14 +146,10 @@ pub struct PathSegment {
146146

147147
impl PathSegment {
148148
pub fn from_ident(ident: Ident, span: Span) -> Self {
149-
PathSegment { identifier: ident, span: span, parameters: None }
149+
PathSegment { ident, span, parameters: None }
150150
}
151151
pub fn crate_root(span: Span) -> Self {
152-
PathSegment {
153-
identifier: Ident::new(keywords::CrateRoot.name(), span),
154-
span,
155-
parameters: None,
156-
}
152+
PathSegment::from_ident(Ident::new(keywords::CrateRoot.name(), span), span)
157153
}
158154
}
159155

‎src/libsyntax/attr.rs

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -215,7 +215,7 @@ impl Attribute {
215215

216216
pub fn name(&self) -> Option<Name> {
217217
match self.path.segments.len() {
218-
1 => Some(self.path.segments[0].identifier.name),
218+
1 => Some(self.path.segments[0].ident.name),
219219
_ => None,
220220
}
221221
}
@@ -301,7 +301,7 @@ impl Attribute {
301301
let mut tokens = self.tokens.trees().peekable();
302302
Some(MetaItem {
303303
name: match self.path.segments.len() {
304-
1 => self.path.segments[0].identifier.name,
304+
1 => self.path.segments[0].ident.name,
305305
_ => return None,
306306
},
307307
node: if let Some(node) = MetaItemKind::from_tokens(&mut tokens) {
@@ -353,7 +353,7 @@ impl Attribute {
353353
}
354354

355355
Ok(MetaItem {
356-
name: self.path.segments.last().unwrap().identifier.name,
356+
name: self.path.segments.last().unwrap().ident.name,
357357
node: self.parse(sess, |parser| parser.parse_meta_item_kind())?,
358358
span: self.span,
359359
})

‎src/libsyntax/ext/build.rs

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -319,7 +319,7 @@ impl<'a> AstBuilder for ExtCtxt<'a> {
319319
types: Vec<P<ast::Ty>>,
320320
bindings: Vec<ast::TypeBinding> )
321321
-> ast::Path {
322-
let last_identifier = idents.pop().unwrap();
322+
let last_ident = idents.pop().unwrap();
323323
let mut segments: Vec<ast::PathSegment> = Vec::new();
324324

325325
segments.extend(idents.into_iter().map(|i| ast::PathSegment::from_ident(i, span)));
@@ -328,7 +328,7 @@ impl<'a> AstBuilder for ExtCtxt<'a> {
328328
} else {
329329
None
330330
};
331-
segments.push(ast::PathSegment { identifier: last_identifier, span, parameters });
331+
segments.push(ast::PathSegment { ident: last_ident, span, parameters });
332332
let mut path = ast::Path { span, segments };
333333
if global {
334334
if let Some(seg) = path.make_root() {
@@ -367,7 +367,7 @@ impl<'a> AstBuilder for ExtCtxt<'a> {
367367
None
368368
};
369369
path.segments.push(ast::PathSegment {
370-
identifier: ident.node,
370+
ident: ident.node,
371371
span: ident.span,
372372
parameters,
373373
});

‎src/libsyntax/ext/derive.rs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -54,7 +54,7 @@ pub fn add_derived_markers<T>(cx: &mut ExtCtxt, span: Span, traits: &[ast::Path]
5454
pretty_name.push_str(", ");
5555
}
5656
pretty_name.push_str(&path.to_string());
57-
names.insert(unwrap_or!(path.segments.get(0), continue).identifier.name);
57+
names.insert(unwrap_or!(path.segments.get(0), continue).ident.name);
5858
}
5959
pretty_name.push(')');
6060

‎src/libsyntax/ext/expand.rs

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -168,10 +168,10 @@ fn macro_bang_format(path: &ast::Path) -> ExpnFormat {
168168
path_str.push_str("::");
169169
}
170170

171-
if segment.identifier.name != keywords::CrateRoot.name() &&
172-
segment.identifier.name != keywords::DollarCrate.name()
171+
if segment.ident.name != keywords::CrateRoot.name() &&
172+
segment.ident.name != keywords::DollarCrate.name()
173173
{
174-
path_str.push_str(&segment.identifier.name.as_str())
174+
path_str.push_str(&segment.ident.name.as_str())
175175
}
176176
}
177177

@@ -688,7 +688,7 @@ impl<'a, 'b> MacroExpander<'a, 'b> {
688688
opt_expanded
689689
} else {
690690
let msg = format!("non-{kind} macro in {kind} position: {name}",
691-
name = path.segments[0].identifier.name, kind = kind.name());
691+
name = path.segments[0].ident.name, kind = kind.name());
692692
self.cx.span_err(path.span, &msg);
693693
self.cx.trace_macros_diag();
694694
kind.dummy(span)

‎src/libsyntax/ext/quote.rs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -239,7 +239,7 @@ pub mod rt {
239239
inner.push(TokenTree::Token(self.span, token::Colon).into());
240240
}
241241
inner.push(TokenTree::Token(
242-
self.span, token::Token::from_ast_ident(segment.identifier)
242+
self.span, token::Token::from_ast_ident(segment.ident)
243243
).into());
244244
}
245245
inner.push(self.tokens.clone());

‎src/libsyntax/feature_gate.rs

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1766,10 +1766,10 @@ impl<'a> Visitor<'a> for PostExpansionVisitor<'a> {
17661766

17671767
fn visit_path(&mut self, path: &'a ast::Path, _id: NodeId) {
17681768
for segment in &path.segments {
1769-
if segment.identifier.name == keywords::Crate.name() {
1769+
if segment.ident.name == keywords::Crate.name() {
17701770
gate_feature_post!(&self, crate_in_paths, segment.span,
17711771
"`crate` in paths is experimental");
1772-
} else if segment.identifier.name == keywords::Extern.name() {
1772+
} else if segment.ident.name == keywords::Extern.name() {
17731773
gate_feature_post!(&self, extern_in_paths, segment.span,
17741774
"`extern` in paths is experimental");
17751775
}

‎src/libsyntax/fold.rs

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -449,8 +449,8 @@ pub fn noop_fold_usize<T: Folder>(i: usize, _: &mut T) -> usize {
449449

450450
pub fn noop_fold_path<T: Folder>(Path { segments, span }: Path, fld: &mut T) -> Path {
451451
Path {
452-
segments: segments.move_map(|PathSegment {identifier, span, parameters}| PathSegment {
453-
identifier: fld.fold_ident(identifier),
452+
segments: segments.move_map(|PathSegment {ident, span, parameters}| PathSegment {
453+
ident: fld.fold_ident(ident),
454454
span: fld.new_span(span),
455455
parameters: parameters.map(|ps| ps.map(|ps| fld.fold_path_parameters(ps))),
456456
}),
@@ -1195,7 +1195,7 @@ pub fn noop_fold_expr<T: Folder>(Expr {id, node, span, attrs}: Expr, folder: &mu
11951195
ExprKind::MethodCall(seg, args) => {
11961196
ExprKind::MethodCall(
11971197
PathSegment {
1198-
identifier: folder.fold_ident(seg.identifier),
1198+
ident: folder.fold_ident(seg.ident),
11991199
span: folder.new_span(seg.span),
12001200
parameters: seg.parameters.map(|ps| {
12011201
ps.map(|ps| folder.fold_path_parameters(ps))

‎src/libsyntax/parse/parser.rs

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -2051,7 +2051,7 @@ impl<'a> Parser<'a> {
20512051
ParenthesizedParameterData { inputs, output, span }.into()
20522052
};
20532053

2054-
PathSegment { identifier: ident, span: ident_span, parameters }
2054+
PathSegment { ident, span: ident_span, parameters }
20552055
} else {
20562056
// Generic arguments are not found.
20572057
PathSegment::from_ident(ident, ident_span)
@@ -2592,7 +2592,7 @@ impl<'a> Parser<'a> {
25922592
}
25932593

25942594
let span = lo.to(self.prev_span);
2595-
let ident = respan(segment.span, segment.identifier);
2595+
let ident = respan(segment.span, segment.ident);
25962596
self.mk_expr(span, ExprKind::Field(self_arg, ident), ThinVec::new())
25972597
}
25982598
})

0 commit comments

Comments
 (0)