Stabilize the `map`/`value` methods on `ControlFlow` #130518

scottmcm · 2024-09-18T15:17:47Z

And fix the stability attribute on the pub use in core::ops.

libs-api in #75744 (comment) seemed reasonably happy with naming for these, so let's try for an FCP.

Summary:

impl<B, C> ControlFlow<B, C> {
    pub fn break_value(self) -> Option<B>;
    pub fn map_break<T>(self, f: impl FnOnce(B) -> T) -> ControlFlow<T, C>;
    pub fn continue_value(self) -> Option<C>;
    pub fn map_continue<T>(self, f: impl FnOnce(C) -> T) -> ControlFlow<B, T>;
}

Resolves #75744

@rustbot label +needs-fcp +t-libs-api -t-libs

Aside, in case it keeps someone else from going down the same dead end: I looked at the {break,continue}_value methods and tried to make them const as part of this, but that's disallowed because of not having const Drop, so put it back to not even unstably-const.

rustbot · 2024-09-18T15:17:55Z

r? @ibraheemdev

rustbot has assigned @ibraheemdev.
They will have a look at your PR within the next two weeks and either review your PR or reassign to another reviewer.

Use r? to explicitly pick a reviewer

jieyouxu · 2024-09-18T16:38:07Z

r? libs-api

rustbot · 2024-09-18T17:34:35Z

Some changes occurred in src/tools/clippy

cc @rust-lang/clippy

scottmcm · 2024-09-18T18:51:58Z

library/core/src/ops/mod.rs

-#[unstable(feature = "control_flow_enum", reason = "new API", issue = "75744")]
+#[stable(feature = "control_flow_enum_type", since = "1.55.0")]


Wanted to draw attention to this update specifically. The type has been stable for a while https://blog.rust-lang.org/2021/09/09/Rust-1.55.0.html#stabilized-apis, so I guess this attribute just wasn't doing anything. I set the since to the same old release as the type.

dtolnay · 2024-09-21T19:27:30Z

@rfcbot fcp merge

rfcbot · 2024-09-21T19:27:32Z

Team member @dtolnay has proposed to merge this. The next step is review by the rest of the tagged team members:

No concerns currently listed.

Once a majority of reviewers approve (and at most 2 approvals are outstanding), this will enter its final comment period. If you spot a major issue that hasn't been raised at any point in this process, please speak up!

See this document for info about what commands tagged team members can give me.

rfcbot · 2024-09-24T15:16:20Z

🔔 This is now entering its final comment period, as per the review above. 🔔

bors · 2024-09-25T09:35:12Z

