Skip to content

Commit b63f7f9

Browse files
committed
Demote ControlFlow::{from|into}_try to pub(crate)
1 parent 3bcaeb0 commit b63f7f9

File tree

1 file changed

+7
-8
lines changed

1 file changed

+7
-8
lines changed

library/core/src/ops/control_flow.rs

+7-8
Original file line numberDiff line numberDiff line change
@@ -186,42 +186,41 @@ impl<B, C> ControlFlow<B, C> {
186186
#[cfg(bootstrap)]
187187
impl<R: ops::TryV1> ControlFlow<R, R::Output> {
188188
/// Create a `ControlFlow` from any type implementing `Try`.
189-
#[unstable(feature = "control_flow_enum", reason = "new API", issue = "75744")]
190189
#[inline]
191-
pub fn from_try(r: R) -> Self {
190+
pub(crate) fn from_try(r: R) -> Self {
192191
match R::into_result(r) {
193192
Ok(v) => ControlFlow::Continue(v),
194193
Err(v) => ControlFlow::Break(R::from_error(v)),
195194
}
196195
}
197196

198197
/// Convert a `ControlFlow` into any type implementing `Try`;
199-
#[unstable(feature = "control_flow_enum", reason = "new API", issue = "75744")]
200198
#[inline]
201-
pub fn into_try(self) -> R {
199+
pub(crate) fn into_try(self) -> R {
202200
match self {
203201
ControlFlow::Continue(v) => R::from_ok(v),
204202
ControlFlow::Break(v) => v,
205203
}
206204
}
207205
}
208206

207+
/// These are used only as part of implementing the iterator adapters.
208+
/// They have mediocre names and non-obvious semantics, so aren't
209+
/// currently on a path to potential stabilization.
209210
#[cfg(not(bootstrap))]
210211
impl<R: ops::TryV2> ControlFlow<R, R::Output> {
211212
/// Create a `ControlFlow` from any type implementing `Try`.
212-
#[unstable(feature = "control_flow_enum", reason = "new API", issue = "75744")]
213213
#[inline]
214-
pub fn from_try(r: R) -> Self {
214+
pub(crate) fn from_try(r: R) -> Self {
215215
match R::branch(r) {
216216
ControlFlow::Continue(v) => ControlFlow::Continue(v),
217217
ControlFlow::Break(v) => ControlFlow::Break(R::from_residual(v)),
218218
}
219219
}
220220

221221
/// Convert a `ControlFlow` into any type implementing `Try`;
222-
#[unstable(feature = "control_flow_enum", reason = "new API", issue = "75744")]
223222
#[inline]
224-
pub fn into_try(self) -> R {
223+
pub(crate) fn into_try(self) -> R {
225224
match self {
226225
ControlFlow::Continue(v) => R::from_output(v),
227226
ControlFlow::Break(v) => v,

0 commit comments

Comments
 (0)