diff options
| author | Vadim Petrochenkov <vadim.petrochenkov@gmail.com> | 2018-12-28 00:31:28 +0300 |
|---|---|---|
| committer | Vadim Petrochenkov <vadim.petrochenkov@gmail.com> | 2018-12-28 00:44:47 +0300 |
| commit | e40d7d9643b810b2bc62f279e1d6f4ad68a35bc2 (patch) | |
| tree | fa910b36cf72542f9a427860865c05471c4b4ee4 /src/test/ui/proc-macro | |
| parent | 24af9f88a5555120eadc7897be7eeaa7c8e1f9af (diff) | |
| download | rust-e40d7d9643b810b2bc62f279e1d6f4ad68a35bc2.tar.gz rust-e40d7d9643b810b2bc62f279e1d6f4ad68a35bc2.zip | |
Resolve `$crate`s for pretty-printing at more appropriate time
Diffstat (limited to 'src/test/ui/proc-macro')
| -rw-r--r-- | src/test/ui/proc-macro/dollar-crate-issue-57089.rs | 3 | ||||
| -rw-r--r-- | src/test/ui/proc-macro/dollar-crate-issue-57089.stderr | 11 | ||||
| -rw-r--r-- | src/test/ui/proc-macro/dollar-crate-issue-57089.stdout | 25 |
3 files changed, 12 insertions, 27 deletions
diff --git a/src/test/ui/proc-macro/dollar-crate-issue-57089.rs b/src/test/ui/proc-macro/dollar-crate-issue-57089.rs index c38b2782cd6..2d54c07ff95 100644 --- a/src/test/ui/proc-macro/dollar-crate-issue-57089.rs +++ b/src/test/ui/proc-macro/dollar-crate-issue-57089.rs @@ -1,3 +1,4 @@ +// compile-pass // edition:2018 // aux-build:dollar-crate.rs @@ -15,7 +16,7 @@ macro_rules! m { struct M($crate::S); } - #[dollar_crate::a] //~ ERROR expected type, found `$` + #[dollar_crate::a] struct A($crate::S); }; } diff --git a/src/test/ui/proc-macro/dollar-crate-issue-57089.stderr b/src/test/ui/proc-macro/dollar-crate-issue-57089.stderr deleted file mode 100644 index f82cf22a9ce..00000000000 --- a/src/test/ui/proc-macro/dollar-crate-issue-57089.stderr +++ /dev/null @@ -1,11 +0,0 @@ -error: expected type, found `$` - --> $DIR/dollar-crate-in-tokens.rs:18:9 - | -LL | #[dollar_crate::a] //~ ERROR expected type, found `$` - | ^^^^^^^^^^^^^^^^^^ -... -LL | m!(); - | ----- in this macro invocation - -error: aborting due to previous error - diff --git a/src/test/ui/proc-macro/dollar-crate-issue-57089.stdout b/src/test/ui/proc-macro/dollar-crate-issue-57089.stdout index f599a7f45b1..09340988c89 100644 --- a/src/test/ui/proc-macro/dollar-crate-issue-57089.stdout +++ b/src/test/ui/proc-macro/dollar-crate-issue-57089.stdout @@ -38,48 +38,43 @@ PROC MACRO INPUT: TokenStream [ span: #2 bytes(LO..HI) } ] -ATTRIBUTE INPUT (PRETTY-PRINTED): struct A($crate::S); +ATTRIBUTE INPUT (PRETTY-PRINTED): struct A(crate::S); ATTRIBUTE INPUT: TokenStream [ Ident { ident: "struct", - span: #0 bytes(0..0) + span: #2 bytes(LO..HI) }, Ident { ident: "A", - span: #0 bytes(0..0) + span: #2 bytes(LO..HI) }, Group { delimiter: Parenthesis, stream: TokenStream [ - Punct { - ch: '$', - spacing: Alone, - span: #0 bytes(0..0) - }, Ident { - ident: "crate", - span: #0 bytes(0..0) + ident: "$crate", + span: #2 bytes(LO..HI) }, Punct { ch: ':', spacing: Joint, - span: #0 bytes(0..0) + span: #2 bytes(LO..HI) }, Punct { ch: ':', spacing: Alone, - span: #0 bytes(0..0) + span: #2 bytes(LO..HI) }, Ident { ident: "S", - span: #0 bytes(0..0) + span: #2 bytes(LO..HI) } ], - span: #0 bytes(0..0) + span: #2 bytes(LO..HI) }, Punct { ch: ';', spacing: Alone, - span: #0 bytes(0..0) + span: #2 bytes(LO..HI) } ] |