Remove semicolon note #46258

colinmarsh19 · 2017-11-25T15:43:07Z

In reference to issue #46186
r? @estebank

First time doing a pull request, if there are any suggestions on how to improve this please let me know.
@jjolly

Added note that specifies a semicolon should be removed after a given struct

rust-highfive · 2017-11-25T15:43:12Z

Thanks for the pull request, and welcome! The Rust team is excited to review your changes, and you should hear from @estebank (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.

kennytm · 2017-11-25T16:03:22Z

src/test/parse-fail/issue-46186.rs

+
+struct Struct {
+    a: usize,
+} //~ ERROR expected item, found ';'


Where is the ;? 🤔

Lol, good point. Forgot to copy that over

estebank

Looks good to me, a couple of nitpicks inline. r=me once they're taken care of.

estebank · 2017-11-25T16:52:20Z

src/test/parse-fail/issue-46186.rs

+}; //~ ERROR expected item, found ';'
+//~| NOTE consider removing the semicolon
+
+fn main() {}


Could you turn this into a ui test?

Should I go ahead and remove this file from parse-fail then?

estebank · 2017-11-25T17:00:17Z

src/libsyntax/parse/parser.rs

-            return Err(self.fatal(&format!("expected item, found `{}`", token_str)));
+            let mut err = self.fatal(&format!("expected item, found `{}`", token_str));
+            if token_str == ";" {
+                err.note("consider removing the semicolon");


change this into a span_suggestion_short(span, msg, "".to_string()), so that the output points at it and tools depending on the RLS can apply the change automatically.

colinmarsh19 · 2017-11-26T02:38:17Z

r? @estebank

Don't know why the builds are failing, I've tested them on my local branch and they seem to be working just fine. If you have any tips to help out lmk.

estebank · 2017-11-26T14:08:48Z

The complaint from the test was

[00:53:55] unexpected errors (from JSON output): [
[00:53:55]     Error {
[00:53:55]         line_num: 15,
[00:53:55]         kind: Some(
[00:53:55]             Error
[00:53:55]         ),
[00:53:55]         msg: "15:2: 15:3: expected item, found `;`"
[00:53:55]     }
[00:53:55] ]
[00:53:55] 
[00:53:55] not found errors (from test file): [
[00:53:55]     Error {
[00:53:55]         line_num: 15,
[00:53:55]         kind: Some(
[00:53:55]             Error
[00:53:55]         ),
[00:53:55]         msg: "expected item, found \';\'"
[00:53:55]     },
[00:53:55]     Error {
[00:53:55]         line_num: 15,
[00:53:55]         kind: Some(
[00:53:55]             Note
[00:53:55]         ),
[00:53:55]         msg: "consider removing the semicolon"
[00:53:55]     }

Which means that the suggestion wasn't being emitted and that there was a typo in the error message parsing. For the second, you can get away with keeping only the beginning of the text for it to match without having to worry about special characters.

estebank · 2017-11-26T20:39:56Z

@bors r+ rollup

bors · 2017-11-26T20:39:57Z

📌 Commit 096e698 has been approved by estebank

@estebank

Remove semicolon note In reference to issue rust-lang#46186 r? @estebank First time doing a pull request, if there are any suggestions on how to improve this please let me know. @jjolly

Rollup of 10 pull requests - Successful merges: #45506, #46174, #46231, #46240, #46249, #46258, #46262, #46275, #46282, #46285 - Failed merges:

Previously (issue rust-lang#46186, pull-request rust-lang#46258), a suggestion was added to remove the semicolon after we fail to parse an item, but issue rust-lang#51603 complains that it's still insufficiently obvious why. Let's add a note. Resolves rust-lang#51603.

clarify why we're suggesting removing semicolon after braced items Previously (issue #46186, pull-request #46258), a suggestion was added to remove the semicolon after we fail to parse an item, but issue #51603 complains that it's still insufficiently obvious why. Let's add a note. Resolves #51603.

colinmarsh19 added 2 commits November 25, 2017 08:38

Remove semicolon note

aabacf7

Added note that specifies a semicolon should be removed after a given struct

Test for issue #46186

ba40f5c

rust-highfive assigned estebank Nov 25, 2017

Fixed Err by passing "err"

306f4da

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

kennytm reviewed Nov 25, 2017

View reviewed changes

Added ;

8e60f72

estebank approved these changes Nov 25, 2017

View reviewed changes

kennytm 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 25, 2017

colinmarsh19 added 3 commits November 25, 2017 18:34

Changed from note to span_suggestion_short

3e8883e

UI test 46186

4779899

Added 46186 stderr

bbe4c85

Delete bad test file

50537e3

colinmarsh19 added 2 commits November 26, 2017 07:36

Added .rs extension

f6b80d4

Changed to correct quotes

096e698

kennytm added S-waiting-on-review Status: Awaiting review from the assignee but also interested parties. and removed S-waiting-on-author Status: This is awaiting some action (such as code changes or more information) from the author. labels Nov 26, 2017

estebank 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 26, 2017

kennytm mentioned this pull request Nov 27, 2017

Rollup of 10 pull requests #46312

Merged

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

Auto merge of #46312 - kennytm:rollup, r=kennytm

b087a99

Rollup of 10 pull requests - Successful merges: #45506, #46174, #46231, #46240, #46249, #46258, #46262, #46275, #46282, #46285 - Failed merges:

bors merged commit 096e698 into rust-lang:master Nov 28, 2017

colinmarsh19 mentioned this pull request Nov 28, 2017

Suggest removal of stray ; after struct definition #46186

Closed

zackmdavis mentioned this pull request Jun 30, 2018

clarify why we're suggesting removing semicolon after braced items #51955

Merged

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

Remove semicolon note #46258

Remove semicolon note #46258

colinmarsh19 commented Nov 25, 2017

rust-highfive commented Nov 25, 2017

kennytm Nov 25, 2017

colinmarsh19 Nov 25, 2017

estebank left a comment

estebank Nov 25, 2017

colinmarsh19 Nov 25, 2017

estebank Nov 25, 2017

colinmarsh19 commented Nov 26, 2017

estebank commented Nov 26, 2017

estebank commented Nov 26, 2017

bors commented Nov 26, 2017

Remove semicolon note #46258

Remove semicolon note #46258

Conversation

colinmarsh19 commented Nov 25, 2017

rust-highfive commented Nov 25, 2017

kennytm Nov 25, 2017

Choose a reason for hiding this comment

colinmarsh19 Nov 25, 2017

Choose a reason for hiding this comment

estebank left a comment

Choose a reason for hiding this comment

estebank Nov 25, 2017

Choose a reason for hiding this comment

colinmarsh19 Nov 25, 2017

Choose a reason for hiding this comment

estebank Nov 25, 2017

Choose a reason for hiding this comment

colinmarsh19 commented Nov 26, 2017

estebank commented Nov 26, 2017

estebank commented Nov 26, 2017

bors commented Nov 26, 2017