diff options
| author | bors <bors@rust-lang.org> | 2018-09-09 21:00:55 +0000 |
|---|---|---|
| committer | bors <bors@rust-lang.org> | 2018-09-09 21:00:55 +0000 |
| commit | 2d4e34ca8bb1369f7e0eea4cb50e6faa0827a6e5 (patch) | |
| tree | 9e250b17aba2c7174bea5e7d7fb1a598da7e0ff2 /src/test/ui/error-codes | |
| parent | f50b7758f4dc85dc1c5e38258adaa94213ac6ed1 (diff) | |
| parent | 2dce3779bbc0353ff9fb544774417a851027fcab (diff) | |
| download | rust-2d4e34ca8bb1369f7e0eea4cb50e6faa0827a6e5.tar.gz rust-2d4e34ca8bb1369f7e0eea4cb50e6faa0827a6e5.zip | |
Auto merge of #53778 - petrochenkov:shadrelax2, r=nikomatsakis
resolve: Relax shadowing restrictions on macro-expanded macros Previously any macro-expanded macros weren't allowed to shadow macros from outer scopes. Now only "more macro-expanded" macros cannot shadow "less macro-expanded" macros. See comments to `fn may_appear_after` and added tests for more details and examples. The functional changes are a21f6f588fc28c97533130ae44a6957b579ab58c and 46dd365ce9ca0a6b8653849b80267763c542842a, other commits are refactorings.
Diffstat (limited to 'src/test/ui/error-codes')
| -rw-r--r-- | src/test/ui/error-codes/E0659.stderr | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/src/test/ui/error-codes/E0659.stderr b/src/test/ui/error-codes/E0659.stderr index 06176085b38..f168b7797ca 100644 --- a/src/test/ui/error-codes/E0659.stderr +++ b/src/test/ui/error-codes/E0659.stderr @@ -1,8 +1,8 @@ error[E0659]: `foo` is ambiguous - --> $DIR/E0659.rs:25:5 + --> $DIR/E0659.rs:25:15 | LL | collider::foo(); //~ ERROR E0659 - | ^^^^^^^^^^^^^ + | ^^^ ambiguous name | note: `foo` could refer to the name imported here --> $DIR/E0659.rs:20:13 |