diff options
| author | bors <bors@rust-lang.org> | 2018-02-06 07:02:25 +0000 |
|---|---|---|
| committer | bors <bors@rust-lang.org> | 2018-02-06 07:02:25 +0000 |
| commit | b224fc84e3438117b218ec6b57fdc3ea8a3d1c2e (patch) | |
| tree | fdea43c93e46ce70ebc3a9f102a0bfa37cd6e69b /src/libsyntax | |
| parent | 6c04c41034c46730fba97bfe9cfa2dd0687c2a5f (diff) | |
| parent | 0553dc81d38cf7bd81334477b0338ef46da50e18 (diff) | |
| download | rust-b224fc84e3438117b218ec6b57fdc3ea8a3d1c2e.tar.gz rust-b224fc84e3438117b218ec6b57fdc3ea8a3d1c2e.zip | |
Auto merge of #48017 - kennytm:rollup, r=kennytm
Rollup of 10 pull requests - Successful merges: #46030, #47496, #47543, #47704, #47753, #47807, #47948, #47959, #48003, #48007 - Failed merges:
Diffstat (limited to 'src/libsyntax')
| -rw-r--r-- | src/libsyntax/feature_gate.rs | 28 |
1 files changed, 2 insertions, 26 deletions
diff --git a/src/libsyntax/feature_gate.rs b/src/libsyntax/feature_gate.rs index 3e858c3b923..9c6520cd874 100644 --- a/src/libsyntax/feature_gate.rs +++ b/src/libsyntax/feature_gate.rs @@ -423,9 +423,6 @@ declare_features! ( // In-band lifetime bindings (e.g. `fn foo(x: &'a u8) -> &'a u8`) (active, in_band_lifetimes, "1.23.0", Some(44524)), - // Nested groups in `use` (RFC 2128) - (active, use_nested_groups, "1.23.0", Some(44494)), - // generic associated types (RFC 1598) (active, generic_associated_types, "1.23.0", Some(44265)), @@ -544,6 +541,8 @@ declare_features! ( (accepted, repr_align, "1.24.0", Some(33626)), // allow '|' at beginning of match arms (RFC 1925) (accepted, match_beginning_vert, "1.25.0", Some(44101)), + // Nested groups in `use` (RFC 2128) + (accepted, use_nested_groups, "1.25.0", Some(44494)), ); // If you change this, please modify src/doc/unstable-book as well. You must @@ -1805,29 +1804,6 @@ impl<'a> Visitor<'a> for PostExpansionVisitor<'a> { visit::walk_path(self, path); } - fn visit_use_tree(&mut self, use_tree: &'a ast::UseTree, id: NodeId, nested: bool) { - if nested { - match use_tree.kind { - ast::UseTreeKind::Simple(_) => { - if use_tree.prefix.segments.len() != 1 { - gate_feature_post!(&self, use_nested_groups, use_tree.span, - "paths in `use` groups are experimental"); - } - } - ast::UseTreeKind::Glob => { - gate_feature_post!(&self, use_nested_groups, use_tree.span, - "glob imports in `use` groups are experimental"); - } - ast::UseTreeKind::Nested(_) => { - gate_feature_post!(&self, use_nested_groups, use_tree.span, - "nested groups in `use` are experimental"); - } - } - } - - visit::walk_use_tree(self, use_tree, id); - } - fn visit_vis(&mut self, vis: &'a ast::Visibility) { if let ast::Visibility::Crate(span, ast::CrateSugar::JustCrate) = *vis { gate_feature_post!(&self, crate_visibility_modifier, span, |
