Skip to content

macros: improve the TokenStream quoter - #40532

Merged
bors merged 1 commit into
rust-lang:masterfrom
jseyfried:improve_tokenstream_quoter
Mar 20, 2017
Merged

macros: improve the TokenStream quoter#40532
bors merged 1 commit into
rust-lang:masterfrom
jseyfried:improve_tokenstream_quoter

Conversation

@jseyfried

@jseyfriedjseyfried commented Mar 14, 2017•
edited
Loading

Copy link
Copy Markdown
Contributor

This PR

  • renames the TokenStream quoter from qquote! to quote!,
  • uses $ instead of unquote (e.g. let toks: TokenStream = ...; quote!([$toks])),
  • allows unquoting Tokens as well as TokenTrees and TokenStreams (fixestoken quote should be able to unquote a single token #39746), and
  • to preserve syntactic space, requires that $ be followed by
    • a single identifier to unquote, or
    • another $ to produce a literal $.

r? @nrc

@jseyfriedjseyfried changed the title Improve the TokenStream quoter.macros: improve the TokenStream quoterMar 14, 2017
nrc
nrc approved these changes Mar 15, 2017
View reviewed changes

@nrcnrc left a comment

Copy link
Copy Markdown
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Is there any clash between this quote! macro and the AST quote! macro? I don't recall if that is magically in the global namespace or anything.

r=me if not and with the $$ doc

Comment threadsrc/test/run-pass-fulldeps/auxiliary/hello_macro.rs Outdated

@nrcnrcMar 15, 2017

Copy link
Copy Markdown
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Could you document this in the doc comments for the quote module please?

@jseyfriedjseyfriedMar 15, 2017•
edited
Loading

Copy link
Copy Markdown
ContributorAuthor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Done.

@jseyfried

jseyfried commented Mar 15, 2017

Copy link
Copy Markdown
ContributorAuthor

@nrc None of the AST quoters are named quote.

@jseyfried
jseyfriedforce-pushed the improve_tokenstream_quoter branch from 0769c60 to ce616a7CompareMarch 15, 2017 23:05
@jseyfried

jseyfried commented Mar 15, 2017

Copy link
Copy Markdown
ContributorAuthor

@bors r=nrc

@bors

bors commented Mar 15, 2017

Copy link
Copy Markdown
Collaborator

📌 Commit ce616a7 has been approved by nrc

frewsxcv added a commit to frewsxcv/rust that referenced this pull request Mar 17, 2017
@frewsxcv
Rollup merge ofrust-lang#40532- jseyfried:improve_tokenstream_quote…
8db0914
…r, r=nrc
macros: improve the `TokenStream` quoter
This PR
- renames the `TokenStream` quoter from `qquote!` to `quote!`,
- uses `$` instead of `unquote` (e.g. `let toks: TokenStream = ...; quote!([$toks])`),
- allows unquoting `Token`s as well as `TokenTree`s and `TokenStream`s (fixesrust-lang#39746), and
- to preserve syntactic space, requires that `$` be followed by
- a single identifier to unquote, or
- another `$` to produce a literal `$`.
r? @nrc
@frewsxcvfrewsxcv mentioned this pull request Mar 17, 2017
Closed
arielb1 pushed a commit to arielb1/rust that referenced this pull request Mar 18, 2017
Ariel Ben-Yehuda
Rollup merge ofrust-lang#40532- jseyfried:improve_tokenstream_quote…
663409b
…r, r=nrc
macros: improve the `TokenStream` quoter
This PR
- renames the `TokenStream` quoter from `qquote!` to `quote!`,
- uses `$` instead of `unquote` (e.g. `let toks: TokenStream = ...; quote!([$toks])`),
- allows unquoting `Token`s as well as `TokenTree`s and `TokenStream`s (fixesrust-lang#39746), and
- to preserve syntactic space, requires that `$` be followed by
- a single identifier to unquote, or
- another `$` to produce a literal `$`.
r? @nrc
@arielb1arielb1 mentioned this pull request Mar 18, 2017
Closed
bors added a commit that referenced this pull request Mar 18, 2017
@bors
Auto merge of#40644- arielb1:rollup, r=arielb1
1d565ef
Rollup of 22 pull requests
- Successful merges: #40241, #40346, #40348, #40377, #40398, #40409, #40441, #40445, #40509, #40521, #40523, #40532, #40538, #40564, #40581, #40583, #40588, #40589, #40590, #40603, #40611, #40621
- Failed merges: #40501, #40541
@arielb1arielb1 mentioned this pull request Mar 19, 2017
Closed
arielb1 pushed a commit to arielb1/rust that referenced this pull request Mar 19, 2017
Ariel Ben-Yehuda
Rollup merge ofrust-lang#40532- jseyfried:improve_tokenstream_quote…
584f1b6
…r, r=nrc
macros: improve the `TokenStream` quoter
This PR
- renames the `TokenStream` quoter from `qquote!` to `quote!`,
- uses `$` instead of `unquote` (e.g. `let toks: TokenStream = ...; quote!([$toks])`),
- allows unquoting `Token`s as well as `TokenTree`s and `TokenStream`s (fixesrust-lang#39746), and
- to preserve syntactic space, requires that `$` be followed by
- a single identifier to unquote, or
- another `$` to produce a literal `$`.
r? @nrc
@frewsxcvfrewsxcv mentioned this pull request Mar 19, 2017
Closed
frewsxcv added a commit to frewsxcv/rust that referenced this pull request Mar 20, 2017
@frewsxcv
Rollup merge ofrust-lang#40532- jseyfried:improve_tokenstream_quote…
7471d97
…r, r=nrc
macros: improve the `TokenStream` quoter
This PR
- renames the `TokenStream` quoter from `qquote!` to `quote!`,
- uses `$` instead of `unquote` (e.g. `let toks: TokenStream = ...; quote!([$toks])`),
- allows unquoting `Token`s as well as `TokenTree`s and `TokenStream`s (fixesrust-lang#39746), and
- to preserve syntactic space, requires that `$` be followed by
- a single identifier to unquote, or
- another `$` to produce a literal `$`.
r? @nrc
@frewsxcvfrewsxcv mentioned this pull request Mar 20, 2017
Merged
bors added a commit that referenced this pull request Mar 20, 2017
@bors
Auto merge of#40659- frewsxcv:rollup, r=frewsxcv
244f893
Rollup of 9 pull requests
- Successful merges: #40241, #40281, #40398, #40521, #40532, #40554, #40566, #40581, #40587
- Failed merges:
@bors
bors merged commit ce616a7 into rust-lang:masterMar 20, 2017
Sign up for freeto join this conversation on GitHub. Already have an account? Sign in to comment

Reviewers

1 more reviewer
@nrcnrcnrc approved these changes
Reviewers whose approvals may not affect merge requirements

Assignees

@nrcnrc

Labels

None yet

Projects

None yet

Milestone

No milestone

Development

Successfully merging this pull request may close these issues.

token quote should be able to unquote a single token

3 participants

@jseyfried@bors@nrc