about summary refs log tree commit diff
path: root/library/std/src
diff options
context:
space:
mode:
authorMatthias Krüger <matthias.krueger@famsik.de>2022-02-18 16:23:32 +0100
committerGitHub <noreply@github.com>2022-02-18 16:23:32 +0100
commitf1c918f1f3166c1cb2624ce2e2783d357e70dc3d (patch)
treef3709578093816760ea98b736d4c9b75af870f2a /library/std/src
parentcf3cd4c48a44ba833253a1f32e09bd6d7b120e13 (diff)
parent18130a21dc8744c9a1f734016e0b399d70e8f968 (diff)
Rollup merge of #93613 - crlf0710:rename_to_async_iter, r=yaahc
Move `{core,std}::stream::Stream` to `{core,std}::async_iter::AsyncIterator`

Following amendments in https://github.com/rust-lang/rfcs/pull/3208/.

cc #79024
cc ``@yoshuawuyts`` ``@joshtriplett``
Diffstat (limited to 'library/std/src')
-rw-r--r--library/std/src/lib.rs6
1 files changed, 3 insertions, 3 deletions
diff --git a/library/std/src/lib.rs b/library/std/src/lib.rs
index a03da0682a5..8c38db9b62c 100644
--- a/library/std/src/lib.rs
+++ b/library/std/src/lib.rs
@@ -233,7 +233,7 @@
 #![feature(array_error_internals)]
 #![feature(assert_matches)]
 #![feature(associated_type_bounds)]
-#![feature(async_stream)]
+#![feature(async_iterator)]
 #![feature(atomic_mut_ptr)]
 #![feature(auto_traits)]
 #![feature(bench_black_box)]
@@ -404,6 +404,8 @@ pub use alloc_crate::vec;
 pub use core::any;
 #[stable(feature = "core_array", since = "1.36.0")]
 pub use core::array;
+#[unstable(feature = "async_iterator", issue = "79024")]
+pub use core::async_iter;
 #[stable(feature = "rust1", since = "1.0.0")]
 pub use core::cell;
 #[stable(feature = "rust1", since = "1.0.0")]
@@ -458,8 +460,6 @@ pub use core::pin;
 pub use core::ptr;
 #[stable(feature = "rust1", since = "1.0.0")]
 pub use core::result;
-#[unstable(feature = "async_stream", issue = "79024")]
-pub use core::stream;
 #[stable(feature = "i128", since = "1.26.0")]
 #[allow(deprecated, deprecated_in_future)]
 pub use core::u128;