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.

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

Jump to bottom

Draw vertical lines correctly in compiler error messages #66589

Merged
merged 1 commit into from
Nov 30, 2019
Merged

Draw vertical lines correctly in compiler error messages #66589

merged 1 commit into from
Nov 30, 2019

Conversation

TheSamsa
Copy link
Contributor

@TheSamsa TheSamsa commented Nov 20, 2019 •
edited
Loading

... with multiline annotations correctly when non-1space unicode characters are to the left

For this we use the correct calculation of the 'left' identation

closes #66552

@rust-highfive
Copy link
Collaborator

Thanks for the pull request, and welcome! The Rust team is excited to review your changes, and you should hear from @matthewjasper (or someone else) soon.

If any changes to this PR are deemed necessary, please add them as extra commits. This ensures that the reviewer can see what has changed since they last reviewed the code. Due to the way GitHub handles out-of-date commits, this should also make it reasonably obvious what issues have or haven't been addressed. Large or tricky changes may require several passes of review and changes.

Please see the contribution instructions for more information.

@rust-highfive rust-highfive added the S-waiting-on-review Status: Awaiting review from the assignee but also interested parties. label Nov 20, 2019
@TheSamsa TheSamsa changed the title Draw vertical lines in compiler error messages with multiline annotat… Draw vertical lines correctly in compiler error messages Nov 20, 2019
@matthewjasper
Copy link
Contributor

r? @estebank

@estebank
Copy link
Contributor

@bors r+

@bors
Copy link
Contributor

bors commented Nov 25, 2019

📌 Commit a49f1c83871b569a75e7b6ff6f1c1ba03d9b5657 has been approved by estebank

@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 Nov 25, 2019
@bors
Copy link
Contributor

bors commented Nov 25, 2019

⌛ Testing commit a49f1c83871b569a75e7b6ff6f1c1ba03d9b5657 with merge 38f2034a26310e699a413f603377bbdc3dcde826...

@rust-highfive

This comment has been minimized.

Sign in to view
@bors
Copy link
Contributor

bors commented Nov 25, 2019

💔 Test failed - checks-azure

@bors bors added S-waiting-on-review Status: Awaiting review from the assignee but also interested parties. and removed S-waiting-on-bors Status: Waiting on bors to run and complete tests. Bors will change the label on completion. labels Nov 25, 2019
@estebank
Copy link
Contributor

Can you rebase against latest master and rerun ./x.py test src/test/ui --stage 1 --bless?

@TheSamsa
Copy link
Contributor Author

of course, as soon as get home today

@rust-highfive

This comment has been minimized.

Sign in to view
@estebank
Copy link
Contributor

@bors r+

@bors
Copy link
Contributor

bors commented Nov 25, 2019

📌 Commit 41c8133332db2703da9a4158cc05063e5329780a has been approved by estebank

@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 Nov 25, 2019
@bors
Copy link
Contributor

bors commented Nov 26, 2019

⌛ Testing commit 41c8133332db2703da9a4158cc05063e5329780a with merge 4a92dc67536dbebe16b8d22f3c4b86de2c57f960...

@rust-highfive
Copy link
Collaborator

The job i686-apple of your PR failed (pretty log, raw log). Through arcane magic we have determined that the following fragments from the build log may contain information about the problem.

Click to expand the log.

I'm a bot! I can only do what humans tell me to, so if this was not helpful or you have suggestions for improvements, please ping or otherwise contact @TimNN. (Feature Requests)

@bors
Copy link
Contributor

bors commented Nov 26, 2019

💔 Test failed - checks-azure

@bors bors added S-waiting-on-review Status: Awaiting review from the assignee but also interested parties. and removed S-waiting-on-bors Status: Waiting on bors to run and complete tests. Bors will change the label on completion. labels Nov 26, 2019
@TheSamsa
Copy link
Contributor Author

r? @estebank

@TheSamsa
Copy link
Contributor Author

TheSamsa commented Nov 27, 2019 •
edited
Loading

I am not sure why it failed in bors build, somehow the downloads in the pipe did not work

but I rebased again as before

@TheSamsa
Draw vertical lines in compiler error messages with multiline annotat…
59d7391 
…ions correctly when non-1space unicode characters are to the left

For this we use the correct calculation of the 'left' identation
@Dylan-DPC-zz
Copy link

@bors r+ rollup

@bors
Copy link
Contributor

bors commented Nov 29, 2019

📌 Commit 59d7391 has been approved by Dylan-DPC

@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 Nov 29, 2019
RalfJung added a commit to RalfJung/rust that referenced this pull request Nov 29, 2019
@RalfJung
Rollup merge of rust-lang#66589 - TheSamsa:master, r=Dylan-DPC
7b75a36 
Draw vertical lines correctly in compiler error messages

... with multiline annotations correctly when non-1space unicode characters are to the left

For this we use the correct calculation of the 'left' identation

closes rust-lang#66552
@RalfJung RalfJung mentioned this pull request Nov 29, 2019
Merged
bors added a commit that referenced this pull request Nov 29, 2019
@bors
Auto merge of #66879 - RalfJung:rollup-nprxpzi, r=RalfJung
9081929 
Rollup of 11 pull requests

Successful merges:

 - #66379 (Rephrase docs in for ptr)
 - #66589 (Draw vertical lines correctly in compiler error messages)
 - #66613 (Allow customising ty::TraitRef's printing behavior)
 - #66766 (Panic machinery comments and tweaks)
 - #66791 (Handle GlobalCtxt directly from librustc_interface query system)
 - #66793 (Record temporary static references in generator witnesses)
 - #66808 (Cleanup error code)
 - #66826 (Clarifies how to tag users for assigning PRs)
 - #66837 (Clarify `{f32,f64}::EPSILON` docs)
 - #66844 (Miri: do not consider memory allocated by caller_location leaked)
 - #66872 (Minor documentation fix)

Failed merges:

r? @ghost
@bors bors merged commit 59d7391 into rust-lang:master Nov 30, 2019
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers
No reviews
Assignees

@estebank estebank

Labels
S-waiting-on-bors Status: Waiting on bors to run and complete tests. Bors will change the label on completion.
Projects
None yet
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.

Account for unicode char width when calculating vertical label lines
6 participants
@TheSamsa @rust-highfive @matthewjasper @estebank @bors @Dylan-DPC-zz