Skip to content

Commit beda1f8

Browse files
petrochenkovpetrochenkov
committed
Provide span for visit_struct_def + remove some dead code
1 parent 877c35e commit beda1f8

File tree

13 files changed

+26
-51
lines changed

13 files changed

+26
-51
lines changed

‎src/librustc/lint/context.rs

Lines changed: 4 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -665,7 +665,8 @@ impl<'a, 'tcx, 'v> hir_visit::Visitor<'v> for LateContext<'a, 'tcx> {
665665
s: &hir::StructDef,
666666
name: ast::Name,
667667
g: &hir::Generics,
668-
item_id: ast::NodeId) {
668+
item_id: ast::NodeId,
669+
_: Span) {
669670
run_lints!(self, check_struct_def, late_passes, s, name, g, item_id);
670671
hir_visit::walk_struct_def(self, s);
671672
run_lints!(self, check_struct_def_post, late_passes, s, name, g, item_id);
@@ -814,7 +815,8 @@ impl<'a, 'v> ast_visit::Visitor<'v> for EarlyContext<'a> {
814815
s: &ast::StructDef,
815816
ident: ast::Ident,
816817
g: &ast::Generics,
817-
item_id: ast::NodeId) {
818+
item_id: ast::NodeId,
819+
_: Span) {
818820
run_lints!(self, check_struct_def, early_passes, s, ident, g, item_id);
819821
ast_visit::walk_struct_def(self, s);
820822
run_lints!(self, check_struct_def_post, early_passes, s, ident, g, item_id);

‎src/librustc/middle/dead.rs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -216,7 +216,7 @@ impl<'a, 'tcx> MarkSymbolVisitor<'a, 'tcx> {
216216
impl<'a, 'tcx, 'v> Visitor<'v> for MarkSymbolVisitor<'a, 'tcx> {
217217

218218
fn visit_struct_def(&mut self, def: &hir::StructDef, _: ast::Name,
219-
_: &hir::Generics, _: ast::NodeId) {
219+
_: &hir::Generics, _: ast::NodeId, _: codemap::Span) {
220220
let has_extern_repr = self.struct_has_extern_repr;
221221
let inherited_pub_visibility = self.inherited_pub_visibility;
222222
let live_fields = def.fields.iter().filter(|f| {

‎src/librustc_back/svh.rs

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -301,7 +301,8 @@ mod svh_visitor {
301301
}
302302

303303
impl<'a, 'v> Visitor<'v> for StrictVersionHashVisitor<'a> {
304-
fn visit_struct_def(&mut self, s: &StructDef, name: Name, g: &Generics, _: NodeId) {
304+
fn visit_struct_def(&mut self, s: &StructDef, name: Name,
305+
g: &Generics, _: NodeId, _: Span) {
305306
SawStructDef(name.as_str()).hash(self.st);
306307
visit::walk_generics(self, g);
307308
visit::walk_struct_def(self, s)

‎src/librustc_front/fold.rs

Lines changed: 0 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -247,10 +247,6 @@ pub trait Folder : Sized {
247247
noop_fold_opt_lifetime(o_lt, self)
248248
}
249249

250-
fn fold_variant_arg(&mut self, va: VariantArg) -> VariantArg {
251-
noop_fold_variant_arg(va, self)
252-
}
253-
254250
fn fold_opt_bounds(&mut self,
255251
b: Option<OwnedSlice<TyParamBound>>)
256252
-> Option<OwnedSlice<TyParamBound>> {
@@ -766,15 +762,6 @@ fn noop_fold_bounds<T: Folder>(bounds: TyParamBounds, folder: &mut T) -> TyParam
766762
bounds.move_map(|bound| folder.fold_ty_param_bound(bound))
767763
}
768764

769-
fn noop_fold_variant_arg<T: Folder>(VariantArg { id, ty }: VariantArg,
770-
folder: &mut T)
771-
-> VariantArg {
772-
VariantArg {
773-
id: folder.new_id(id),
774-
ty: folder.fold_ty(ty),
775-
}
776-
}
777-
778765
pub fn noop_fold_block<T: Folder>(b: P<Block>, folder: &mut T) -> P<Block> {
779766
b.map(|Block { id, stmts, expr, rules, span }| {
780767
Block {

‎src/librustc_front/hir.rs

Lines changed: 0 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -1014,12 +1014,6 @@ pub struct ForeignMod {
10141014
pub items: Vec<P<ForeignItem>>,
10151015
}
10161016

1017-
#[derive(Clone, PartialEq, Eq, RustcEncodable, RustcDecodable, Hash, Debug)]
1018-
pub struct VariantArg {
1019-
pub ty: P<Ty>,
1020-
pub id: NodeId,
1021-
}
1022-
10231017
#[derive(Clone, PartialEq, Eq, RustcEncodable, RustcDecodable, Hash, Debug)]
10241018
pub struct EnumDef {
10251019
pub variants: Vec<P<Variant>>,

‎src/librustc_front/util.rs

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -285,7 +285,8 @@ impl<'a, 'v, O: ast_util::IdVisitingOperation> Visitor<'v> for IdVisitor<'a, O>
285285
struct_def: &StructDef,
286286
_: Name,
287287
_: &hir::Generics,
288-
_: NodeId) {
288+
_: NodeId,
289+
_: Span) {
289290
self.operation.visit_id(struct_def.id);
290291
visit::walk_struct_def(self, struct_def);
291292
}

‎src/librustc_front/visit.rs

Lines changed: 6 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -112,7 +112,8 @@ pub trait Visitor<'v> : Sized {
112112
fn visit_poly_trait_ref(&mut self, t: &'v PolyTraitRef, m: &'v TraitBoundModifier) {
113113
walk_poly_trait_ref(self, t, m)
114114
}
115-
fn visit_struct_def(&mut self, s: &'v StructDef, _: Name, _: &'v Generics, _: NodeId) {
115+
fn visit_struct_def(&mut self, s: &'v StructDef, _: Name,
116+
_: &'v Generics, _: NodeId, _: Span) {
116117
walk_struct_def(self, s)
117118
}
118119
fn visit_struct_field(&mut self, s: &'v StructField) {
@@ -309,7 +310,8 @@ pub fn walk_item<'v, V: Visitor<'v>>(visitor: &mut V, item: &'v Item) {
309310
}
310311
ItemStruct(ref struct_definition, ref generics) => {
311312
visitor.visit_generics(generics);
312-
visitor.visit_struct_def(struct_definition, item.name, generics, item.id);
313+
visitor.visit_struct_def(struct_definition, item.name,
314+
generics, item.id, item.span);
313315
}
314316
ItemTrait(_, ref generics, ref bounds, ref methods) => {
315317
visitor.visit_generics(generics);
@@ -334,7 +336,8 @@ pub fn walk_variant<'v, V: Visitor<'v>>(visitor: &mut V,
334336
generics: &'v Generics,
335337
item_id: NodeId) {
336338
visitor.visit_name(variant.span, variant.node.name);
337-
visitor.visit_struct_def(&variant.node.def, variant.node.name, generics, item_id);
339+
visitor.visit_struct_def(&variant.node.def, variant.node.name,
340+
generics, item_id, variant.span);
338341
walk_list!(visitor, visit_expr, &variant.node.disr_expr);
339342
walk_list!(visitor, visit_attribute, &variant.node.attrs);
340343
}

‎src/librustc_privacy/lib.rs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -129,7 +129,7 @@ impl<'v> Visitor<'v> for ParentVisitor {
129129
}
130130

131131
fn visit_struct_def(&mut self, s: &hir::StructDef, _: ast::Name,
132-
_: &'v hir::Generics, item_id: ast::NodeId) {
132+
_: &'v hir::Generics, item_id: ast::NodeId, _: Span) {
133133
// Struct constructors are parented to their struct definitions because
134134
// they essentially are the struct definitions.
135135
if s.kind != hir::VariantKind::Dict {

‎src/librustc_resolve/lib.rs

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -501,7 +501,8 @@ impl<'a, 'v, 'tcx> Visitor<'v> for Resolver<'a, 'tcx> {
501501
}
502502

503503
// `visit::walk_variant` without the discriminant expression.
504-
self.visit_struct_def(&variant.node.def, variant.node.name, generics, item_id);
504+
self.visit_struct_def(&variant.node.def, variant.node.name,
505+
generics, item_id, variant.span);
505506
}
506507
fn visit_foreign_item(&mut self, foreign_item: &hir::ForeignItem) {
507508
execute_callback!(hir_map::Node::NodeForeignItem(foreign_item), self);

‎src/libsyntax/ast.rs

Lines changed: 0 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -1570,12 +1570,6 @@ pub struct ForeignMod {
15701570
pub items: Vec<P<ForeignItem>>,
15711571
}
15721572

1573-
#[derive(Clone, PartialEq, Eq, RustcEncodable, RustcDecodable, Hash, Debug)]
1574-
pub struct VariantArg {
1575-
pub ty: P<Ty>,
1576-
pub id: NodeId,
1577-
}
1578-
15791573
#[derive(Clone, PartialEq, Eq, RustcEncodable, RustcDecodable, Hash, Debug)]
15801574
pub struct EnumDef {
15811575
pub variants: Vec<P<Variant>>,

‎src/libsyntax/ast_util.rs

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -456,7 +456,8 @@ impl<'a, 'v, O: IdVisitingOperation> Visitor<'v> for IdVisitor<'a, O> {
456456
struct_def: &StructDef,
457457
_: ast::Ident,
458458
_: &ast::Generics,
459-
_: NodeId) {
459+
_: NodeId,
460+
_: Span) {
460461
self.operation.visit_id(struct_def.id);
461462
visit::walk_struct_def(self, struct_def);
462463
}

‎src/libsyntax/fold.rs

Lines changed: 0 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -271,10 +271,6 @@ pub trait Folder : Sized {
271271
noop_fold_opt_lifetime(o_lt, self)
272272
}
273273

274-
fn fold_variant_arg(&mut self, va: VariantArg) -> VariantArg {
275-
noop_fold_variant_arg(va, self)
276-
}
277-
278274
fn fold_opt_bounds(&mut self, b: Option<OwnedSlice<TyParamBound>>)
279275
-> Option<OwnedSlice<TyParamBound>> {
280276
noop_fold_opt_bounds(b, self)
@@ -884,14 +880,6 @@ fn noop_fold_bounds<T: Folder>(bounds: TyParamBounds, folder: &mut T)
884880
bounds.move_map(|bound| folder.fold_ty_param_bound(bound))
885881
}
886882

887-
fn noop_fold_variant_arg<T: Folder>(VariantArg {id, ty}: VariantArg, folder: &mut T)
888-
-> VariantArg {
889-
VariantArg {
890-
id: folder.new_id(id),
891-
ty: folder.fold_ty(ty)
892-
}
893-
}
894-
895883
pub fn noop_fold_block<T: Folder>(b: P<Block>, folder: &mut T) -> P<Block> {
896884
b.map(|Block {id, stmts, expr, rules, span}| Block {
897885
id: folder.new_id(id),

‎src/libsyntax/visit.rs

Lines changed: 6 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -80,7 +80,8 @@ pub trait Visitor<'v> : Sized {
8080
fn visit_poly_trait_ref(&mut self, t: &'v PolyTraitRef, m: &'v TraitBoundModifier) {
8181
walk_poly_trait_ref(self, t, m)
8282
}
83-
fn visit_struct_def(&mut self, s: &'v StructDef, _: Ident, _: &'v Generics, _: NodeId) {
83+
fn visit_struct_def(&mut self, s: &'v StructDef, _: Ident,
84+
_: &'v Generics, _: NodeId, _: Span) {
8485
walk_struct_def(self, s)
8586
}
8687
fn visit_struct_field(&mut self, s: &'v StructField) { walk_struct_field(self, s) }
@@ -288,7 +289,8 @@ pub fn walk_item<'v, V: Visitor<'v>>(visitor: &mut V, item: &'v Item) {
288289
}
289290
ItemStruct(ref struct_definition, ref generics) => {
290291
visitor.visit_generics(generics);
291-
visitor.visit_struct_def(struct_definition, item.ident, generics, item.id);
292+
visitor.visit_struct_def(struct_definition, item.ident,
293+
generics, item.id, item.span);
292294
}
293295
ItemTrait(_, ref generics, ref bounds, ref methods) => {
294296
visitor.visit_generics(generics);
@@ -314,7 +316,8 @@ pub fn walk_variant<'v, V: Visitor<'v>>(visitor: &mut V,
314316
generics: &'v Generics,
315317
item_id: NodeId) {
316318
visitor.visit_ident(variant.span, variant.node.name);
317-
visitor.visit_struct_def(&variant.node.def, variant.node.name, generics, item_id);
319+
visitor.visit_struct_def(&variant.node.def, variant.node.name,
320+
generics, item_id, variant.span);
318321
walk_list!(visitor, visit_expr, &variant.node.disr_expr);
319322
walk_list!(visitor, visit_attribute, &variant.node.attrs);
320323
}

0 commit comments

Comments
 (0)