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

Increase spacing for suggestions in diagnostics #65773

Merged
merged 2 commits into from
Oct 26, 2019
Merged

Increase spacing for suggestions in diagnostics #65773

merged 2 commits into from
Oct 26, 2019

Conversation

estebank
Copy link
Contributor

Make the spacing between the code snippet and verbose structured
suggestions consistent with note and help messages.

r? @Centril

@estebank
Increase spacing for suggestions in diagnostics
0baf61b 
Make the spacing between the code snippet and verbose structured
suggestions consistent with note and help messages.
@rust-highfive rust-highfive added the S-waiting-on-review Status: Awaiting review from the assignee but also interested parties. label Oct 24, 2019
Centril
Centril reviewed Oct 24, 2019
View reviewed changes
src/librustc_errors/emitter.rs Outdated Show resolved Hide resolved
src/librustc_errors/emitter.rs Outdated Show resolved Hide resolved
@estebank
Copy link
Contributor Author

Pinging because this has high potential for bitrot due to extensive touching of stderr files.

@Centril
Copy link
Contributor

Centril commented Oct 26, 2019

@bors r+

@bors
Copy link
Contributor

bors commented Oct 26, 2019

📌 Commit 508d032 has been approved by Centril

@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 Oct 26, 2019
@bors
Copy link
Contributor

bors commented Oct 26, 2019

⌛ Testing commit 508d032 with merge f6799d1079c3203f1a8a08bfbddd6dc4c6ca7679...

@rust-highfive
Copy link
Collaborator

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. 
2019-10-26T07:14:49.4086574Z Chocolatey installed 0/1 packages. 1 packages failed.
2019-10-26T07:14:49.4087085Z  See the log for details (C:\ProgramData\chocolatey\logs\chocolatey.log).
2019-10-26T07:14:49.4091594Z 
2019-10-26T07:14:49.4095897Z Failures
2019-10-26T07:14:49.4104698Z  - msys2 (exited 1) - msys2 not installed. An error occurred during installation:
2019-10-26T07:14:49.4105276Z  The remote server returned an error: (503) Server Unavailable. Service Unavailable
2019-10-26T07:14:49.8732406Z 
2019-10-26T07:14:49.8821286Z ##[error]Bash exited with code '1'.
2019-10-26T07:14:49.9077846Z ##[section]Starting: Upload CPU usage statistics
2019-10-26T07:14:49.9201757Z ==============================================================================
2019-10-26T07:14:49.9201876Z Task         : Bash
2019-10-26T07:14:49.9201969Z Description  : Run a Bash script on macOS, Linux, or Windows
---
2019-10-26T07:14:50.2225540Z ========================== Starting Command Output ===========================
2019-10-26T07:14:50.2231853Z [command]"C:\Program Files\Git\bin\bash.exe" --noprofile --norc /d/a/_temp/767215e5-d024-48f7-a883-aedb6e16d401.sh
2019-10-26T07:14:50.2699432Z /d/a/_temp/767215e5-d024-48f7-a883-aedb6e16d401.sh: line 1: aws: command not found
2019-10-26T07:14:50.2741112Z 
2019-10-26T07:14:50.2762006Z ##[error]Bash exited with code '127'.
2019-10-26T07:14:50.2837297Z ##[section]Starting: Checkout
2019-10-26T07:14:50.2948097Z ==============================================================================
2019-10-26T07:14:50.2948197Z Task         : Get sources
2019-10-26T07:14:50.2948307Z Description  : Get sources from a repository. Supports Git, TfsVC, and SVN repositories.

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 Oct 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 Oct 26, 2019
@JohnTitor
Copy link
Member

It's a network error.
@bors retry

@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 Oct 26, 2019
Centril added a commit to Centril/rust that referenced this pull request Oct 26, 2019
@Centril
Rollup merge of rust-lang#65773 - estebank:sugg-whitespace, r=Centril
0aa7c6f 
Increase spacing for suggestions in diagnostics

Make the spacing between the code snippet and verbose structured
suggestions consistent with note and help messages.

r? @Centril
@Centril Centril mentioned this pull request Oct 26, 2019
Merged
bors added a commit that referenced this pull request Oct 26, 2019
@bors
Auto merge of #65845 - Centril:rollup-28jtjfc, r=Centril
46e6c53 
Rollup of 8 pull requests

Successful merges:

 - #65743 (rustc_typeck: don't record direct callees in generator_interior.)
 - #65761 (libsyntax: Enhance documentation of the AST module)
 - #65772 (Remove the last remaining READMEs)
 - #65773 (Increase spacing for suggestions in diagnostics)
 - #65791 (Adding doc on keyword continue)
 - #65824 (rustc: make DefPathData (and friends) Copy (now that it uses Symbol).)
 - #65828 (Derive Eq and Hash for SourceInfo again)
 - #65842 (Add more information on rustdoc search)

Failed merges:

 - #65825 (rustc: use IndexVec<DefIndex, T> instead of Vec<T>.)

r? @ghost
@bors bors merged commit 508d032 into rust-lang:master Oct 26, 2019
flip1995 added a commit to flip1995/rust-clippy that referenced this pull request Oct 26, 2019
@flip1995
Rustup to rust-lang/rust#65773
9e33a96
flip1995 added a commit to flip1995/rust-clippy that referenced this pull request Oct 26, 2019
@flip1995
Rustup to rust-lang/rust#65773
4a52dd6
bors added a commit to rust-lang/rust-clippy that referenced this pull request Oct 26, 2019
@bors
Auto merge of #4739 - flip1995:rustup, r=flip1995
66df92a 
Rustup to rust-lang/rust#65773

changelog: none
@estebank estebank deleted the sugg-whitespace branch November 9, 2023 05:18
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@Centril Centril Centril left review comments

Assignees

@Centril Centril

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.
5 participants
@estebank @Centril @bors @rust-highfive @JohnTitor