Include rendered diagnostic in json by oli-obk · Pull Request #46052 · rust-lang/rust

oli-obk · 2017-11-17T07:57:29Z

oli-obk · 2017-11-17T08:00:57Z

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

oli-obk · 2017-11-17T12:04:53Z

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 · 2017-11-17T12:29:10Z

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 · 2017-11-18T19:38:29Z

src/libsyntax/json.rs

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

petrochenkov · 2017-11-18T19:39:03Z

src/libsyntax/json.rs

Nit: unnecessary to_owned?

jup, removed

petrochenkov · 2017-11-18T19:41:22Z

src/tools/compiletest/src/runtest.rs

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

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

I added a comment explaining what's going on

petrochenkov · 2017-11-18T19:41:56Z

r=me with questions answered

petrochenkov · 2017-11-20T09:10:41Z

@bors r+

bors · 2017-11-20T09:10:42Z

📌 Commit 3864d89 has been approved by petrochenkov

oli-obk · 2017-11-20T11:43:30Z

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

nikomatsakis · 2017-11-20T16:00:37Z

@bors r=petrochenkov

bors · 2017-11-20T16:00:38Z

📌 Commit e7b2702 has been approved by petrochenkov

@petrochenkov

…n, r=petrochenkov Include rendered diagnostic in json r? @petrochenkov

Rollup of 11 pull requests - Successful merges: #45987, #46031, #46050, #46052, #46103, #46120, #46134, #46141, #46148, #46155, #46157 - Failed merges:

@nikomatsakis

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

@nikomatsakis

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

rust-highfive assigned petrochenkov Nov 17, 2017

kennytm added the S-waiting-on-review Status: Awaiting review from the assignee but also interested parties. label Nov 17, 2017

oli-obk force-pushed the rendered_diagnostics_in_json branch from 7aa1b0f to d5520fc Compare November 17, 2017 09:37

petrochenkov reviewed Nov 18, 2017

View reviewed changes

petrochenkov 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 added 3 commits November 20, 2017 09:37

Include rendered diagnostic in json

78e269e

The end of a span can be *before* the first char in a line

ddaf523

Address PR comments

3864d89

oli-obk force-pushed the rendered_diagnostics_in_json branch from 8fbb47b to 3864d89 Compare November 20, 2017 08:41

petrochenkov 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

Update ui test to rustc master

e7b2702

oli-obk mentioned this pull request Nov 20, 2017

Check //~ERROR comments in ui tests #46116

Merged

kennytm mentioned this pull request Nov 21, 2017

Rollup of 11 pull requests #46153

Closed

kennytm added a commit to kennytm/rust that referenced this pull request Nov 21, 2017

Rollup merge of rust-lang#46052 - oli-obk:rendered_diagnostics_in_jso…

0af67a4

…n, r=petrochenkov Include rendered diagnostic in json r? @petrochenkov

kennytm mentioned this pull request Nov 21, 2017

Rollup of 11 pull requests #46166

Merged

bors added a commit that referenced this pull request Nov 21, 2017

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 merged commit e7b2702 into rust-lang:master Nov 21, 2017

oli-obk deleted the rendered_diagnostics_in_json branch December 8, 2017 15:49

oli-obk mentioned this pull request Jan 16, 2018

Tracking issue: improve error messages for IDEs #42823

Closed

6 tasks

Uh oh!

Conversation

oli-obk commented Nov 17, 2017

Uh oh!

oli-obk commented Nov 17, 2017

Uh oh!

oli-obk commented Nov 17, 2017

Uh oh!

oli-obk commented Nov 17, 2017 • edited Loading Uh oh! There was an error while loading. Please reload this page.

Uh oh!

Uh oh!

petrochenkov Nov 18, 2017

Choose a reason for hiding this comment

Uh oh!

oli-obk Nov 18, 2017

Choose a reason for hiding this comment

Uh oh!

petrochenkov Nov 18, 2017

Choose a reason for hiding this comment

Uh oh!

oli-obk Nov 20, 2017

Choose a reason for hiding this comment

Uh oh!

petrochenkov Nov 18, 2017

Choose a reason for hiding this comment

Uh oh!

oli-obk Nov 18, 2017

Choose a reason for hiding this comment

Uh oh!

oli-obk Nov 20, 2017

Choose a reason for hiding this comment

Uh oh!

petrochenkov commented Nov 18, 2017

Uh oh!

petrochenkov commented Nov 20, 2017

Uh oh!

bors commented Nov 20, 2017

Uh oh!

oli-obk commented Nov 20, 2017

Uh oh!

nikomatsakis commented Nov 20, 2017

Uh oh!

bors commented Nov 20, 2017

Uh oh!

Reviewers

Assignees

Labels

Projects

Milestone

Development

Uh oh!

5 participants

oli-obk commented Nov 17, 2017 •

edited

Loading