Thanks to visit codestin.com
Credit goes to github.com

Skip to content

Fix pretty-printing of $crate (take 4) #62393

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 4 commits into from
Jul 10, 2019
Merged

Fix pretty-printing of $crate (take 4) #62393

Show file tree
Hide file tree
Changes from 1 commit
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
7aaf0de
Add a test for `$crate` inside macro invocation
petrochenkov Jul 3, 2019
4344a90
Pretty-print `$crate` as `crate`/`::my_crate` in tokens
petrochenkov Jul 3, 2019
3997507
Resolve `$crate` in all hygienic contexts for pretty-pringing
petrochenkov Jul 5, 2019
4cb67c0
Add a test case with `$crate` from other crate
petrochenkov Jul 9, 2019
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Prev Previous commit
Add a test case with $crate from other crate
  • Loading branch information
@petrochenkov
petrochenkov committed Jul 9, 2019
commit 4cb67c0f1c429a1a1e2ec8c3e02714557feeb60d
6 changes: 6 additions & 0 deletions src/test/ui/proc-macro/auxiliary/dollar-crate-external.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -14,3 +14,9 @@ macro_rules! external {
struct D($crate::S);
};
}

#[macro_export]
macro_rules! issue_62325 { () => {
#[print_attr]
struct B(identity!($crate::S));
}}
4 changes: 4 additions & 0 deletions src/test/ui/proc-macro/dollar-crate-issue-62325.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,7 @@
// check-pass
// edition:2018
// aux-build:test-macros.rs
// aux-build:dollar-crate-external.rs

// Anonymize unstable non-dummy spans while still showing dummy spans `0..0`.
// normalize-stdout-test "bytes\([^0]\w*\.\.(\w+)\)" -> "bytes(LO..$1)"
Expand All @@ -10,6 +11,7 @@

#[macro_use]
extern crate test_macros;
extern crate dollar_crate_external;

type S = u8;

Expand All @@ -20,4 +22,6 @@ macro_rules! m { () => {

m!();

dollar_crate_external::issue_62325!();

fn main() {}
56 changes: 56 additions & 0 deletions src/test/ui/proc-macro/dollar-crate-issue-62325.stdout
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -54,3 +54,59 @@ PRINT-ATTR INPUT (DEBUG): TokenStream [
span: #2 bytes(LO..HI),
},
]
PRINT-ATTR INPUT (DISPLAY): struct B(identity!(::dollar_crate_external :: S));
PRINT-ATTR RE-COLLECTED (DISPLAY): struct B ( identity ! ( ::dollar_crate_external :: S ) ) ;
PRINT-ATTR INPUT (DEBUG): TokenStream [
Ident {
ident: "struct",
span: #7 bytes(LO..HI),
},
Ident {
ident: "B",
span: #7 bytes(LO..HI),
},
Group {
delimiter: Parenthesis,
stream: TokenStream [
Ident {
ident: "identity",
span: #7 bytes(LO..HI),
},
Punct {
ch: '!',
spacing: Alone,
span: #7 bytes(LO..HI),
},
Group {
delimiter: Parenthesis,
stream: TokenStream [
Ident {
ident: "$crate",
span: #7 bytes(LO..HI),
},
Punct {
ch: ':',
spacing: Joint,
span: #7 bytes(LO..HI),
},
Punct {
ch: ':',
spacing: Alone,
span: #7 bytes(LO..HI),
},
Ident {
ident: "S",
span: #7 bytes(LO..HI),
},
],
span: #7 bytes(LO..HI),
},
],
span: #7 bytes(LO..HI),
},
Punct {
ch: ';',
spacing: Alone,
span: #7 bytes(LO..HI),
},
]