parser: Split `+=` into `+` and `=` where `+` is explicitly requested (such as generics) #51068

Crazycolorz5 · 2018-05-25T22:28:41Z

Added functions in tokens to check whether a token leads with +. Used them when parsing to allow for token splitting of += into + and =.
Fixes #47856

rust-highfive · 2018-05-25T22:28:50Z

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

michaelwoerister · 2018-05-28T08:22:18Z

r? @petrochenkov

petrochenkov · 2018-05-29T10:35:44Z

src/libsyntax/parse/parser.rs

+        }
+        else {
+                self.expected_tokens.push(TokenType::Token(token::BinOp(token::Plus)));
+                false


Formatting.

Sorry, I don't understand, Could you give a bit more detail as to what you mean by that?

I meant these lines are indented too much (8 spaces instead of 4).

petrochenkov · 2018-05-29T10:38:26Z

Could you add a test with snippet from #47856 to make sure it parses?
https://github.com/rust-lang/rust/blob/master/src/test/parse-fail/trait-object-trait-parens.rs can be used as an example.

petrochenkov · 2018-05-29T10:50:32Z

I've also changed the PR name into something more descriptive (it goes into git history after merge).

Crazycolorz5 · 2018-05-29T22:20:06Z

I added a snippet to the test folder. I hope I did that correctly, hahah...

petrochenkov · 2018-05-30T01:45:01Z

The test looks good
@bors r+

bors · 2018-05-30T01:45:02Z

📌 Commit aef5d17 has been approved by petrochenkov

bors · 2018-05-30T16:33:38Z

🔒 Merge conflict

Crazycolorz5 · 2018-06-01T13:53:34Z

Sorry for the delay. I've pushed a formatting change that you mentioned before. How do I resolve this merge conflict? @petrochenkov

kennytm · 2018-06-02T08:26:21Z

@Crazycolorz5 You could rebase on top of the latest master. Assuming this repository's remote name is upstream and your fork is self, you run the following in the command line:

git checkout master

git pull upstream master --ff-only

git checkout rust 

git rebase master 

# follow on-screen instruction to fix any merge conflict

git push self rust --force-with-lease

…mon.

…rison to Plus token.

Crazycolorz5 · 2018-06-05T02:26:13Z

All right, I've rebased it according to the above instructions.

petrochenkov · 2018-06-09T15:44:58Z

@bors r+

bors · 2018-06-09T15:44:59Z

📌 Commit 759a0e0 has been approved by petrochenkov

bors · 2018-06-09T17:46:42Z

⌛ Testing commit 759a0e0 with merge 61d8831...

parser: Split `+=` into `+` and `=` where `+` is explicitly requested (such as generics) Added functions in tokens to check whether a token leads with `+`. Used them when parsing to allow for token splitting of `+=` into `+` and `=`. Fixes #47856

bors · 2018-06-09T19:50:18Z

☀️ Test successful - status-appveyor, status-travis
Approved by: petrochenkov
Pushing 61d8831 to master...

rust-highfive assigned michaelwoerister May 25, 2018

rust-highfive added the S-waiting-on-review Status: Awaiting review from the assignee but also interested parties. label May 25, 2018

rust-highfive assigned petrochenkov and unassigned michaelwoerister May 28, 2018

petrochenkov reviewed May 29, 2018

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 May 29, 2018

petrochenkov changed the title ~~Fix Issue 47856~~ parser: Split += into + and = in generics May 29, 2018

Crazycolorz5 changed the title ~~parser: Split += into + and = in generics~~ parser: Split += into + and = where + is explicitly requested (such as generics) May 29, 2018

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-author Status: This is awaiting some action (such as code changes or more information) from the author. labels May 30, 2018

bors 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-bors Status: Waiting on bors to run and complete tests. Bors will change the label on completion. labels May 30, 2018

Crazycolorz5 added 6 commits June 4, 2018 22:25

Implemented eat_plus and used it in parsing parse_ty_param_bounds_com…

682033c

…mon.

Added is_like_plus to token, and used that in place of equality compa…

7a9ffa7

…rison to Plus token.

Tidy fixes.

a5dc83d

Fixed incorrect check_plus to token.is_like_plus.

812ace6

Added test case to make sure parsing of += is done correctly.

2d00e54

Fixed indentation error.

759a0e0

Crazycolorz5 force-pushed the pluseqsplitting branch from 85c98b5 to 759a0e0 Compare June 5, 2018 02:25

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 Jun 5, 2018

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 Jun 9, 2018

bors merged commit 759a0e0 into rust-lang:master Jun 9, 2018

bors mentioned this pull request Jun 9, 2018

crate-ify and delete unused code from syntax::parse #51265

Merged

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

parser: Split `+=` into `+` and `=` where `+` is explicitly requested (such as generics) #51068

parser: Split `+=` into `+` and `=` where `+` is explicitly requested (such as generics) #51068

Crazycolorz5 commented May 25, 2018

rust-highfive commented May 25, 2018

michaelwoerister commented May 28, 2018

petrochenkov May 29, 2018

Crazycolorz5 May 29, 2018

petrochenkov May 30, 2018

petrochenkov commented May 29, 2018

petrochenkov commented May 29, 2018

Crazycolorz5 commented May 29, 2018

petrochenkov commented May 30, 2018

bors commented May 30, 2018

bors commented May 30, 2018

Crazycolorz5 commented Jun 1, 2018

kennytm commented Jun 2, 2018

Crazycolorz5 commented Jun 5, 2018

petrochenkov commented Jun 9, 2018

bors commented Jun 9, 2018

bors commented Jun 9, 2018

bors commented Jun 9, 2018

parser: Split += into + and = where + is explicitly requested (such as generics) #51068

parser: Split += into + and = where + is explicitly requested (such as generics) #51068

Conversation

Crazycolorz5 commented May 25, 2018

rust-highfive commented May 25, 2018

michaelwoerister commented May 28, 2018

petrochenkov May 29, 2018

Choose a reason for hiding this comment

Crazycolorz5 May 29, 2018

Choose a reason for hiding this comment

petrochenkov May 30, 2018

Choose a reason for hiding this comment

petrochenkov commented May 29, 2018

petrochenkov commented May 29, 2018

Crazycolorz5 commented May 29, 2018

petrochenkov commented May 30, 2018

bors commented May 30, 2018

bors commented May 30, 2018

Crazycolorz5 commented Jun 1, 2018

kennytm commented Jun 2, 2018

Crazycolorz5 commented Jun 5, 2018

petrochenkov commented Jun 9, 2018

bors commented Jun 9, 2018

bors commented Jun 9, 2018

bors commented Jun 9, 2018

parser: Split `+=` into `+` and `=` where `+` is explicitly requested (such as generics) #51068

parser: Split `+=` into `+` and `=` where `+` is explicitly requested (such as generics) #51068