Skip to content

Commit

Permalink
Rollup merge of rust-lang#47948 - pietroalbini:use-nested-groups-stab…
Browse files Browse the repository at this point in the history
…ilize, r=petrochenkov

Stabilize use_nested_groups

As requested in rust-lang#44494. Documentation PRs already sent.
  • Loading branch information
kennytm authored Feb 5, 2018
2 parents e8688b4 + 01f0814 commit 55aef3c
Show file tree
Hide file tree
Showing 9 changed files with 4 additions and 181 deletions.
90 changes: 0 additions & 90 deletions src/doc/unstable-book/src/language-features/use-nested-groups.md

This file was deleted.

28 changes: 2 additions & 26 deletions src/libsyntax/feature_gate.rs
Original file line number Diff line number Diff line change
Expand Up @@ -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)),

Expand Down Expand Up @@ -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
Expand Down Expand Up @@ -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,
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,6 @@
// option. This file may not be copied, modified, or distributed
// except according to those terms.

#![feature(use_nested_groups)]
#![allow(unused_imports)]

mod foo {}
Expand Down
1 change: 0 additions & 1 deletion src/test/run-pass/issue-47673.rs
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,6 @@
// option. This file may not be copied, modified, or distributed
// except according to those terms.

#![feature(use_nested_groups)]
#![allow(unused_import)]

use {{}, {}};
Expand Down
2 changes: 0 additions & 2 deletions src/test/run-pass/use-nested-groups.rs
Original file line number Diff line number Diff line change
Expand Up @@ -8,8 +8,6 @@
// option. This file may not be copied, modified, or distributed
// except according to those terms.

#![feature(use_nested_groups)]

mod a {
pub enum B {}

Expand Down
31 changes: 0 additions & 31 deletions src/test/ui/feature-gate-use_nested_groups.rs

This file was deleted.

26 changes: 0 additions & 26 deletions src/test/ui/feature-gate-use_nested_groups.stderr

This file was deleted.

2 changes: 0 additions & 2 deletions src/test/ui/use-nested-groups-error.rs
Original file line number Diff line number Diff line change
Expand Up @@ -8,8 +8,6 @@
// option. This file may not be copied, modified, or distributed
// except according to those terms.

#![feature(use_nested_groups)]

mod a {
pub mod b1 {
pub enum C2 {}
Expand Down
4 changes: 2 additions & 2 deletions src/test/ui/use-nested-groups-error.stderr
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
error[E0432]: unresolved import `a::b1::C1`
--> $DIR/use-nested-groups-error.rs:21:14
--> $DIR/use-nested-groups-error.rs:19:14
|
21 | use a::{b1::{C1, C2}, B2};
19 | use a::{b1::{C1, C2}, B2};
| ^^ no `C1` in `a::b1`. Did you mean to use `C2`?

error: aborting due to previous error
Expand Down

0 comments on commit 55aef3c

Please sign in to comment.