diff options
| author | bors <bors@rust-lang.org> | 2019-07-19 00:24:39 +0000 |
|---|---|---|
| committer | bors <bors@rust-lang.org> | 2019-07-19 00:24:39 +0000 |
| commit | fe499a7b34dcb1fc054dd637ea561a19a268d2de (patch) | |
| tree | b4dbe1763cb8a971531e046b3a708e78dc2f6c26 /src/test/ui/span | |
| parent | a3369981deff35f1c8d9a29e99358593959bd06e (diff) | |
| parent | 1b4fbfca4181c6779b75a4a1dc6c8fd538d6edcc (diff) | |
| download | rust-fe499a7b34dcb1fc054dd637ea561a19a268d2de.tar.gz rust-fe499a7b34dcb1fc054dd637ea561a19a268d2de.zip | |
Auto merge of #62684 - petrochenkov:scopevisit, r=davidtwco
resolve: Improve candidate search for unresolved macro suggestions Use same scope visiting machinery for both collecting suggestion candidates and actually resolving the names. The PR is better read in per-commit fashion with whitespace changes ignored (the first commit in particular moves some code around). This should be the last pre-requisite for https://github.com/rust-lang/rust/pull/62086. r? @davidtwco
Diffstat (limited to 'src/test/ui/span')
| -rw-r--r-- | src/test/ui/span/issue-36530.rs | 7 | ||||
| -rw-r--r-- | src/test/ui/span/issue-36530.stderr | 22 |
2 files changed, 6 insertions, 23 deletions
diff --git a/src/test/ui/span/issue-36530.rs b/src/test/ui/span/issue-36530.rs index e11be9e17f2..14b2c8644e0 100644 --- a/src/test/ui/span/issue-36530.rs +++ b/src/test/ui/span/issue-36530.rs @@ -1,9 +1,10 @@ // gate-test-custom_inner_attributes -#[foo] //~ ERROR is currently unknown to the compiler +#![feature(custom_attribute)] + +#[foo] mod foo { - #![foo] //~ ERROR is currently unknown to the compiler - //~| ERROR non-builtin inner attributes are unstable + #![foo] //~ ERROR non-builtin inner attributes are unstable } fn main() {} diff --git a/src/test/ui/span/issue-36530.stderr b/src/test/ui/span/issue-36530.stderr index 65f03e756a2..c6b7895e65a 100644 --- a/src/test/ui/span/issue-36530.stderr +++ b/src/test/ui/span/issue-36530.stderr @@ -1,14 +1,5 @@ -error[E0658]: The attribute `foo` is currently unknown to the compiler and may have meaning added to it in the future - --> $DIR/issue-36530.rs:3:3 - | -LL | #[foo] - | ^^^ - | - = note: for more information, see https://github.com/rust-lang/rust/issues/29642 - = help: add `#![feature(custom_attribute)]` to the crate attributes to enable - error[E0658]: non-builtin inner attributes are unstable - --> $DIR/issue-36530.rs:5:5 + --> $DIR/issue-36530.rs:7:5 | LL | #![foo] | ^^^^^^^ @@ -16,15 +7,6 @@ LL | #![foo] = note: for more information, see https://github.com/rust-lang/rust/issues/54726 = help: add `#![feature(custom_inner_attributes)]` to the crate attributes to enable -error[E0658]: The attribute `foo` is currently unknown to the compiler and may have meaning added to it in the future - --> $DIR/issue-36530.rs:5:8 - | -LL | #![foo] - | ^^^ - | - = note: for more information, see https://github.com/rust-lang/rust/issues/29642 - = help: add `#![feature(custom_attribute)]` to the crate attributes to enable - -error: aborting due to 3 previous errors +error: aborting due to previous error For more information about this error, try `rustc --explain E0658`. |