diff options
| author | bors <bors@rust-lang.org> | 2017-03-21 17:02:38 +0000 |
|---|---|---|
| committer | bors <bors@rust-lang.org> | 2017-03-21 17:02:38 +0000 |
| commit | 58c701f5c7dc26d9b55c631006ece52abe1ddce2 (patch) | |
| tree | e14d7a2767b4356590cc377267e3307275ed07f6 /src/libsyntax | |
| parent | 53eb08bedc8719844bb553dbe1a39d9010783ff5 (diff) | |
| parent | b6240e51ae5657db0185002e725a5a717987fee0 (diff) | |
| download | rust-58c701f5c7dc26d9b55c631006ece52abe1ddce2.tar.gz rust-58c701f5c7dc26d9b55c631006ece52abe1ddce2.zip | |
Auto merge of #40693 - frewsxcv:rollup, r=frewsxcv
Rollup of 10 pull requests - Successful merges: #40229, #40312, #40332, #40502, #40556, #40576, #40667, #40671, #40681, #40685 - Failed merges:
Diffstat (limited to 'src/libsyntax')
| -rw-r--r-- | src/libsyntax/feature_gate.rs | 17 |
1 files changed, 3 insertions, 14 deletions
diff --git a/src/libsyntax/feature_gate.rs b/src/libsyntax/feature_gate.rs index d07069d030a..7af432176cf 100644 --- a/src/libsyntax/feature_gate.rs +++ b/src/libsyntax/feature_gate.rs @@ -260,9 +260,6 @@ declare_features! ( // impl specialization (RFC 1210) (active, specialization, "1.7.0", Some(31844)), - // pub(restricted) visibilities (RFC 1422) - (active, pub_restricted, "1.9.0", Some(32409)), - // Allow Drop types in statics/const functions (RFC 1440) (active, drop_types_in_const, "1.9.0", Some(33156)), @@ -409,6 +406,9 @@ declare_features! ( (accepted, field_init_shorthand, "1.17.0", Some(37340)), // Allows the definition recursive static items. (accepted, static_recursion, "1.17.0", Some(29719)), + // pub(restricted) visibilities (RFC 1422) + (accepted, pub_restricted, "1.17.0", Some(32409)), + ); // If you change this, please modify src/doc/unstable-book as well. You must // move that documentation into the relevant place in the other docs, and @@ -1417,17 +1417,6 @@ impl<'a> Visitor<'a> for PostExpansionVisitor<'a> { visit::walk_impl_item(self, ii); } - fn visit_vis(&mut self, vis: &'a ast::Visibility) { - let span = match *vis { - ast::Visibility::Crate(span) => span, - ast::Visibility::Restricted { ref path, .. } => path.span, - _ => return, - }; - gate_feature_post!(&self, pub_restricted, span, "`pub(restricted)` syntax is experimental"); - - visit::walk_vis(self, vis) - } - fn visit_generics(&mut self, g: &'a ast::Generics) { for t in &g.ty_params { if !t.attrs.is_empty() { |
