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.

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

Stabilize the Option::replace method #54904

Merged
merged 2 commits into from
Oct 11, 2018
Merged

Stabilize the Option::replace method #54904

merged 2 commits into from
Oct 11, 2018

Conversation

Kerollmops
Copy link
Contributor

This PR stabilize the Option::replace method propose in #51998.

@rust-highfive
Copy link
Collaborator

r? @Mark-Simulacrum

(rust_highfive has picked a reviewer for you, use r? to override)

@rust-highfive rust-highfive added the S-waiting-on-review Status: Awaiting review from the assignee but also interested parties. label Oct 8, 2018
@Kerollmops
Copy link
Contributor Author

r? @Centril

@@ -880,7 +878,7 @@ impl<T> Option<T> {
/// assert_eq!(old, None);
/// ```
#[inline]
#[unstable(feature = "option_replace", issue = "51998")]
#[stable(feature = "option_replace", since = "1.30.0")]
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

1.30.0 seems unlikely? See https://forge.rust-lang.org/index.html for dates.

Copy link
Contributor Author

@Kerollmops Kerollmops Oct 8, 2018

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

It is unlikely to be merged for Fri Oct 26 2018 ? You prefer 1.31.0 ?

Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

It has to go into beta first ;) i.e. 1.31.0 goes into beta on 2018-10-26.

Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Ok I will change to 1.31.0 so but how do you know the 1.31.0 beta is set to this date ?

Copy link
Contributor Author

@Kerollmops Kerollmops Oct 8, 2018

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Ho ! It enters beta when the previous version enter stable ? ok ! :)

@Centril
Copy link
Contributor

Centril commented Oct 8, 2018

r? @Kimundi

(Already fcp merged + completed in tracking issue.)

@rust-highfive rust-highfive assigned Kimundi and unassigned Centril Oct 8, 2018
@Kerollmops
Copy link
Contributor Author

Do I squash when done ?

@Centril
Copy link
Contributor

Centril commented Oct 8, 2018

@Kerollmops if you wish; but I think it's fine not to also.

@Centril Centril added the relnotes Marks issues that should be documented in the release notes of the next release. label Oct 9, 2018
@varkor
Copy link
Member

varkor commented Oct 9, 2018

@bors r=Centril

@bors
Copy link
Contributor

bors commented Oct 9, 2018

📌 Commit c232ea1 has been approved by Centril

@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 Oct 9, 2018
pietroalbini added a commit to pietroalbini/rust that referenced this pull request Oct 9, 2018
…, r=Centril

Stabilize the `Option::replace` method

This PR stabilize the `Option::replace` method propose in rust-lang#51998.
pietroalbini added a commit to pietroalbini/rust that referenced this pull request Oct 10, 2018
…, r=Centril

Stabilize the `Option::replace` method

This PR stabilize the `Option::replace` method propose in rust-lang#51998.
Manishearth added a commit to Manishearth/rust that referenced this pull request Oct 10, 2018
bors added a commit that referenced this pull request Oct 11, 2018
Rollup of 9 pull requests

Successful merges:

 - #54747 (codegen_llvm: verify that inline assembly operands are scalars)
 - #54848 (Better Diagnostic for Trait Object Capture)
 - #54850 (Fix #54707 - parse_trait_item_ now handles interpolated blocks as function body decls)
 - #54858 (second round of refactorings for universes)
 - #54862 (Implement RFC 2539: cfg_attr with multiple attributes)
 - #54869 (Fix mobile docs)
 - #54870 (Stabilize tool lints)
 - #54893 (Fix internal compiler error on malformed match arm pattern.)
 - #54904 (Stabilize the `Option::replace` method)

Failed merges:

 - #54909 ( Add chalk rules related to associated type defs)

r? @ghost
bors added a commit that referenced this pull request Oct 11, 2018
Rollup of 9 pull requests

Successful merges:

 - #54747 (codegen_llvm: verify that inline assembly operands are scalars)
 - #54848 (Better Diagnostic for Trait Object Capture)
 - #54850 (Fix #54707 - parse_trait_item_ now handles interpolated blocks as function body decls)
 - #54858 (second round of refactorings for universes)
 - #54862 (Implement RFC 2539: cfg_attr with multiple attributes)
 - #54869 (Fix mobile docs)
 - #54870 (Stabilize tool lints)
 - #54893 (Fix internal compiler error on malformed match arm pattern.)
 - #54904 (Stabilize the `Option::replace` method)

Failed merges:

 - #54909 ( Add chalk rules related to associated type defs)

r? @ghost
@bors bors merged commit c232ea1 into rust-lang:master Oct 11, 2018
@Centril Centril added the T-libs-api Relevant to the library API team, which will review and decide on the PR/issue. label Apr 27, 2019
@Centril Centril added this to the 1.31 milestone Apr 27, 2019
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
relnotes Marks issues that should be documented in the release notes of the next release. S-waiting-on-bors Status: Waiting on bors to run and complete tests. Bors will change the label on completion. T-libs-api Relevant to the library API team, which will review and decide on the PR/issue.
Projects
None yet
Development

Successfully merging this pull request may close these issues.

7 participants