Skip to content

Commit 72a10fa

Browse files
borsbors
committed
Auto merge of #28442 - nagisa:remove-enum-vis-field, r=alexcrichton
Followup on #28440 Do not merge before the referenced PR is merged. I will fix the PR once that is merged (or close if it is not)
2 parents dc1c797 + a9cb51c commit 72a10fa

File tree

16 files changed

+15
-51
lines changed

16 files changed

+15
-51
lines changed

‎src/librustc_front/fold.rs

+1-2
Original file line numberDiff line numberDiff line change
@@ -415,7 +415,7 @@ pub fn noop_fold_foreign_mod<T: Folder>(ForeignMod {abi, items}: ForeignMod,
415415
}
416416

417417
pub fn noop_fold_variant<T: Folder>(v: P<Variant>, fld: &mut T) -> P<Variant> {
418-
v.map(|Spanned {node: Variant_ {id, name, attrs, kind, disr_expr, vis}, span}| Spanned {
418+
v.map(|Spanned {node: Variant_ {id, name, attrs, kind, disr_expr}, span}| Spanned {
419419
node: Variant_ {
420420
id: fld.new_id(id),
421421
name: name,
@@ -430,7 +430,6 @@ pub fn noop_fold_variant<T: Folder>(v: P<Variant>, fld: &mut T) -> P<Variant> {
430430
}
431431
},
432432
disr_expr: disr_expr.map(|e| fld.fold_expr(e)),
433-
vis: vis,
434433
},
435434
span: fld.new_span(span),
436435
})

‎src/librustc_front/hir.rs

-1
Original file line numberDiff line numberDiff line change
@@ -1052,7 +1052,6 @@ pub struct Variant_ {
10521052
pub id: NodeId,
10531053
/// Explicit discriminant, eg `Foo = 1`
10541054
pub disr_expr: Option<P<Expr>>,
1055-
pub vis: Visibility,
10561055
}
10571056

10581057
pub type Variant = Spanned<Variant_>;

‎src/librustc_front/lowering.rs

-1
Original file line numberDiff line numberDiff line change
@@ -147,7 +147,6 @@ pub fn lower_variant(v: &Variant) -> P<hir::Variant> {
147147
}
148148
},
149149
disr_expr: v.node.disr_expr.as_ref().map(|e| lower_expr(e)),
150-
vis: lower_visibility(v.node.vis),
151150
},
152151
span: v.span,
153152
})

‎src/librustc_front/print/pprust.rs

-1
Original file line numberDiff line numberDiff line change
@@ -944,7 +944,6 @@ impl<'a> State<'a> {
944944
}
945945

