Skip to content

Commit

Permalink
Rollup merge of rust-lang#47853 - rust-lang:increase-nested-groups-te…
Browse files Browse the repository at this point in the history
…st-coverage, r=nikomatsakis

Increase test coverage of use_nested_groups

r? @nikomatsakis
  • Loading branch information
kennytm authored Jan 29, 2018
2 parents c4b1ee5 + 8389b66 commit 667f6df
Show file tree
Hide file tree
Showing 3 changed files with 42 additions and 0 deletions.
7 changes: 7 additions & 0 deletions src/test/run-pass/use-nested-groups.rs
Original file line number Diff line number Diff line change
Expand Up @@ -24,12 +24,19 @@ mod a {
}
}

// Test every possible part of the syntax
use a::{B, d::{self, *, g::H}};

// Test a more common use case
use std::sync::{Arc, atomic::{AtomicBool, Ordering}};

fn main() {
let _: B;
let _: E;
let _: F;
let _: H;
let _: d::g::I;

let _: Arc<AtomicBool>;
let _: Ordering;
}
27 changes: 27 additions & 0 deletions src/test/ui/use-nested-groups-error.rs
Original file line number Diff line number Diff line change
@@ -0,0 +1,27 @@
// Copyright 2018 The Rust Project Developers. See the COPYRIGHT
// file at the top-level directory of this distribution and at
// http://rust-lang.org/COPYRIGHT.
//
// Licensed under the Apache License, Version 2.0 <LICENSE-APACHE or
// http://www.apache.org/licenses/LICENSE-2.0> or the MIT license
// <LICENSE-MIT or http://opensource.org/licenses/MIT>, at your
// 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 {}
}

pub enum B2 {}
}

use a::{b1::{C1, C2}, B2};
//~^ ERROR unresolved import `a::b1::C1`

fn main() {
let _: C2;
let _: B2;
}
8 changes: 8 additions & 0 deletions src/test/ui/use-nested-groups-error.stderr
Original file line number Diff line number Diff line change
@@ -0,0 +1,8 @@
error[E0432]: unresolved import `a::b1::C1`
--> $DIR/use-nested-groups-error.rs:21:14
|
21 | use a::{b1::{C1, C2}, B2};
| ^^ no `C1` in `a::b1`. Did you mean to use `C2`?

error: aborting due to previous error

0 comments on commit 667f6df

Please sign in to comment.