From: bors <bors@rust-lang.org>
Date: Wed, 13 Apr 2016 05:21:23 +0000 (-0700)
Subject: Auto merge of #32814 - jseyfried:improve_duplicate_glob_detection, r=nikomatsakis
X-Git-Url: https://git.lizzy.rs/?a=commitdiff_plain;h=4b71f8d1417423d933dfd4f74d5d4d167b85f77e;p=rust.git

Auto merge of #32814 - jseyfried:improve_duplicate_glob_detection, r=nikomatsakis

resolve: Improve duplicate glob detection

This fixes a bug introduced in #31726 in which we erroneously allow multiple imports of the same item under some circumstances.

More specifically, we erroneously allow a module that is in a cycle of glob re-exports to have other re-exports (besides the glob from the cycle).
For example,
```rust
pub fn f() {}
mod foo {
    pub use f; // (1) This defines `foo::f`.
    pub use bar::*; // (3) This also defines `foo::f`, which should be a duplicate error but is currently allowed.
}
mod bar {
    pub use foo::*; // (2) This defines `bar::f`.
}
```

A module in a glob re-export cycle can still have `pub` items after this PR. For example,
```rust
mod foo {
    pub fn f() {}; // (1) This defines `foo::f`.
    pub use bar::*; // (3) This is not a duplicate error since items shadow glob-imported re-exports (cf #31337).
}
mod bar {
    pub use foo::*; // (2) This defines `bar::f`.
}
```
r? @nikomatsakis
---

4b71f8d1417423d933dfd4f74d5d4d167b85f77e