Skip to content

Include rendered diagnostic in json - #46052

Merged
bors merged 4 commits into
rust-lang:masterfrom
oli-obk:rendered_diagnostics_in_json
Nov 21, 2017
Merged

Include rendered diagnostic in json#46052
bors merged 4 commits into
rust-lang:masterfrom
oli-obk:rendered_diagnostics_in_json

Conversation

@oli-obk

@oli-obkoli-obk commented Nov 17, 2017

Copy link
Copy Markdown
Contributor

@oli-obk

oli-obk commented Nov 17, 2017

Copy link
Copy Markdown
ContributorAuthor

This is the 4th box of #42823 (cc @nrc)

@kennytmkennytm added the S-waiting-on-review Status: Awaiting review from the assignee but also interested parties. label Nov 17, 2017
@oli-obk
oli-obkforce-pushed the rendered_diagnostics_in_json branch from 7aa1b0f to d5520fcCompareNovember 17, 2017 09:37
@oli-obk

oli-obk commented Nov 17, 2017

Copy link
Copy Markdown
ContributorAuthor

Currently checking whether src/test/parse-fail/bad-char-literals.rs also fails on master. It does fail even if compiled manually without --error-format json, so it seems unrelated to this PR except in that parse-fail generates json, and now the json additionally generates regular diagnostics.

@oli-obk

oli-obk commented Nov 17, 2017•
edited
Loading

Copy link
Copy Markdown
ContributorAuthor

Jup, happens on master but not on nightly...

edit: it happens with rustc built with debug-assertions. No idea how long we've had this issue, but it's fixed now.

petrochenkov
petrochenkov reviewed Nov 18, 2017
View reviewed changes
Comment threadsrc/libsyntax/json.rs Outdated

@petrochenkovpetrochenkovNov 18, 2017

Copy link
Copy Markdown
Contributor

Choose a reason for hiding this comment

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

To clarify, this is needed only because the interface of EmitterWriter::new requires it?

@oli-obkoli-obkNov 18, 2017

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.

Yes

petrochenkov
petrochenkov reviewed Nov 18, 2017
View reviewed changes
Comment threadsrc/libsyntax/json.rs Outdated

@petrochenkovpetrochenkovNov 18, 2017

Copy link
Copy Markdown
Contributor

Choose a reason for hiding this comment

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

Nit: unnecessary to_owned?

@oli-obkoli-obkNov 20, 2017

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.

jup, removed

petrochenkov
petrochenkov reviewed Nov 18, 2017
View reviewed changes
Comment threadsrc/tools/compiletest/src/runtest.rs Outdated

@petrochenkovpetrochenkovNov 18, 2017

Copy link
Copy Markdown
Contributor

Choose a reason for hiding this comment

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

Could you explain this in short? This text is going to be used as a whole without any preprocessing?

@oli-obkoli-obkNov 18, 2017

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.

We just want this so the json looks readable if suggestions contain multilines. As a side effect error explanations also become readable

@oli-obkoli-obkNov 20, 2017

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.

I added a comment explaining what's going on

@petrochenkov

petrochenkov commented Nov 18, 2017

Copy link
Copy Markdown
Contributor

r=me with questions answered

@petrochenkovpetrochenkov 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-review Status: Awaiting review from the assignee but also interested parties. labels Nov 18, 2017
@oli-obk
oli-obkforce-pushed the rendered_diagnostics_in_json branch from 8fbb47b to 3864d89CompareNovember 20, 2017 08:41
@petrochenkov

petrochenkov commented Nov 20, 2017

Copy link
Copy Markdown
Contributor

@bors r+

@bors

bors commented Nov 20, 2017

Copy link
Copy Markdown
Collaborator

📌 Commit 3864d89 has been approved by petrochenkov

@petrochenkovpetrochenkov 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 Nov 20, 2017
@oli-obk

oli-obk commented Nov 20, 2017

Copy link
Copy Markdown
ContributorAuthor

Sorry about that, the master branch has an empty line less in the error output with suggestions

@oli-obkoli-obk mentioned this pull request Nov 20, 2017
Merged
@nikomatsakis

nikomatsakis commented Nov 20, 2017

Copy link
Copy Markdown
Contributor

@bors r=petrochenkov

@bors

bors commented Nov 20, 2017

Copy link
Copy Markdown
Collaborator

📌 Commit e7b2702 has been approved by petrochenkov

@kennytmkennytm mentioned this pull request Nov 21, 2017
Closed
kennytm added a commit to kennytm/rust that referenced this pull request Nov 21, 2017
@kennytm
Rollup merge ofrust-lang#46052- oli-obk:rendered_diagnostics_in_jso…
0af67a4
…n, r=petrochenkov
Include rendered diagnostic in json
r? @petrochenkov
@kennytmkennytm mentioned this pull request Nov 21, 2017
Merged
bors added a commit that referenced this pull request Nov 21, 2017
@bors
Auto merge of#46166- kennytm:rollup, r=kennytm
63739ab
Rollup of 11 pull requests
- Successful merges: #45987, #46031, #46050, #46052, #46103, #46120, #46134, #46141, #46148, #46155, #46157
- Failed merges:
@bors
bors merged commit e7b2702 into rust-lang:masterNov 21, 2017
bors added a commit that referenced this pull request Nov 24, 2017
@bors
Auto merge of#46116- oli-obk:json_ui, r=nikomatsakis
cc8ceb0
Check //~ERROR comments in ui tests
r? @nikomatsakis
cc #44844@Phlosioneer@estebank@petrochenkov
this depends on #46052 getting merged first (the commits are included in here)
The relevant changes of this PR are c2f0af7 and 979269b
bors added a commit that referenced this pull request Nov 24, 2017
@bors
Auto merge of#46116- oli-obk:json_ui, r=nikomatsakis
71da1c2
Check //~ERROR comments in ui tests
r? @nikomatsakis
cc #44844@Phlosioneer@estebank@petrochenkov
this depends on #46052 getting merged first (the commits are included in here)
The relevant changes of this PR are c2f0af7 and 979269b
@oli-obk
oli-obk deleted the rendered_diagnostics_in_json branch December 8, 2017 15:49
@oli-obkoli-obk mentioned this pull request Jan 16, 2018
Closed
6 tasks
Sign up for freeto join this conversation on GitHub. Already have an account? Sign in to comment

Reviewers

@petrochenkovpetrochenkovpetrochenkov left review comments

Assignees

@petrochenkovpetrochenkov

Labels

S-waiting-on-borsStatus: 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

@oli-obk@petrochenkov@bors@nikomatsakis@kennytm