forked from rust-lang/rust
-
Notifications
You must be signed in to change notification settings - Fork 0
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
Rollup merge of rust-lang#72233 - dtolnay:literal, r=petrochenkov
Fix {:#?} representation of proc_macro::Literal
Before:
```rust
TokenStream [
Ident {
ident: "name",
span: #0 bytes(37..41),
},
Punct {
ch: '=',
spacing: Alone,
span: #0 bytes(42..43),
},
Literal { lit: Lit { kind: Str, symbol: "SNPP", suffix: None }, span: Span { lo: BytePos(44), hi: BytePos(50), ctxt: #0 } },
Punct {
ch: ',',
spacing: Alone,
span: #0 bytes(50..51),
},
Ident {
ident: "owner",
span: #0 bytes(56..61),
},
Punct {
ch: '=',
spacing: Alone,
span: #0 bytes(62..63),
},
Literal { lit: Lit { kind: Str, symbol: "Canary M Burns", suffix: None }, span: Span { lo: BytePos(64), hi: BytePos(80), ctxt: #0 } },
]
```
After:
```rust
TokenStream [
Ident {
ident: "name",
span: #0 bytes(37..41),
},
Punct {
ch: '=',
spacing: Alone,
span: #0 bytes(42..43),
},
Literal {
kind: Str,
symbol: "SNPP",
suffix: None,
span: #0 bytes(44..50),
},
Punct {
ch: ',',
spacing: Alone,
span: #0 bytes(50..51),
},
Ident {
ident: "owner",
span: #0 bytes(56..61),
},
Punct {
ch: '=',
spacing: Alone,
span: #0 bytes(62..63),
},
Literal {
kind: Str,
symbol: "Canary M Burns",
suffix: None,
span: #0 bytes(64..80),
},
]
```- Loading branch information
Showing
8 changed files
with
241 additions
and
9 deletions.
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
2 changes: 1 addition & 1 deletion
2
src/test/ui/lint/redundant-semicolon/redundant-semi-proc-macro.stderr
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
15 changes: 15 additions & 0 deletions
15
src/test/ui/proc-macro/debug/auxiliary/macro-dump-debug.rs
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,15 @@ | ||
| // force-host | ||
| // no-prefer-dynamic | ||
|
|
||
| #![crate_type = "proc-macro"] | ||
| #![crate_name = "macro_dump_debug"] | ||
|
|
||
| extern crate proc_macro; | ||
| use proc_macro::TokenStream; | ||
|
|
||
| #[proc_macro] | ||
| pub fn dump_debug(tokens: TokenStream) -> TokenStream { | ||
| eprintln!("{:?}", tokens); | ||
| eprintln!("{:#?}", tokens); | ||
| TokenStream::new() | ||
| } |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,40 @@ | ||
| // run-pass | ||
| // aux-build:macro-dump-debug.rs | ||
|
|
||
| extern crate macro_dump_debug; | ||
| use macro_dump_debug::dump_debug; | ||
|
|
||
| dump_debug! { | ||
| ident // ident | ||
| r#ident // raw ident | ||
| , // alone punct | ||
| ==> // joint punct | ||
| () // empty group | ||
| [_] // nonempty group | ||
|
|
||
| // unsuffixed literals | ||
| 0 | ||
| 1.0 | ||
| "S" | ||
| b"B" | ||
| r"R" | ||
| r##"R"## | ||
| br"BR" | ||
| br##"BR"## | ||
| 'C' | ||
| b'B' | ||
|
|
||
| // suffixed literals | ||
| 0q | ||
| 1.0q | ||
| "S"q | ||
| b"B"q | ||
| r"R"q | ||
| r##"R"##q | ||
| br"BR"q | ||
| br##"BR"##q | ||
| 'C'q | ||
| b'B'q | ||
| } | ||
|
|
||
| fn main() {} |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,166 @@ | ||
| TokenStream [Ident { ident: "ident", span: #0 bytes(130..135) }, Ident { ident: "r#ident", span: #0 bytes(151..158) }, Punct { ch: ',', spacing: Alone, span: #0 bytes(176..177) }, Punct { ch: '=', spacing: Joint, span: #0 bytes(203..205) }, Punct { ch: '=', spacing: Joint, span: #0 bytes(203..205) }, Punct { ch: '>', spacing: Alone, span: #0 bytes(205..206) }, Group { delimiter: Parenthesis, stream: TokenStream [], span: #0 bytes(230..232) }, Group { delimiter: Bracket, stream: TokenStream [Ident { ident: "_", span: #0 bytes(258..259) }], span: #0 bytes(257..260) }, Literal { kind: Integer, symbol: "0", suffix: None, span: #0 bytes(315..316) }, Literal { kind: Float, symbol: "1.0", suffix: None, span: #0 bytes(321..324) }, Literal { kind: Str, symbol: "S", suffix: None, span: #0 bytes(329..332) }, Literal { kind: ByteStr, symbol: "B", suffix: None, span: #0 bytes(337..341) }, Literal { kind: StrRaw(0), symbol: "R", suffix: None, span: #0 bytes(346..350) }, Literal { kind: StrRaw(2), symbol: "R", suffix: None, span: #0 bytes(355..363) }, Literal { kind: ByteStrRaw(0), symbol: "BR", suffix: None, span: #0 bytes(368..374) }, Literal { kind: ByteStrRaw(2), symbol: "BR", suffix: None, span: #0 bytes(379..389) }, Literal { kind: Char, symbol: "C", suffix: None, span: #0 bytes(394..397) }, Literal { kind: Byte, symbol: "B", suffix: None, span: #0 bytes(402..406) }, Literal { kind: Integer, symbol: "0", suffix: Some("q"), span: #0 bytes(437..439) }, Literal { kind: Float, symbol: "1.0", suffix: Some("q"), span: #0 bytes(444..448) }, Literal { kind: Str, symbol: "S", suffix: Some("q"), span: #0 bytes(453..457) }, Literal { kind: ByteStr, symbol: "B", suffix: Some("q"), span: #0 bytes(462..467) }, Literal { kind: StrRaw(0), symbol: "R", suffix: Some("q"), span: #0 bytes(472..477) }, Literal { kind: StrRaw(2), symbol: "R", suffix: Some("q"), span: #0 bytes(482..491) }, Literal { kind: ByteStrRaw(0), symbol: "BR", suffix: Some("q"), span: #0 bytes(496..503) }, Literal { kind: ByteStrRaw(2), symbol: "BR", suffix: Some("q"), span: #0 bytes(508..519) }, Literal { kind: Char, symbol: "C", suffix: Some("q"), span: #0 bytes(524..528) }, Literal { kind: Byte, symbol: "B", suffix: Some("q"), span: #0 bytes(533..538) }] | ||
| TokenStream [ | ||
| Ident { | ||
| ident: "ident", | ||
| span: #0 bytes(130..135), | ||
| }, | ||
| Ident { | ||
| ident: "r#ident", | ||
| span: #0 bytes(151..158), | ||
| }, | ||
| Punct { | ||
| ch: ',', | ||
| spacing: Alone, | ||
| span: #0 bytes(176..177), | ||
| }, | ||
| Punct { | ||
| ch: '=', | ||
| spacing: Joint, | ||
| span: #0 bytes(203..205), | ||
| }, | ||
| Punct { | ||
| ch: '=', | ||
| spacing: Joint, | ||
| span: #0 bytes(203..205), | ||
| }, | ||
| Punct { | ||
| ch: '>', | ||
| spacing: Alone, | ||
| span: #0 bytes(205..206), | ||
| }, | ||
| Group { | ||
| delimiter: Parenthesis, | ||
| stream: TokenStream [], | ||
| span: #0 bytes(230..232), | ||
| }, | ||
| Group { | ||
| delimiter: Bracket, | ||
| stream: TokenStream [ | ||
| Ident { | ||
| ident: "_", | ||
| span: #0 bytes(258..259), | ||
| }, | ||
| ], | ||
| span: #0 bytes(257..260), | ||
| }, | ||
| Literal { | ||
| kind: Integer, | ||
| symbol: "0", | ||
| suffix: None, | ||
| span: #0 bytes(315..316), | ||
| }, | ||
| Literal { | ||
| kind: Float, | ||
| symbol: "1.0", | ||
| suffix: None, | ||
| span: #0 bytes(321..324), | ||
| }, | ||
| Literal { | ||
| kind: Str, | ||
| symbol: "S", | ||
| suffix: None, | ||
| span: #0 bytes(329..332), | ||
| }, | ||
| Literal { | ||
| kind: ByteStr, | ||
| symbol: "B", | ||
| suffix: None, | ||
| span: #0 bytes(337..341), | ||
| }, | ||
| Literal { | ||
| kind: StrRaw(0), | ||
| symbol: "R", | ||
| suffix: None, | ||
| span: #0 bytes(346..350), | ||
| }, | ||
| Literal { | ||
| kind: StrRaw(2), | ||
| symbol: "R", | ||
| suffix: None, | ||
| span: #0 bytes(355..363), | ||
| }, | ||
| Literal { | ||
| kind: ByteStrRaw(0), | ||
| symbol: "BR", | ||
| suffix: None, | ||
| span: #0 bytes(368..374), | ||
| }, | ||
| Literal { | ||
| kind: ByteStrRaw(2), | ||
| symbol: "BR", | ||
| suffix: None, | ||
| span: #0 bytes(379..389), | ||
| }, | ||
| Literal { | ||
| kind: Char, | ||
| symbol: "C", | ||
| suffix: None, | ||
| span: #0 bytes(394..397), | ||
| }, | ||
| Literal { | ||
| kind: Byte, | ||
| symbol: "B", | ||
| suffix: None, | ||
| span: #0 bytes(402..406), | ||
| }, | ||
| Literal { | ||
| kind: Integer, | ||
| symbol: "0", | ||
| suffix: Some("q"), | ||
| span: #0 bytes(437..439), | ||
| }, | ||
| Literal { | ||
| kind: Float, | ||
| symbol: "1.0", | ||
| suffix: Some("q"), | ||
| span: #0 bytes(444..448), | ||
| }, | ||
| Literal { | ||
| kind: Str, | ||
| symbol: "S", | ||
| suffix: Some("q"), | ||
| span: #0 bytes(453..457), | ||
| }, | ||
| Literal { | ||
| kind: ByteStr, | ||
| symbol: "B", | ||
| suffix: Some("q"), | ||
| span: #0 bytes(462..467), | ||
| }, | ||
| Literal { | ||
| kind: StrRaw(0), | ||
| symbol: "R", | ||
| suffix: Some("q"), | ||
| span: #0 bytes(472..477), | ||
| }, | ||
| Literal { | ||
| kind: StrRaw(2), | ||
| symbol: "R", | ||
| suffix: Some("q"), | ||
| span: #0 bytes(482..491), | ||
| }, | ||
| Literal { | ||
| kind: ByteStrRaw(0), | ||
| symbol: "BR", | ||
| suffix: Some("q"), | ||
| span: #0 bytes(496..503), | ||
| }, | ||
| Literal { | ||
| kind: ByteStrRaw(2), | ||
| symbol: "BR", | ||
| suffix: Some("q"), | ||
| span: #0 bytes(508..519), | ||
| }, | ||
| Literal { | ||
| kind: Char, | ||
| symbol: "C", | ||
| suffix: Some("q"), | ||
| span: #0 bytes(524..528), | ||
| }, | ||
| Literal { | ||
| kind: Byte, | ||
| symbol: "B", | ||
| suffix: Some("q"), | ||
| span: #0 bytes(533..538), | ||
| }, | ||
| ] |