Skip to content

Commit e2afefd

Browse files
petrochenkovpetrochenkov
committed
Get rid of SpannedIdent 
1 parent 8719d1e commit e2afefd

File tree

24 files changed

+231
-272
lines changed

24 files changed

+231
-272
lines changed

‎src/librustc/hir/lowering.rs

Lines changed: 7 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -1720,7 +1720,7 @@ impl<'a> LoweringContext<'a> {
17201720
decl.inputs
17211721
.iter()
17221722
.map(|arg| match arg.pat.node {
1723-
PatKind::Ident(_, ident, None) => respan(ident.span, ident.node.name),
1723+
PatKind::Ident(_, ident, None) => respan(ident.span, ident.name),
17241724
_ => respan(arg.pat.span, keywords::Invalid.name()),
17251725
})
17261726
.collect()
@@ -2099,7 +2099,7 @@ impl<'a> LoweringContext<'a> {
20992099

21002100
fn lower_field(&mut self, f: &Field) -> hir::Field {
21012101
hir::Field {
2102-
name: respan(f.ident.span, self.lower_ident(f.ident.node)),
2102+
name: respan(f.ident.span, self.lower_ident(f.ident)),
21032103
expr: P(self.lower_expr(&f.expr)),
21042104
span: f.span,
21052105
is_shorthand: f.is_shorthand,
@@ -2801,7 +2801,7 @@ impl<'a> LoweringContext<'a> {
28012801
fn lower_pat(&mut self, p: &Pat) -> P<hir::Pat> {
28022802
let node = match p.node {
28032803
PatKind::Wild => hir::PatKind::Wild,
2804-
PatKind::Ident(ref binding_mode, pth1, ref sub) => {
2804+
PatKind::Ident(ref binding_mode, ident, ref sub) => {
28052805
match self.resolver.get_resolution(p.id).map(|d| d.base_def()) {
28062806
// `None` can occur in body-less function signatures
28072807
def @ None | def @ Some(Def::Local(_)) => {
@@ -2812,16 +2812,16 @@ impl<'a> LoweringContext<'a> {
28122812
hir::PatKind::Binding(
28132813
self.lower_binding_mode(binding_mode),
28142814
canonical_id,
2815-
respan(pth1.span, pth1.node.name),
2815+
respan(ident.span, ident.name),
28162816
sub.as_ref().map(|x| self.lower_pat(x)),
28172817
)
28182818
}
28192819
Some(def) => hir::PatKind::Path(hir::QPath::Resolved(
28202820
None,
28212821
P(hir::Path {
2822-
span: pth1.span,
2822+
span: ident.span,
28232823
def,
2824-
segments: hir_vec![hir::PathSegment::from_name(pth1.node.name)],
2824+
segments: hir_vec![hir::PathSegment::from_name(ident.name)],
28252825
}),
28262826
)),
28272827
}
@@ -3071,7 +3071,7 @@ impl<'a> LoweringContext<'a> {
30713071
),
30723072
ExprKind::Field(ref el, ident) => hir::ExprField(
30733073
P(self.lower_expr(el)),
3074-
respan(ident.span, self.lower_ident(ident.node)),
3074+
respan(ident.span, self.lower_ident(ident)),
30753075
),
30763076
ExprKind::TupField(ref el, ident) => hir::ExprTupField(P(self.lower_expr(el)), ident),
30773077
ExprKind::Index(ref el, ref er) => {

‎src/librustc_lint/builtin.rs

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -171,16 +171,16 @@ impl<'a, 'tcx> LateLintPass<'a, 'tcx> for NonShorthandFieldPatterns {
171171
if fieldpat.node.is_shorthand {
172172
continue;
173173
}
174-
if let PatKind::Binding(_, _, ident, None) = fieldpat.node.pat.node {
175-
if ident.node == fieldpat.node.name {
174+
if let PatKind::Binding(_, _, name, None) = fieldpat.node.pat.node {
175+
if name.node == fieldpat.node.name {
176176
let mut err = cx.struct_span_lint(NON_SHORTHAND_FIELD_PATTERNS,
177177
fieldpat.span,
178178
&format!("the `{}:` in this pattern is redundant",
179-
ident.node));
179+
name.node));
180180
let subspan = cx.tcx.sess.codemap().span_through_char(fieldpat.span, ':');
181181
err.span_suggestion_short(subspan,
182182
"remove this",
183-
format!("{}", ident.node));
183+
format!("{}", name.node));
184184
err.emit();
185185
}
186186
}
@@ -625,7 +625,7 @@ impl EarlyLintPass for AnonymousParameters {
625625
for arg in sig.decl.inputs.iter() {
626626
match arg.pat.node {
627627
ast::PatKind::Ident(_, ident, None) => {
628-
if ident.node.name == keywords::Invalid.name() {
628+
if ident.name == keywords::Invalid.name() {
629629
cx.span_lint(ANONYMOUS_PARAMETERS,
630630
arg.pat.span,
631631
"use of deprecated anonymous parameter");

‎src/librustc_mir/build/mod.rs

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -467,8 +467,8 @@ fn construct_fn<'a, 'gcx, 'tcx, A>(hir: Cx<'a, 'gcx, 'tcx>,
467467
mutability: Mutability::Not,
468468
};
469469
if let Some(hir::map::NodeBinding(pat)) = tcx.hir.find(var_id) {
470-
if let hir::PatKind::Binding(_, _, ref ident, _) = pat.node {
471-
decl.debug_name = ident.node;
470+
if let hir::PatKind::Binding(_, _, ref name, _) = pat.node {
471+
decl.debug_name = name.node;
472472

473473
let bm = *hir.tables.pat_binding_modes()
474474
.get(pat.hir_id)

‎src/librustc_mir/hair/pattern/mod.rs

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -466,7 +466,7 @@ impl<'a, 'tcx> PatternContext<'a, 'tcx> {
466466
}
467467
}
468468

469-
PatKind::Binding(_, id, ref ident, ref sub) => {
469+
PatKind::Binding(_, id, ref name, ref sub) => {
470470
let var_ty = self.tables.node_id_to_type(pat.hir_id);
471471
let region = match var_ty.sty {
472472
ty::TyRef(r, _) => Some(r),
@@ -493,14 +493,14 @@ impl<'a, 'tcx> PatternContext<'a, 'tcx> {
493493
if let ty::TyRef(_, mt) = ty.sty {
494494
ty = mt.ty;
495495
} else {
496-
bug!("`ref {}` has wrong type {}", ident.node, ty);
496+
bug!("`ref {}` has wrong type {}", name.node, ty);
497497
}
498498
}
499499

500500
PatternKind::Binding {
501501
mutability,
502502
mode,
503-
name: ident.node,
503+
name: name.node,
504504
var: id,
505505
ty: var_ty,
506506
subpattern: self.lower_opt_pattern(sub),

‎src/librustc_resolve/build_reduced_graph.rs

Lines changed: 7 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -34,7 +34,6 @@ use syntax::attr;
3434

3535
use syntax::ast::{self, Block, ForeignItem, ForeignItemKind, Item, ItemKind, NodeId};
3636
use syntax::ast::{Mutability, StmtKind, TraitItem, TraitItemKind, Variant};
37-
use syntax::codemap::respan;
3837
use syntax::ext::base::SyntaxExtension;
3938
use syntax::ext::base::Determinacy::Undetermined;
4039
use syntax::ext::hygiene::Mark;
@@ -115,13 +114,13 @@ impl<'a> Resolver<'a> {
115114

116115
let mut module_path: Vec<_> = prefix.segments.iter()
117116
.chain(path.segments.iter())
118-
.map(|seg| respan(seg.span, seg.ident))
117+
.map(|seg| seg.ident)
119118
.collect();
120119

121120
match use_tree.kind {
122121
ast::UseTreeKind::Simple(rename) => {
123122
let mut ident = use_tree.ident();
124-
let mut source = module_path.pop().unwrap().node;
123+
let mut source = module_path.pop().unwrap();
125124
let mut type_ns_only = false;
126125

127126
if nested {
@@ -130,7 +129,7 @@ impl<'a> Resolver<'a> {
130129
type_ns_only = true;
131130

132131
let last_segment = *module_path.last().unwrap();
133-
if last_segment.node.name == keywords::CrateRoot.name() {
132+
if last_segment.name == keywords::CrateRoot.name() {
134133
resolve_error(
135134
self,
136135
use_tree.span,
@@ -142,9 +141,9 @@ impl<'a> Resolver<'a> {
142141

143142
// Replace `use foo::self;` with `use foo;`
144143
let _ = module_path.pop();
145-
source = last_segment.node;
144+
source = last_segment;
146145
if rename.is_none() {
147-
ident = last_segment.node;
146+
ident = last_segment;
148147
}
149148
}
150149
} else {
@@ -195,8 +194,8 @@ impl<'a> Resolver<'a> {
195194
}
196195
ast::UseTreeKind::Nested(ref items) => {
197196
let prefix = ast::Path {
198-
segments: module_path.iter()
199-
.map(|s| ast::PathSegment::from_ident(s.node, s.span))
197+
segments: module_path.into_iter()
198+
.map(|ident| ast::PathSegment::from_ident(ident, ident.span))
200199
.collect(),
201200
span: path.span,
202201
};

0 commit comments

Comments
 (0)