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 pretty-printing for raw identifiers #49369

Merged
merged 1 commit into from
Mar 28, 2018
Merged

Conversation

petrochenkov
Copy link
Contributor

No description provided.

@rust-highfive
Copy link
Collaborator

r? @pnkfelix

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

@rust-highfive rust-highfive added the S-waiting-on-review Status: Awaiting review from the assignee but also interested parties. label Mar 25, 2018
@petrochenkov
Copy link
Contributor Author

r? @oli-obk

@oli-obk
Copy link
Contributor

oli-obk commented Mar 26, 2018

@bors r+

@bors
Copy link
Contributor

bors commented Mar 26, 2018

📌 Commit ac54e85 has been approved by oli-obk

@bors bors added S-waiting-on-bors Status: Waiting on bors to run and complete tests. Bors will change the label on completion. and removed S-waiting-on-review Status: Awaiting review from the assignee but also interested parties. labels Mar 26, 2018
kennytm added a commit to kennytm/rust that referenced this pull request Mar 26, 2018
Fix pretty-printing for raw identifiers
@TimNN
Copy link
Contributor

TimNN commented Mar 26, 2018

@bors r-

This seems to cause some issues with macros.

https://travis-ci.org/rust-lang/rust/jobs/358366565 from #49374, example:

[01:04:01] ---- [pretty] run-pass/borrowck/two-phase-bin-ops.rs stdout ----
[01:04:01] 	
[01:04:01] error in revision `lxl`: pretty-printing failed in round 1 revision Some("lxl")
[01:04:01] status: exit code: 101
[01:04:01] command: "/checkout/obj/build/x86_64-unknown-linux-gnu/stage2/bin/rustc" "-" "-Z" "unpretty=normal" "--target" "x86_64-unknown-linux-gnu" "-L" "/checkout/obj/build/x86_64-unknown-linux-gnu/test/run-pass/borrowck/two-phase-bin-ops.stage2-x86_64-unknown-linux-gnu.pretty.aux" "-Crpath" "-O" "-Zmiri" "-Zunstable-options" "-Lnative=/checkout/obj/build/x86_64-unknown-linux-gnu/native/rust-test-helpers"
[01:04:01] stdout:
[01:04:01] ------------------------------------------
[01:04:01] 
[01:04:01] ------------------------------------------
[01:04:01] stderr:
[01:04:01] ------------------------------------------
[01:04:01] error: found invalid character; only `#` is allowed in raw string delimitation: (
[01:04:01]   --> <anon>:25:16
[01:04:01]    |
[01:04:01] 25 | trivial_binop! r#(AddAssign , add_assign);

@bors bors added S-waiting-on-author Status: This is awaiting some action (such as code changes or more information) from the author. and removed S-waiting-on-bors Status: Waiting on bors to run and complete tests. Bors will change the label on completion. labels Mar 26, 2018
@petrochenkov
Copy link
Contributor Author

55 failed tests

O_O
I'll look what happens.

@petrochenkov
Copy link
Contributor Author

@bors r=oli-obk

@bors
Copy link
Contributor

bors commented Mar 26, 2018

📌 Commit a637dd0 has been approved by oli-obk

@bors bors added S-waiting-on-bors Status: Waiting on bors to run and complete tests. Bors will change the label on completion. and removed S-waiting-on-author Status: This is awaiting some action (such as code changes or more information) from the author. labels Mar 26, 2018
kennytm added a commit to kennytm/rust that referenced this pull request Mar 27, 2018
Fix pretty-printing for raw identifiers
bors added a commit that referenced this pull request Mar 27, 2018
Rollup of 11 pull requests

- Successful merges: #48639, #49223, #49333, #49369, #49381, #49395, #49399, #49401, #49417, #49202, #49426
- Failed merges:
bors added a commit that referenced this pull request Mar 28, 2018
Rollup of 11 pull requests

- Successful merges: #48639, #49223, #49333, #49369, #49381, #49395, #49399, #49401, #49417, #49202, #49426
- Failed merges:
@bors bors merged commit a637dd0 into rust-lang:master Mar 28, 2018
@petrochenkov petrochenkov deleted the rprint branch June 5, 2019 16:01
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
S-waiting-on-bors Status: Waiting on bors to run and complete tests. Bors will change the label on completion.
Projects
None yet
Development

Successfully merging this pull request may close these issues.

6 participants