946946
pub fn print_variant(&mut self, v: &hir::Variant) -> io::Result<()> {
947-
try!(self.print_visibility(v.node.vis));
948947
match v.node.kind {
949948
hir::TupleVariantKind(ref args) => {
950949
try!(self.print_ident(v.node.name));

‎src/librustc_privacy/lib.rs

+2-19
Original file line numberDiff line numberDiff line change
@@ -1075,20 +1075,7 @@ impl<'a, 'tcx> SanePrivacyVisitor<'a, 'tcx> {
10751075
instead");
10761076
}
10771077

1078-
hir::ItemEnum(ref def, _) => {
1079-
for v in &def.variants {
1080-
match v.node.vis {
1081-
hir::Public => {
1082-
if item.vis == hir::Public {
1083-
span_err!(tcx.sess, v.span, E0448,
1084-
"unnecessary `pub` visibility");
1085-
}
1086-
}
1087-
hir::Inherited => {}
1088-
}
1089-
}
1090-
}
1091-
1078+
hir::ItemEnum(..) |
10921079
hir::ItemTrait(..) | hir::ItemDefaultImpl(..) |
10931080
hir::ItemConst(..) | hir::ItemStatic(..) | hir::ItemStruct(..) |
10941081
hir::ItemFn(..) | hir::ItemMod(..) | hir::ItemTy(..) |
@@ -1131,14 +1118,10 @@ impl<'a, 'tcx> SanePrivacyVisitor<'a, 'tcx> {
11311118
check_inherited(tcx, i.span, i.vis);
11321119
}
11331120
}
1134-
hir::ItemEnum(ref def, _) => {
1135-
for v in &def.variants {
1136-
check_inherited(tcx, v.span, v.node.vis);
1137-
}
1138-
}
11391121

11401122
hir::ItemStruct(ref def, _) => check_struct(&**def),
11411123

1124+
hir::ItemEnum(..) |
11421125
hir::ItemExternCrate(_) | hir::ItemUse(_) |
11431126
hir::ItemTrait(..) | hir::ItemDefaultImpl(..) |
11441127
hir::ItemStatic(..) | hir::ItemConst(..) |

‎src/librustdoc/clean/mod.rs

+1-1
Original file line numberDiff line numberDiff line change
@@ -1850,7 +1850,7 @@ impl Clean<Item> for doctree::Variant {
18501850
name: Some(self.name.clean(cx)),
18511851
attrs: self.attrs.clean(cx),
18521852
source: self.whence.clean(cx),
1853-
visibility: self.vis.clean(cx),
1853+
visibility: None,
18541854
stability: self.stab.clean(cx),
18551855
def_id: DefId::local(self.id),
18561856
inner: VariantItem(Variant {

‎src/librustdoc/doctree.rs

-1
Original file line numberDiff line numberDiff line change
@@ -121,7 +121,6 @@ pub struct Variant {
121121
pub attrs: Vec<ast::Attribute>,
122122
pub kind: hir::VariantKind,
123123
pub id: ast::NodeId,
124-
pub vis: hir::Visibility,
125124
pub stab: Option<attr::Stability>,
126125
pub whence: Span,
127126
}

‎src/librustdoc/visit_ast.rs

-1
Original file line numberDiff line numberDiff line change
@@ -109,7 +109,6 @@ impl<'a, 'tcx> RustdocVisitor<'a, 'tcx> {
109109
variants: def.variants.iter().map(|v| Variant {
110110
name: v.node.name,
111111
attrs: v.node.attrs.clone(),
112-
vis: v.node.vis,
113112
stab: self.stability(v.node.id),
114113
id: v.node.id,
115114
kind: v.node.kind.clone(),

‎src/libsyntax/ast.rs

-1
Original file line numberDiff line numberDiff line change
@@ -1614,7 +1614,6 @@ pub struct Variant_ {
16141614
pub id: NodeId,
16151615
/// Explicit discriminant, eg `Foo = 1`
16161616
pub disr_expr: Option<P<Expr>>,
1617-
pub vis: Visibility,
16181617
}
16191618

16201619
pub type Variant = Spanned<Variant_>;

‎src/libsyntax/config.rs

+1-2
Original file line numberDiff line numberDiff line change
@@ -141,7 +141,7 @@ fn fold_item_underscore<F>(cx: &mut Context<F>, item: ast::Item_) -> ast::Item_
141141
None
142142
} else {
143143
Some(v.map(|Spanned {node: ast::Variant_ {id, name, attrs, kind,
144-
disr_expr, vis}, span}| {
144+
disr_expr}, span}| {
145145
Spanned {
146146
node: ast::Variant_ {
147147
id: id,
@@ -154,7 +154,6 @@ fn fold_item_underscore<F>(cx: &mut Context<F>, item: ast::Item_) -> ast::Item_
154154
}
155155
},
156156
disr_expr: disr_expr,
157-
vis: vis
158157
},
159158
span: span
160159
}

‎src/libsyntax/ext/build.rs

-1
Original file line numberDiff line numberDiff line change
@@ -1013,7 +1013,6 @@ impl<'a> AstBuilder for ExtCtxt<'a> {
10131013
kind: ast::TupleVariantKind(args),
10141014
id: ast::DUMMY_NODE_ID,
10151015
disr_expr: None,
1016-
vis: ast::Public
10171016
})
10181017
}
10191018

‎src/libsyntax/fold.rs

+1-2
Original file line numberDiff line numberDiff line change
@@ -450,7 +450,7 @@ pub fn noop_fold_foreign_mod<T: Folder>(ForeignMod {abi, items}: ForeignMod,
450450
}
451451

452452
pub fn noop_fold_variant<T: Folder>(v: P<Variant>, fld: &mut T) -> P<Variant> {
453-
v.map(|Spanned {node: Variant_ {id, name, attrs, kind, disr_expr, vis}, span}| Spanned {
453+
v.map(|Spanned {node: Variant_ {id, name, attrs, kind, disr_expr}, span}| Spanned {
454454
node: Variant_ {
455455
id: fld.new_id(id),
456456
name: name,
@@ -465,7 +465,6 @@ pub fn noop_fold_variant<T: Folder>(v: P<Variant>, fld: &mut T) -> P<Variant> {
465465
}
466466
},
467467
disr_expr: disr_expr.map(|e| fld.fold_expr(e)),
468-
vis: vis,
469468
},
470469
span: fld.new_span(span),
471470
})

‎src/libsyntax/parse/parser.rs

+1-5
Original file line numberDiff line numberDiff line change
@@ -5185,13 +5185,10 @@ impl<'a> Parser<'a> {
51855185
let variant_attrs = self.parse_outer_attributes();
51865186
let vlo = self.span.lo;
51875187

5188-
let vis = try!(self.parse_visibility());
5189-
5190-
let ident;
51915188
let kind;
51925189
let mut args = Vec::new();
51935190
let mut disr_expr = None;
5194-
ident = try!(self.parse_ident());
5191+
let ident = try!(self.parse_ident());
51955192
if try!(self.eat(&token::OpenDelim(token::Brace)) ){
51965193
// Parse a struct variant.
51975194
all_nullary = false;
@@ -5233,7 +5230,6 @@ impl<'a> Parser<'a> {
52335230
kind: kind,
52345231
id: ast::DUMMY_NODE_ID,
52355232
disr_expr: disr_expr,
5236-
vis: vis,
52375233
};
52385234
variants.push(P(spanned(vlo, self.last_span.hi, vr)));
52395235

‎src/libsyntax/print/pprust.rs

+1-3
Original file line numberDiff line numberDiff line change
@@ -1507,7 +1507,6 @@ impl<'a> State<'a> {
15071507
}
15081508

15091509
pub fn print_variant(&mut self, v: &ast::Variant) -> io::Result<()> {
1510-
try!(self.print_visibility(v.node.vis));
15111510
match v.node.kind {
15121511
ast::TupleVariantKind(ref args) => {
15131512
try!(self.print_ident(v.node.name));
@@ -3139,11 +3138,10 @@ mod tests {
31393138
kind: ast::TupleVariantKind(Vec::new()),
31403139
id: 0,
31413140
disr_expr: None,
3142-
vis: ast::Public,
31433141
});
31443142

31453143
let varstr = variant_to_string(&var);
3146-
assert_eq!(varstr, "pub principal_skinner");
3144+
assert_eq!(varstr, "principal_skinner");
31473145
}
31483146

31493147
#[test]

‎src/test/compile-fail/issue-3993-2.rs ‎src/test/compile-fail/issue-28433.rs

+7-9
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
// Copyright 2012 The Rust Project Developers. See the COPYRIGHT
1+
// Copyright 2015 The Rust Project Developers. See the COPYRIGHT
22
// file at the top-level directory of this distribution and at
33
// http://rust-lang.org/COPYRIGHT.
44
//
@@ -8,16 +8,14 @@
88
// option. This file may not be copied, modified, or distributed
99
// except according to those terms.
1010

11-
use zoo::bird::{duck, goose};
12-
13-
mod zoo {
14-
pub enum bird {
15-
pub duck, //~ ERROR: unnecessary `pub` visibility
16-
goose
17-
}
11+
enum bird {
12+
pub duck,
13+
//~^ ERROR: expected identifier, found keyword `pub`
14+
//~^^ ERROR: expected
15+
goose
1816
}
1917

2018

2119
fn main() {
22-
let y = goose;
20+
let y = bird::goose;
2321
}

‎src/test/compile-fail/useless-priv.rs ‎src/test/compile-fail/useless-pub.rs

-1
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,6 @@
99
// except according to those terms.
1010

1111
struct A { pub i: isize }
12-
pub enum C { pub Variant } //~ ERROR: unnecessary `pub`
1312

1413
pub trait E {
1514
fn foo(&self);

0 commit comments

Comments
 (0)