Skip to content
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.

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

Fix #35829 (quote!() does not handle br#"…"#) #41961

Merged
merged 1 commit into from
May 17, 2017

Conversation

kennytm
Copy link
Member

@kennytm kennytm commented May 12, 2017

Fix issue #35829 (syntax extension's quote_expr!() does not handle b"…" and proc_macro's quote!() does not handle r#"…"#)

  • Handles b"…", br#"…"# and ... for quote_expr!().
  • Refactored the match statement to allow it to complain loudly on any unhandled token.
  • Similarly, proc_macro's quote!() did not handle br#"…"# or r#"…"#, so this PR fixes it too.

@rust-highfive
Copy link
Collaborator

r? @pnkfelix

(rust_highfive has picked a reviewer for you, use r? to override)

@kennytm kennytm changed the title Fix #35829 (syntax extension's quote!() does not handle b"…") [WIP — test failed] Fix #35829 (syntax extension's quote!() does not handle b"…") May 12, 2017
@petrochenkov
Copy link
Contributor

ext/quote part LGTM, nice cleanup as well.
From the Travis error it looks like proc_macro's quote is affected after all.

@kennytm
Copy link
Member Author

kennytm commented May 13, 2017

Turns out I've added the test to the wrong file 😂. Will fix proc_macro as well. @petrochenkov

…le b"…")

* Handles `b"…"`, `br#"…"#` and `...` for `quote_expr!()`.
* Refactored the match statement to allow it to complain loudly on any
  unhandled token.
* Similarly, proc_macro's `quote!()` did not handle `br#"…"#` or `r#"…"#`,
  so this commit fixes it too.
@kennytm kennytm changed the title [WIP — test failed] Fix #35829 (syntax extension's quote!() does not handle b"…") Fix #35829 (quote!() does not handle br#"…"#) May 13, 2017
@kennytm
Copy link
Member Author

kennytm commented May 13, 2017

proc_macro also fixed; Travis passed @petrochenkov

@Mark-Simulacrum Mark-Simulacrum added the S-waiting-on-review Status: Awaiting review from the assignee but also interested parties. label May 14, 2017
@arielb1
Copy link
Contributor

arielb1 commented May 16, 2017

ping @petrochenkov for review

@petrochenkov
Copy link
Contributor

@bors r+

@bors
Copy link
Contributor

bors commented May 17, 2017

📌 Commit 115854e has been approved by petrochenkov

@bors
Copy link
Contributor

bors commented May 17, 2017

⌛ Testing commit 115854e with merge 208d23a...

bors added a commit that referenced this pull request May 17, 2017
Fix #35829 (`quote!()` does not handle `br#"…"#`)

Fix issue #35829 (syntax extension's `quote_expr!()` does not handle `b"…"` and proc_macro's `quote!()` does not handle `r#"…"#`)

* Handles `b"…"`, `br#"…"#` and `...` for `quote_expr!()`.
* Refactored the match statement to allow it to complain loudly on any unhandled token.
* Similarly, proc_macro's `quote!()` did not handle `br#"…"#` or `r#"…"#`, so this PR fixes it too.
@bors
Copy link
Contributor

bors commented May 17, 2017

☀️ Test successful - status-appveyor, status-travis
Approved by: petrochenkov
Pushing 208d23a to master...

@bors bors merged commit 115854e into rust-lang:master May 17, 2017
@kennytm kennytm deleted the fix-35829 branch May 17, 2017 10:59
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
S-waiting-on-review Status: Awaiting review from the assignee but also interested parties.
Projects
None yet
Development

Successfully merging this pull request may close these issues.

7 participants