☔ The latest upstream changes (presumably #130803) made this pull request unmergeable. Please resolve the merge conflicts.

And fix the stability attribute on the `pub use` in `core::ops`.

rfcbot · 2024-10-04T15:24:11Z

The final comment period, with a disposition to merge, as per the review above, is now complete.

As the automated representative of the governance process, I would like to thank the author for their work and everyone else who contributed.

This will be merged soon.

scottmcm · 2024-10-04T18:14:45Z

@bors r=dtolnay

bors · 2024-10-04T18:14:48Z

📌 Commit ddfd0c7 has been approved by dtolnay

It is now in the queue for this repository.

…ra, r=dtolnay Stabilize the `map`/`value` methods on `ControlFlow` And fix the stability attribute on the `pub use` in `core::ops`. libs-api in rust-lang#75744 (comment) seemed reasonably happy with naming for these, so let's try for an FCP. Summary: ```rust impl<B, C> ControlFlow<B, C> { pub fn break_value(self) -> Option<B>; pub fn map_break<T>(self, f: impl FnOnce(B) -> T) -> ControlFlow<T, C>; pub fn continue_value(self) -> Option<C>; pub fn map_continue<T>(self, f: impl FnOnce(C) -> T) -> ControlFlow<B, T>; } ``` Resolves rust-lang#75744 `@rustbot` label +needs-fcp +t-libs-api -t-libs --- Aside, in case it keeps someone else from going down the same dead end: I looked at the `{break,continue}_value` methods and tried to make them `const` as part of this, but that's disallowed because of not having `const Drop`, so put it back to not even unstably-const.

…kingjubilee Rollup of 10 pull requests Successful merges: - rust-lang#130453 (Add x86_64-unknown-trusty as tier 3 target) - rust-lang#130518 (Stabilize the `map`/`value` methods on `ControlFlow`) - rust-lang#131116 (Increase Stack Size for AIX) - rust-lang#131171 (Fix `target_env` in `avr-unknown-gnu-atmega328`) - rust-lang#131174 (Fix `target_abi` in `sparc-unknown-none-elf`) - rust-lang#131177 ( Stabilize 5 `const_mut_refs`-dependent API) - rust-lang#131238 (Remove mw from triagebot.toml) - rust-lang#131240 (Fix typo in csky-unknown-linux-gnuabiv2.md) - rust-lang#131257 ([rustdoc] Fix list margins) - rust-lang#131264 (Fix some `pub(crate)` that were undetected bc of `#[instrument]`) r? `@ghost` `@rustbot` modify labels: rollup

Rollup merge of rust-lang#130518 - scottmcm:stabilize-controlflow-extra, r=dtolnay Stabilize the `map`/`value` methods on `ControlFlow` And fix the stability attribute on the `pub use` in `core::ops`. libs-api in rust-lang#75744 (comment) seemed reasonably happy with naming for these, so let's try for an FCP. Summary: ```rust impl<B, C> ControlFlow<B, C> { pub fn break_value(self) -> Option<B>; pub fn map_break<T>(self, f: impl FnOnce(B) -> T) -> ControlFlow<T, C>; pub fn continue_value(self) -> Option<C>; pub fn map_continue<T>(self, f: impl FnOnce(C) -> T) -> ControlFlow<B, T>; } ``` Resolves rust-lang#75744 ``@rustbot`` label +needs-fcp +t-libs-api -t-libs --- Aside, in case it keeps someone else from going down the same dead end: I looked at the `{break,continue}_value` methods and tried to make them `const` as part of this, but that's disallowed because of not having `const Drop`, so put it back to not even unstably-const.

…ra, r=dtolnay Stabilize the `map`/`value` methods on `ControlFlow` And fix the stability attribute on the `pub use` in `core::ops`. libs-api in rust-lang#75744 (comment) seemed reasonably happy with naming for these, so let's try for an FCP. Summary: ```rust impl<B, C> ControlFlow<B, C> { pub fn break_value(self) -> Option<B>; pub fn map_break<T>(self, f: impl FnOnce(B) -> T) -> ControlFlow<T, C>; pub fn continue_value(self) -> Option<C>; pub fn map_continue<T>(self, f: impl FnOnce(C) -> T) -> ControlFlow<B, T>; } ``` Resolves rust-lang#75744 ``@rustbot`` label +needs-fcp +t-libs-api -t-libs --- Aside, in case it keeps someone else from going down the same dead end: I looked at the `{break,continue}_value` methods and tried to make them `const` as part of this, but that's disallowed because of not having `const Drop`, so put it back to not even unstably-const.

rustbot assigned ibraheemdev Sep 18, 2024

scottmcm force-pushed the stabilize-controlflow-extra branch from dd1caed to 2de809f Compare September 18, 2024 15:21

scottmcm mentioned this pull request Sep 18, 2024

Tracking issue for ControlFlow enum, for use with try_fold and in Try #75744

Closed

9 tasks

This comment has been minimized.

Sign in to view

scottmcm force-pushed the stabilize-controlflow-extra branch from 2de809f to ce0541e Compare September 18, 2024 16:23

rustbot assigned BurntSushi and unassigned ibraheemdev Sep 18, 2024

This comment has been minimized.

Sign in to view

scottmcm force-pushed the stabilize-controlflow-extra branch from 7c4c9ce to e7b5805 Compare September 18, 2024 18:09

This comment has been minimized.

Sign in to view

scottmcm force-pushed the stabilize-controlflow-extra branch from e7b5805 to 4c8ea84 Compare September 18, 2024 18:43

scottmcm commented Sep 18, 2024

View reviewed changes

dtolnay assigned dtolnay and unassigned BurntSushi Sep 21, 2024

dtolnay approved these changes Sep 21, 2024

View reviewed changes

rfcbot added the proposed-final-comment-period Proposed to merge/close by relevant subteam, see T-<team> label. Will enter FCP once signed off. label Sep 21, 2024

dtolnay removed the I-libs-api-nominated Nominated for discussion during a libs-api team meeting. label Sep 21, 2024

rfcbot added final-comment-period In the final comment period and will be merged soon unless new substantive objections are raised. and removed proposed-final-comment-period Proposed to merge/close by relevant subteam, see T-<team> label. Will enter FCP once signed off. labels Sep 24, 2024

Amanieu added S-waiting-on-fcp Status: PR is in FCP and is awaiting for FCP to complete. and removed S-waiting-on-team Status: Awaiting decision from the relevant subteam (see the T-<team> label). labels Sep 24, 2024

bors added the S-waiting-on-author Status: This is awaiting some action (such as code changes or more information) from the author. label Sep 25, 2024

scottmcm added 3 commits September 25, 2024 19:00

Stabilize the map/value methods on ControlFlow

fd5aa07

And fix the stability attribute on the `pub use` in `core::ops`.

Remove the control_flow_enum feature from clippy

c89b873

Remove feature(control_flow_enum) in tests

ddfd0c7

scottmcm force-pushed the stabilize-controlflow-extra branch from 4c8ea84 to ddfd0c7 Compare September 26, 2024 02:22

rfcbot added finished-final-comment-period The final comment period is finished for this PR / Issue. to-announce Announce this issue on triage meeting and removed final-comment-period In the final comment period and will be merged soon unless new substantive objections are raised. labels Oct 4, 2024

rustbot mentioned this pull request Oct 4, 2024

Tracking issue for release notes of #130518: Stabilize the map/value methods on ControlFlow #131253

Open

3 tasks

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 Oct 4, 2024

This was referenced Oct 4, 2024

Rollup of 9 pull requests #131268

Closed

Rollup of 10 pull requests #131269

Merged

bors merged commit 5a8fcab into rust-lang:master Oct 5, 2024
6 checks passed

rustbot added this to the 1.83.0 milestone Oct 5, 2024

scottmcm deleted the stabilize-controlflow-extra branch October 5, 2024 01:10

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

Stabilize the `map`/`value` methods on `ControlFlow` #130518

Stabilize the `map`/`value` methods on `ControlFlow` #130518

scottmcm commented Sep 18, 2024 •

edited

Loading

rustbot commented Sep 18, 2024

This comment has been minimized.

jieyouxu commented Sep 18, 2024

This comment has been minimized.

rustbot commented Sep 18, 2024

This comment has been minimized.

This comment has been minimized.

scottmcm Sep 18, 2024

dtolnay commented Sep 21, 2024

rfcbot commented Sep 21, 2024 •

edited by Amanieu

Loading

rfcbot commented Sep 24, 2024

bors commented Sep 25, 2024

rfcbot commented Oct 4, 2024

scottmcm commented Oct 4, 2024

bors commented Oct 4, 2024

		#[unstable(feature = "control_flow_enum", reason = "new API", issue = "75744")]
		#[stable(feature = "control_flow_enum_type", since = "1.55.0")]

Stabilize the map/value methods on ControlFlow #130518

Stabilize the map/value methods on ControlFlow #130518

Conversation

scottmcm commented Sep 18, 2024 • edited Loading

rustbot commented Sep 18, 2024

This comment has been minimized.

jieyouxu commented Sep 18, 2024

This comment has been minimized.

rustbot commented Sep 18, 2024

This comment has been minimized.

This comment has been minimized.

scottmcm Sep 18, 2024

Choose a reason for hiding this comment

dtolnay commented Sep 21, 2024

rfcbot commented Sep 21, 2024 • edited by Amanieu Loading

rfcbot commented Sep 24, 2024

bors commented Sep 25, 2024

rfcbot commented Oct 4, 2024

scottmcm commented Oct 4, 2024

bors commented Oct 4, 2024

Stabilize the `map`/`value` methods on `ControlFlow` #130518

Stabilize the `map`/`value` methods on `ControlFlow` #130518

scottmcm commented Sep 18, 2024 •

edited

Loading

rfcbot commented Sep 21, 2024 •

edited by Amanieu

Loading