Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

[beta] Process backports #50939

Merged
merged 5 commits into from
May 21, 2018
Merged

[beta] Process backports #50939

merged 5 commits into from
May 21, 2018

Conversation

pietroalbini
Copy link
Member

@pietroalbini pietroalbini commented May 21, 2018 •
edited by alexcrichton
Loading

Merged in master and accepted:

r? @alexcrichton

varkor and others added 5 commits May 21, 2018 15:55
@varkor @pietroalbini
Stabilise inclusive_range_methods
3070f39
@varkor @pietroalbini
Stabilise into_inner
cf2b1c1
@varkor @pietroalbini
Add doc comments mentioning unspecified behaviour upon exhaustion
2d1afbd
@leoyvens @pietroalbini
Fix fn main() -> impl Trait for non-Termination trait
b485887 
Fixes rust-lang#50595.

This bug currently affects stable. Why I think we can go for hard error:

- It will in stable for at most one cycle and there is no legitimate
reason to abuse it, nor any known uses in the wild.

- It only affects `bin` crates (which have a `main`), so there is
little practical difference between a hard error or a deny lint, both
are a one line fix.

The fix was to just unshadow a variable. Thanks @nikomatsakis for the
mentoring!

r? @nikomatsakis
@leoyvens @pietroalbini
Rename ret_ty to declared_ret_ty
c05689b
@rust-highfive
Copy link
Collaborator

warning Warning warning

  • Pull requests are usually filed against the master branch for this repo, but this one is against beta. Please double check that you specified the right target!

@rust-highfive rust-highfive added the S-waiting-on-review Status: Awaiting review from the assignee but also interested parties. label May 21, 2018
@alexcrichton
Copy link
Member

@bors: r+ p=1

@bors
Copy link
Contributor

bors commented May 21, 2018

📌 Commit c05689b has been approved by alexcrichton

@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 May 21, 2018
@bors
Copy link
Contributor

bors commented May 21, 2018

⌛ Testing commit c05689b with merge 60d8c66...

bors added a commit that referenced this pull request May 21, 2018
@bors
Auto merge of #50939 - pietroalbini:beta-backports, r=alexcrichton
60d8c66 
[beta] Process backports

Merged in master and accepted:

* #50758: Stabilise inclusive_range_methods
* #50656: Fix `fn main() -> impl Trait` for non-`Termination` trait

r? @alexcrichton
@bors
Copy link
Contributor

bors commented May 21, 2018

☀️ Test successful - status-appveyor, status-travis
Approved by: alexcrichton
Pushing 60d8c66 to beta...

@bors bors merged commit c05689b into rust-lang:beta May 21, 2018
@pietroalbini pietroalbini deleted the beta-backports branch May 21, 2018 17:20
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers
No reviews
Assignees

@alexcrichton alexcrichton

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.
6 participants
@pietroalbini @rust-highfive @alexcrichton @bors @varkor @leoyvens