diff options
| author | Matthias Krüger <matthias.krueger@famsik.de> | 2022-02-18 16:23:32 +0100 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2022-02-18 16:23:32 +0100 |
| commit | f1c918f1f3166c1cb2624ce2e2783d357e70dc3d (patch) | |
| tree | f3709578093816760ea98b736d4c9b75af870f2a /library/core/src/panic | |
| parent | cf3cd4c48a44ba833253a1f32e09bd6d7b120e13 (diff) | |
| parent | 18130a21dc8744c9a1f734016e0b399d70e8f968 (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/core/src/panic')
| -rw-r--r-- | library/core/src/panic/unwind_safe.rs | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/library/core/src/panic/unwind_safe.rs b/library/core/src/panic/unwind_safe.rs index 092b7cf0f2c..95be879e319 100644 --- a/library/core/src/panic/unwind_safe.rs +++ b/library/core/src/panic/unwind_safe.rs @@ -1,10 +1,10 @@ +use crate::async_iter::AsyncIterator; use crate::cell::UnsafeCell; use crate::fmt; use crate::future::Future; use crate::ops::{Deref, DerefMut}; use crate::pin::Pin; use crate::ptr::{NonNull, Unique}; -use crate::stream::Stream; use crate::task::{Context, Poll}; /// A marker trait which represents "panic safe" types in Rust. @@ -290,8 +290,8 @@ impl<F: Future> Future for AssertUnwindSafe<F> { } } -#[unstable(feature = "async_stream", issue = "79024")] -impl<S: Stream> Stream for AssertUnwindSafe<S> { +#[unstable(feature = "async_iterator", issue = "79024")] +impl<S: AsyncIterator> AsyncIterator for AssertUnwindSafe<S> { type Item = S::Item; fn poll_next(self: Pin<&mut Self>, cx: &mut Context<'_>) -> Poll<Option<S::Item>> { |
