Skip to content

Commit 310d899

Browse files
borsbors
committed
Auto merge of #33654 - petrochenkov:hirident, r=nrc
Remove hir::Ident Now when name resolution is done on AST, `hir::Ident` is no longer necessary. See #30145 for more details. r? @nrc
2 parents 75e23e1 + 02a1eef commit 310d899

File tree

32 files changed

+160
-239
lines changed

32 files changed

+160
-239
lines changed

‎src/librustc/cfg/construct.rs

+2-2
Original file line numberDiff line numberDiff line change
@@ -285,15 +285,15 @@ impl<'a, 'tcx> CFGBuilder<'a, 'tcx> {
285285
}
286286

287287
hir::ExprBreak(label) => {
288-
let loop_scope = self.find_scope(expr, label.map(|l| l.node.name));
288+
let loop_scope = self.find_scope(expr, label.map(|l| l.node));
289289
let b = self.add_ast_node(expr.id, &[pred]);
290290
self.add_exiting_edge(expr, b,
291291
loop_scope, loop_scope.break_index);
292292
self.add_unreachable_node()
293293
}
294294

295295
hir::ExprAgain(label) => {
296-
let loop_scope = self.find_scope(expr, label.map(|l| l.node.name));
296+
let loop_scope = self.find_scope(expr, label.map(|l| l.node));
297297
let a = self.add_ast_node(expr.id, &[pred]);
298298
self.add_exiting_edge(expr, a,
299299
loop_scope, loop_scope.continue_index);

‎src/librustc/hir/fold.rs

+11-19
Original file line numberDiff line numberDiff line change
@@ -126,10 +126,6 @@ pub trait Folder : Sized {
126126
noop_fold_name(n, self)
127127
}
128128

129-
fn fold_ident(&mut self, i: Ident) -> Ident {
130-
noop_fold_ident(i, self)
131-
}
132-
133129
fn fold_usize(&mut self, i: usize) -> usize {
134130
noop_fold_usize(i, self)
135131
}
@@ -407,20 +403,16 @@ pub fn noop_fold_name<T: Folder>(n: Name, _: &mut T) -> Name {
407403
n
408404
}
409405

410-
pub fn noop_fold_ident<T: Folder>(i: Ident, _: &mut T) -> Ident {
411-
i
412-
}
413-
414406
pub fn noop_fold_usize<T: Folder>(i: usize, _: &mut T) -> usize {
415407
i
416408
}
417409

418410
pub fn noop_fold_path<T: Folder>(Path { global, segments, span }: Path, fld: &mut T) -> Path {
419411
Path {
420412
global: global,
421-
segments: segments.move_map(|PathSegment { identifier, parameters }| {
413+
segments: segments.move_map(|PathSegment { name, parameters }| {
422414
PathSegment {
423-
identifier: fld.fold_ident(identifier),
415+
name: fld.fold_name(name),
424416
parameters: fld.fold_path_parameters(parameters),
425417
}
426418
}),
@@ -926,7 +918,7 @@ pub fn noop_fold_pat<T: Folder>(p: P<Pat>, folder: &mut T) -> P<Pat> {
926918
PatKind::Ident(binding_mode,
927919
Spanned {
928920
span: folder.new_span(pth1.span),
929-
node: folder.fold_ident(pth1.node),
921+
node: folder.fold_name(pth1.node),
930922
},
931923
sub.map(|x| folder.fold_pat(x)))
932924
}
@@ -1014,14 +1006,14 @@ pub fn noop_fold_expr<T: Folder>(Expr { id, node, span, attrs }: Expr, folder: &
10141006
folder.fold_block(tr),
10151007
fl.map(|x| folder.fold_expr(x)))
10161008
}
1017-
ExprWhile(cond, body, opt_ident) => {
1009+
ExprWhile(cond, body, opt_name) => {
10181010
ExprWhile(folder.fold_expr(cond),
10191011
folder.fold_block(body),
1020-
opt_ident.map(|i| folder.fold_ident(i)))
1012+
opt_name.map(|i| folder.fold_name(i)))
10211013
}
1022-
ExprLoop(body, opt_ident) => {
1014+
ExprLoop(body, opt_name) => {
10231015
ExprLoop(folder.fold_block(body),
1024-
opt_ident.map(|i| folder.fold_ident(i)))
1016+
opt_name.map(|i| folder.fold_name(i)))
10251017
}
10261018
ExprMatch(expr, arms, source) => {
10271019
ExprMatch(folder.fold_expr(expr),
@@ -1061,11 +1053,11 @@ pub fn noop_fold_expr<T: Folder>(Expr { id, node, span, attrs }: Expr, folder: &
10611053
});
10621054
ExprPath(qself, folder.fold_path(path))
10631055
}
1064-
ExprBreak(opt_ident) => ExprBreak(opt_ident.map(|label| {
1065-
respan(folder.new_span(label.span), folder.fold_ident(label.node))
1056+
ExprBreak(opt_name) => ExprBreak(opt_name.map(|label| {
1057+
respan(folder.new_span(label.span), folder.fold_name(label.node))
10661058
})),
1067-
ExprAgain(opt_ident) => ExprAgain(opt_ident.map(|label| {
1068-
respan(folder.new_span(label.span), folder.fold_ident(label.node))
1059+
ExprAgain(opt_name) => ExprAgain(opt_name.map(|label| {
1060+
respan(folder.new_span(label.span), folder.fold_name(label.node))
10691061
})),
10701062
ExprRet(e) => ExprRet(e.map(|x| folder.fold_expr(x))),
10711063
ExprInlineAsm(asm, outputs, inputs) => {

‎src/librustc/hir/intravisit.rs

+9-22
Original file line numberDiff line numberDiff line change
@@ -97,9 +97,6 @@ pub trait Visitor<'v> : Sized {
9797
fn visit_name(&mut self, _span: Span, _name: Name) {
9898
// Nothing to do.
9999
}
100-
fn visit_ident(&mut self, span: Span, ident: Ident) {
101-
walk_ident(self, span, ident);
102-
}
103100
fn visit_mod(&mut self, m: &'v Mod, _s: Span, _n: NodeId) {
104101
walk_mod(self, m)
105102
}
@@ -211,16 +208,6 @@ pub fn walk_opt_name<'v, V: Visitor<'v>>(visitor: &mut V, span: Span, opt_name:
211208
}
212209
}
213210

214-
pub fn walk_opt_ident<'v, V: Visitor<'v>>(visitor: &mut V, span: Span, opt_ident: Option<Ident>) {
215-
for ident in opt_ident {
216-
visitor.visit_ident(span, ident);
217-
}
218-
}
219-
220-
pub fn walk_ident<'v, V: Visitor<'v>>(visitor: &mut V, span: Span, ident: Ident) {
221-
visitor.visit_name(span, ident.name);
222-
}
223-
224211
/// Walks the contents of a crate. See also `Crate::visit_all_items`.
225212
pub fn walk_crate<'v, V: Visitor<'v>>(visitor: &mut V, krate: &'v Crate) {
226213
visitor.visit_mod(&krate.module, krate.span, CRATE_NODE_ID);
@@ -439,7 +426,7 @@ pub fn walk_path_list_item<'v, V: Visitor<'v>>(visitor: &mut V,
439426
pub fn walk_path_segment<'v, V: Visitor<'v>>(visitor: &mut V,
440427
path_span: Span,
441428
segment: &'v PathSegment) {
442-
visitor.visit_ident(path_span, segment.identifier);
429+
visitor.visit_name(path_span, segment.name);
443430
visitor.visit_path_parameters(path_span, &segment.parameters);
444431
}
445432

@@ -495,7 +482,7 @@ pub fn walk_pat<'v, V: Visitor<'v>>(visitor: &mut V, pattern: &'v Pat) {
495482
visitor.visit_pat(subpattern)
496483
}
497484
PatKind::Ident(_, ref pth1, ref optional_subpattern) => {
498-
visitor.visit_ident(pth1.span, pth1.node);
485+
visitor.visit_name(pth1.span, pth1.node);
499486
walk_list!(visitor, visit_pat, optional_subpattern);
500487
}
501488
PatKind::Lit(ref expression) => visitor.visit_expr(expression),
@@ -750,14 +737,14 @@ pub fn walk_expr<'v, V: Visitor<'v>>(visitor: &mut V, expression: &'v Expr) {
750737
visitor.visit_block(if_block);
751738
walk_list!(visitor, visit_expr, optional_else);
752739
}
753-
ExprWhile(ref subexpression, ref block, opt_ident) => {
740+
ExprWhile(ref subexpression, ref block, opt_name) => {
754741
visitor.visit_expr(subexpression);
755742
visitor.visit_block(block);
756-
walk_opt_ident(visitor, expression.span, opt_ident)
743+
walk_opt_name(visitor, expression.span, opt_name)
757744
}
758-
ExprLoop(ref block, opt_ident) => {
745+
ExprLoop(ref block, opt_name) => {
759746
visitor.visit_block(block);
760-
walk_opt_ident(visitor, expression.span, opt_ident)
747+
walk_opt_name(visitor, expression.span, opt_name)
761748
}
762749
ExprMatch(ref subexpression, ref arms, _) => {
763750
visitor.visit_expr(subexpression);
@@ -796,9 +783,9 @@ pub fn walk_expr<'v, V: Visitor<'v>>(visitor: &mut V, expression: &'v Expr) {
796783
}
797784
visitor.visit_path(path, expression.id)
798785
}
799-
ExprBreak(ref opt_sp_ident) | ExprAgain(ref opt_sp_ident) => {
800-
for sp_ident in opt_sp_ident {
801-
visitor.visit_ident(sp_ident.span, sp_ident.node);
786+
ExprBreak(ref opt_sp_name) | ExprAgain(ref opt_sp_name) => {
787+
for sp_name in opt_sp_name {
788+
visitor.visit_name(sp_name.span, sp_name.node);
802789
}
803790
}
804791
ExprRet(ref optional_expression) => {

0 commit comments

Comments
 (0)