user0/rust
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions
rust/src/test/ui/imports
History
bors d8371c61e6 Auto merge of #57199 - petrochenkov:ambig, r=estebank 
resolve: Simplify treatment of ambiguity errors

If we have a glob conflict like this
```rust
mod m1 { struct S; }
mod m2 { struct S; }

use m1::*;
use m2::*;
```
we treat it as a special "ambiguity item" that's not an error by itself, but produces an error when actually used.
```rust
use m1::*; // primary
use m2::*; // secondary

=>

ambiguity S(m1::S, m2::S);
```

Ambiguity items were *sometimes* treated as their primary items for error recovery, but pretty irregularly.

After this PR they are always treated as their primary items, except that
- If an ambiguity item is marked as used, then it still produces an error.
- Ambiguity items are still filtered away when exported to other crates (which is also a use in some sense).
2019-01-01 02:08:39 +00:00
..
auxiliary resolve: Simplify treatment of ambiguity errors 2018-12-29 19:26:29 +03:00
duplicate.rs resolve: Simplify treatment of ambiguity errors 2018-12-29 19:26:29 +03:00
duplicate.stderr resolve: Simplify treatment of ambiguity errors 2018-12-29 19:26:29 +03:00
extern-crate-self-fail.rs resolve: Support aliasing local crate root in extern prelude 2018-12-01 14:38:47 +03:00
extern-crate-self-fail.stderr resolve: Support aliasing local crate root in extern prelude 2018-12-01 14:38:47 +03:00
extern-crate-self-pass.rs resolve: Support aliasing local crate root in extern prelude 2018-12-01 14:38:47 +03:00
extern-prelude-extern-crate-absolute-expanded.rs Stabilize extern_crate_item_prelude 2018-11-21 01:27:23 +03:00
extern-prelude-extern-crate-cfg.rs Stabilize extern_crate_item_prelude 2018-11-21 01:27:23 +03:00
extern-prelude-extern-crate-fail.rs resolve: Avoid sentence breaks in diagnostics 2018-11-18 13:58:36 +03:00
extern-prelude-extern-crate-fail.stderr resolve: Avoid sentence breaks in diagnostics 2018-11-18 13:58:36 +03:00
extern-prelude-extern-crate-pass.rs Stabilize extern_crate_item_prelude 2018-11-21 01:27:23 +03:00
extern-prelude-extern-crate-restricted-shadowing.rs Add a couple more tests 2018-11-21 01:28:07 +03:00
extern-prelude-extern-crate-restricted-shadowing.stderr Add a couple more tests 2018-11-21 01:28:07 +03:00
extern-prelude-extern-crate-shadowing.rs Add a couple more tests 2018-11-21 01:28:07 +03:00
glob-conflict-cross-crate.rs resolve: Simplify treatment of ambiguity errors 2018-12-29 19:26:29 +03:00
glob-conflict-cross-crate.stderr resolve: Simplify treatment of ambiguity errors 2018-12-29 19:26:29 +03:00
glob-shadowing.rs Remove licenses 2018-12-25 21:08:33 -07:00
glob-shadowing.stderr Remove licenses 2018-12-25 21:08:33 -07:00
import-crate-var.rs Remove licenses 2018-12-25 21:08:33 -07:00
import-crate-var.stderr Remove licenses 2018-12-25 21:08:33 -07:00
import-from-missing.rs Remove licenses 2018-12-25 21:08:33 -07:00
import-from-missing.stderr Remove licenses 2018-12-25 21:08:33 -07:00
import-glob-0.rs Remove licenses 2018-12-25 21:08:33 -07:00
import-glob-0.stderr Remove licenses 2018-12-25 21:08:33 -07:00
import-glob-circular.rs Remove licenses 2018-12-25 21:08:33 -07:00
import-glob-circular.stderr Remove licenses 2018-12-25 21:08:33 -07:00
import-loop-2.rs Remove licenses 2018-12-25 21:08:33 -07:00
import-loop-2.stderr Remove licenses 2018-12-25 21:08:33 -07:00
import-loop.rs Remove licenses 2018-12-25 21:08:33 -07:00
import-loop.stderr Remove licenses 2018-12-25 21:08:33 -07:00
import-prefix-macro-1.rs Remove licenses 2018-12-25 21:08:33 -07:00
import-prefix-macro-1.stderr Remove licenses 2018-12-25 21:08:33 -07:00
import-prefix-macro-2.rs Remove licenses 2018-12-25 21:08:33 -07:00
import-prefix-macro-2.stderr Remove licenses 2018-12-25 21:08:33 -07:00
import-trait-method.rs Remove licenses 2018-12-25 21:08:33 -07:00
import-trait-method.stderr Remove licenses 2018-12-25 21:08:33 -07:00
issue-53140.rs Remove licenses 2018-12-25 21:08:33 -07:00
issue-53269.rs Remove licenses 2018-12-25 21:08:33 -07:00
issue-53269.stderr Remove licenses 2018-12-25 21:08:33 -07:00
issue-53512.rs Remove licenses 2018-12-25 21:08:33 -07:00
issue-53512.stderr Remove licenses 2018-12-25 21:08:33 -07:00
issue-55457.rs resolve: Fix ICE in macro import error recovery 2018-10-30 00:21:39 +03:00
issue-55457.stderr Fix rebase 2018-11-18 14:41:06 +03:00
issue-55811.rs resolve: Make "empty import canaries" invisible from other crates 2018-11-21 03:59:25 +03:00
issue-55884-1.rs Add a couple more tests + address review comments 2018-11-18 13:58:40 +03:00
issue-55884-1.stderr Add a couple more tests + address review comments 2018-11-18 13:58:40 +03:00
issue-55884-2.rs Add a couple more tests + address review comments 2018-11-18 13:58:40 +03:00
issue-55884-2.stderr Add a couple more tests + address review comments 2018-11-18 13:58:40 +03:00
issue-56125.rs resolve: Reduce some clutter in import ambiguity errors 2018-12-08 04:19:29 +03:00
issue-56125.stderr resolve: Never override real bindings with Def::Errs from error recovery 2018-12-29 03:04:25 +03:00
issue-56263.rs resolve: Extern prelude is for type namespace only 2018-11-27 14:35:36 +03:00
issue-57015.rs resolve: Never override real bindings with Def::Errs from error recovery 2018-12-29 03:04:25 +03:00
issue-57015.stderr resolve: Never override real bindings with Def::Errs from error recovery 2018-12-29 03:04:25 +03:00
local-modularized-tricky-fail-1.rs Remove licenses 2018-12-25 21:08:33 -07:00
local-modularized-tricky-fail-1.stderr Remove licenses 2018-12-25 21:08:33 -07:00
local-modularized-tricky-fail-2.rs Remove licenses 2018-12-25 21:08:33 -07:00
local-modularized-tricky-fail-2.stderr Update references to closed issue 2018-12-27 16:49:12 -08:00
local-modularized-tricky-fail-3.rs Remove licenses 2018-12-25 21:08:33 -07:00
local-modularized-tricky-fail-3.stderr Remove licenses 2018-12-25 21:08:33 -07:00
local-modularized-tricky-pass.rs Remove licenses 2018-12-25 21:08:33 -07:00
local-modularized.rs Remove licenses 2018-12-25 21:08:33 -07:00
macro-paths.rs Remove licenses 2018-12-25 21:08:33 -07:00
macro-paths.stderr Remove licenses 2018-12-25 21:08:33 -07:00
macros.rs Remove licenses 2018-12-25 21:08:33 -07:00
macros.stderr Remove licenses 2018-12-25 21:08:33 -07:00
reexports.rs Remove licenses 2018-12-25 21:08:33 -07:00
reexports.stderr Remove licenses 2018-12-25 21:08:33 -07:00
rfc-1560-warning-cycle.rs Remove licenses 2018-12-25 21:08:33 -07:00
rfc-1560-warning-cycle.stderr Remove licenses 2018-12-25 21:08:33 -07:00
shadow_builtin_macros.rs Remove licenses 2018-12-25 21:08:33 -07:00
shadow_builtin_macros.stderr Remove licenses 2018-12-25 21:08:33 -07:00
unused-macro-use.rs Remove licenses 2018-12-25 21:08:33 -07:00
unused-macro-use.stderr Remove licenses 2018-12-25 21:08:33 -07:00
unused.rs Remove licenses 2018-12-25 21:08:33 -07:00
unused.stderr Remove licenses 2018-12-25 21:08:33 -07:00