Skip to content

Commit 38e87f9

Browse files
jhprattgitbot
authored and
gitbot
committed
Rollup merge of rust-lang#135687 - joseluis:feat-reexport_from_coroutine, r=scottmcm
re-export `FromCoroutine` from `core::iter` tracking issue: rust-lang#43122 fixes: rust-lang#135686
2 parents 058bf21 + 338454a commit 38e87f9

File tree

2 files changed

+4
-4
lines changed

2 files changed

+4
-4
lines changed

core/src/iter/mod.rs

+3-3
Original file line numberDiff line numberDiff line change
@@ -420,14 +420,14 @@ pub use self::adapters::{Intersperse, IntersperseWith};
420420
issue = "42168"
421421
)]
422422
pub use self::range::Step;
423+
#[stable(feature = "iter_empty", since = "1.2.0")]
424+
pub use self::sources::{Empty, empty};
423425
#[unstable(
424426
feature = "iter_from_coroutine",
425427
issue = "43122",
426428
reason = "coroutines are unstable"
427429
)]
428-
pub use self::sources::from_coroutine;
429-
#[stable(feature = "iter_empty", since = "1.2.0")]
430-
pub use self::sources::{Empty, empty};
430+
pub use self::sources::{FromCoroutine, from_coroutine};
431431
#[stable(feature = "iter_from_fn", since = "1.34.0")]
432432
pub use self::sources::{FromFn, from_fn};
433433
#[stable(feature = "iter_once", since = "1.2.0")]

core/src/iter/sources.rs

+1-1
Original file line numberDiff line numberDiff line change
@@ -15,7 +15,7 @@ pub use self::empty::{Empty, empty};
1515
issue = "43122",
1616
reason = "coroutines are unstable"
1717
)]
18-
pub use self::from_coroutine::from_coroutine;
18+
pub use self::from_coroutine::{FromCoroutine, from_coroutine};
1919
#[stable(feature = "iter_from_fn", since = "1.34.0")]
2020
pub use self::from_fn::{FromFn, from_fn};
2121
#[stable(feature = "iter_once", since = "1.2.0")]

0 commit comments

Comments
 (0)