Skip to content

if- and while-let-chains, take 2 - edition changes#53854

Merged
bors merged 3 commits intorust-lang:masterfrom
davidtwco:issue-53668
Sep 10, 2018
Merged

if- and while-let-chains, take 2 - edition changes#53854
bors merged 3 commits intorust-lang:masterfrom
davidtwco:issue-53668

Conversation

@davidtwco
Copy link
Member

@davidtwco davidtwco commented Aug 31, 2018 •
edited
Loading

Part of #53668.

r? @nikomatsakis

@davidtwco
Added warning/error for if-let-chain ambiguity.
2ce56c5 
With eRFC 2497, previously accepted ambigious syntax regarding use of
`&&` and `||` in if-let and while-let statements should now warn
or error depending on the edition.

This commit takes a naive approach to detecting ambigious use of `&&`
or `||` and will probably need fine tuned to handle all cases.
@rust-highfive rust-highfive added the S-waiting-on-review Status: Awaiting review from the assignee but also interested parties. label Aug 31, 2018
nikomatsakis
nikomatsakis requested changes Aug 31, 2018
View reviewed changes
@nikomatsakis
Copy link
Contributor

nikomatsakis commented Aug 31, 2018

cc @Centril -- so do you feel there is no need for a crater run here, given @SergioBenitez's testing?

@Centril
Copy link
Contributor

Centril commented Aug 31, 2018 •
edited
Loading

@nikomatsakis afair @SergioBenitez's testing was some time ago, so if we have the time for crater (we do right?) it could still be better safe than sorry to do a crater run; but I would also add that I don't feel strongly either way.

zackmdavis
zackmdavis reviewed Sep 2, 2018
View reviewed changes
zackmdavis
zackmdavis reviewed Sep 2, 2018
View reviewed changes
@rust-highfive

This comment has been minimized.

Sign in to view
@davidtwco
Copy link
Member Author

davidtwco commented Sep 2, 2018

Oops, forgot to update the test output. Thought I'd forgot something. 🤦‍♂️

@nikomatsakis
Copy link
Contributor

nikomatsakis commented Sep 4, 2018

@bors try

@bors
Copy link
Collaborator

bors commented Sep 4, 2018

⌛ Trying commit 8c92cbe with merge 51ff957df5095d92d1d3d4682207ee8b7ad408a8...

@bors
Copy link
Collaborator

bors commented Sep 4, 2018

☀️ Test successful - status-travis
State: approved= try=True

@nikomatsakis
Copy link
Contributor

nikomatsakis commented Sep 5, 2018

@craterbot run start=master#1c2e17f4e3a2070a7f703f51e29c1c388ef703b6 end=try#51ff957df5095d92d1d3d4682207ee8b7ad408a8 mode=check-only

@craterbot
Copy link
Collaborator

craterbot commented Sep 5, 2018

👌 Experiment pr-53854 created and queued.

ℹ️ Crater is a tool to run experiments across parts of the Rust ecosystem. Learn more

@craterbot craterbot added S-waiting-on-crater Status: Waiting on a crater run to be completed. and removed S-waiting-on-review Status: Awaiting review from the assignee but also interested parties. labels Sep 5, 2018
@craterbot
Copy link
Collaborator

craterbot commented Sep 5, 2018

🚧 Experiment pr-53854 is now running on agent aws-2.

ℹ️ Crater is a tool to run experiments across parts of the Rust ecosystem. Learn more

@craterbot
Copy link
Collaborator

craterbot commented Sep 6, 2018

🎉 Experiment pr-53854 is completed!
📰 Open the full report.

⚠️ If you notice any spurious failure please add them to the blacklist!
ℹ️ Crater is a tool to run experiments across parts of the Rust ecosystem. Learn more

@craterbot craterbot added S-waiting-on-review Status: Awaiting review from the assignee but also interested parties. and removed S-waiting-on-crater Status: Waiting on a crater run to be completed. labels Sep 6, 2018
@Centril
Copy link
Contributor

Centril commented Sep 6, 2018

The good news is that crater found zero real regressions :)

nikomatsakis
nikomatsakis requested changes Sep 6, 2018
View reviewed changes
@nikomatsakis nikomatsakis changed the title WIP: if- and while-let-chains, take 2 - edition changes if- and while-let-chains, take 2 - edition changes Sep 6, 2018
@nikomatsakis
Copy link
Contributor

nikomatsakis commented Sep 7, 2018

@bors r+

@bors
Copy link
Collaborator

bors commented Sep 7, 2018

📌 Commit 0a8cf67 has been approved by nikomatsakis

@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 Sep 7, 2018
@bors
Copy link
Collaborator

bors commented Sep 8, 2018

⌛ Testing commit 0a8cf67 with merge 748cca41f7fbcb0e018e05935b76172435189af6...

@bors
Copy link
Collaborator

bors commented Sep 8, 2018

💔 Test failed - status-appveyor

@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 Sep 8, 2018
@kennytm
Copy link
Member

kennytm commented Sep 9, 2018

@bors retry

note: C:/projects/rust/mingw32/bin/../lib/gcc/i686-w64-mingw32/6.3.0/../../../../i686-w64-mingw32/bin/ld.exe: cannot open output file C:\\projects\\rust\\build\\i686-pc-windows-gnu\\test\\ui\\issues\\issue-19100\\a.exe: Permission denied

Feels spurious.

@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 Sep 9, 2018
@bors
Copy link
Collaborator

bors commented Sep 10, 2018

⌛ Testing commit 0a8cf67 with merge fb945f0...

bors added a commit that referenced this pull request Sep 10, 2018
@bors
Auto merge of #53854 - davidtwco:issue-53668, r=nikomatsakis
fb945f0 
if- and while-let-chains, take 2 - edition changes

Part of #53668.

r? @nikomatsakis
@bors
Copy link
Collaborator

bors commented Sep 10, 2018

☀️ Test successful - status-appveyor, status-travis
Approved by: nikomatsakis
Pushing fb945f0 to master...

@bors bors merged commit 0a8cf67 into rust-lang:master Sep 10, 2018
@davidtwco davidtwco deleted the issue-53668 branch September 10, 2018 09:33
@Centril Centril mentioned this pull request Sep 17, 2018
Closed
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Reviewers

@nikomatsakis nikomatsakis nikomatsakis requested changes

+2 more reviewers

@Centril Centril Centril left review comments

@zackmdavis zackmdavis zackmdavis left review comments

Reviewers whose approvals may not affect merge requirements

Assignees

@nikomatsakis nikomatsakis

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.

8 participants

@davidtwco @nikomatsakis @Centril @rust-highfive @bors @craterbot @kennytm @zackmdavis