user0/rust
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions
rust/src
History
bors 4b71f8d141 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
2016-04-12 22:21:23 -07:00
..
bootstrap tidy: Add a check to ensure Cargo.toml is in sync 2016-04-12 15:55:14 -07:00
build_helper whoops 2016-04-04 21:14:15 +10:00
compiler-rt@57315f7e07 update compiler-rt submodule 2016-03-15 22:32:38 -05:00
compiletest Auto merge of #32803 - eddyb:mir-debuginfo, r=nikomatsakis 2016-04-12 19:22:32 -07:00
doc Add data race to concurrency docs 2016-04-08 10:33:31 -05:00
driver
etc rustbuild: Migrate tidy checks to Rust 2016-04-12 08:17:42 -07:00
grammar
jemalloc@aab1c0a0e0 std: Update jemalloc again to the 4.* track 2016-03-04 09:49:39 -08:00
liballoc Rollup merge of #32741 - tbu-:pr_remove_fixme_12808, r=bluss 2016-04-07 23:26:19 +05:30
liballoc_jemalloc Prefix jemalloc on DragonFly to prevent segfaults. 2016-04-02 18:40:59 +02:00
liballoc_system bootstrap: Add a bunch of Cargo.toml files 2016-02-11 11:12:32 -08:00
libarena std: Clean out deprecated APIs 2016-03-12 12:31:13 -08:00
libbacktrace Minor spelling fixes 2016-02-09 11:52:39 -05:00
libcollections std: Stabilize APIs for the 1.9 release 2016-04-11 08:57:53 -07:00
libcollectionstest std: Stabilize APIs for the 1.9 release 2016-04-11 08:57:53 -07:00
libcore Auto merge of #32804 - alexcrichton:stabilize-1.9, r=brson 2016-04-12 04:17:36 -07:00
libcoretest std: Stabilize APIs for the 1.9 release 2016-04-11 08:57:53 -07:00
libflate std: Clean out deprecated APIs 2016-03-12 12:31:13 -08:00
libfmt_macros bootstrap: Add a bunch of Cargo.toml files 2016-02-11 11:12:32 -08:00
libgetopts std: Stabilize APIs for the 1.9 release 2016-04-11 08:57:53 -07:00
libgraphviz sprinkle feature gates here and there 2016-03-22 22:02:47 -05:00
liblibc@7265c17d18 std: Fix linking against signal on Android 2016-04-04 21:54:59 -07:00
liblog bootstrap: Add a bunch of Cargo.toml files 2016-02-11 11:12:32 -08:00
librand std: Clean out deprecated APIs 2016-03-12 12:31:13 -08:00
librbml std: Stabilize APIs for the 1.9 release 2016-04-11 08:57:53 -07:00
librustc Auto merge of #32803 - eddyb:mir-debuginfo, r=nikomatsakis 2016-04-12 19:22:32 -07:00
librustc_back Auto merge of #32804 - alexcrichton:stabilize-1.9, r=brson 2016-04-12 04:17:36 -07:00
librustc_bitflags rustbuild: Sync some Cargo.toml/lib.rs dependencies 2016-02-21 09:49:13 -08:00
librustc_borrowck rustc: move middle::{def,def_id,pat_util} to hir. 2016-04-06 09:14:21 +03:00
librustc_const_eval rustc: move middle::{def,def_id,pat_util} to hir. 2016-04-06 09:14:21 +03:00
librustc_const_math move const_eval and check_match out of librustc 2016-03-30 13:43:36 +02:00
librustc_data_structures Use a BitVector instead of Vec<bool> for recording cleanup blocks 2016-04-03 14:58:34 +12:00
librustc_driver Auto merge of #32811 - alexcrichton:check-lints, r=nrc 2016-04-12 07:14:55 -07:00
librustc_incremental rustbuild: Migrate tidy checks to Rust 2016-04-12 08:17:42 -07:00
librustc_lint std: Stabilize APIs for the 1.9 release 2016-04-11 08:57:53 -07:00
librustc_llvm Use weak_odr linkage when reusing definitions across codegen units 2016-03-29 16:44:54 +02:00
librustc_metadata Auto merge of #32016 - nikomatsakis:incr-comp-save, r=mw 2016-04-07 10:55:37 -07:00
librustc_mir mir: store the span of a scope in the ScopeData. 2016-04-11 20:49:07 +03:00
librustc_passes rustc: move middle::{def,def_id,pat_util} to hir. 2016-04-06 09:14:21 +03:00
librustc_platform_intrinsics rustc_platform_intrinsics: remove unused rustc dependency. 2016-03-29 19:36:01 +03:00
librustc_plugin rustc: move rustc_front to rustc::hir. 2016-04-06 09:01:55 +03:00
librustc_privacy Improve PrivateItemsInPublicInterfacesVisitor 2016-04-07 04:33:14 +00:00
librustc_resolve Auto merge of #32814 - jseyfried:improve_duplicate_glob_detection, r=nikomatsakis 2016-04-12 22:21:23 -07:00
librustc_save_analysis Rollup merge of #32570 - eddyb:tis-but-a-front, r=nikomatsakis 2016-04-06 17:31:16 +05:30
librustc_trans trans: initial implementation of MIR debuginfo. 2016-04-11 20:51:45 +03:00
librustc_typeck Auto merge of #32811 - alexcrichton:check-lints, r=nrc 2016-04-12 07:14:55 -07:00
librustc_unicode std: Stabilize APIs for the 1.9 release 2016-04-11 08:57:53 -07:00
librustdoc Auto merge of #32804 - alexcrichton:stabilize-1.9, r=brson 2016-04-12 04:17:36 -07:00
libserialize std: Stabilize APIs for the 1.9 release 2016-04-11 08:57:53 -07:00
libstd Auto merge of #31963 - barosl:rename-doc, r=alexcrichton 2016-04-12 10:12:55 -07:00
libsyntax Auto merge of #32804 - alexcrichton:stabilize-1.9, r=brson 2016-04-12 04:17:36 -07:00
libsyntax_ext std: Stabilize APIs for the 1.9 release 2016-04-11 08:57:53 -07:00
libterm term: undo conversion of user defined try!s 2016-03-22 22:03:19 -05:00
libtest avoid "==" in assert! when one of the values is a bool 2016-04-06 06:24:19 +02:00
llvm@25c7dc3703 Update LLVM to include a backport to restore AA performance 2016-03-18 15:51:17 +01:00
rt Handle integer-extending for C ABI 2016-04-04 22:14:10 +02:00
rtstartup Revert "workarounds to make link guards work on windows" 2016-03-25 14:07:20 -04:00
rust-installer@c37d3747da
rustc tidy: Add a check to ensure Cargo.toml is in sync 2016-04-12 15:55:14 -07:00
rustllvm Use weak_odr linkage when reusing definitions across codegen units 2016-03-29 16:44:54 +02:00
test Auto merge of #32814 - jseyfried:improve_duplicate_glob_detection, r=nikomatsakis 2016-04-12 22:21:23 -07:00
tools tidy: Add a check to ensure Cargo.toml is in sync 2016-04-12 15:55:14 -07:00
nightlies.txt Update snapshots to 2016-03-18 (235d774). 2016-03-20 22:37:35 +02:00
snapshots.txt Rollup merge of #32685 - dhuseby:add_freebsd_i686_snapshot_4d3eebf, r=alexcrichton 2016-04-05 16:43:21 +05:30