diff options
| author | Ralf Jung <post@ralfj.de> | 2021-05-17 18:52:10 +0200 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2021-05-17 18:52:10 +0200 |
| commit | fbb0d70c2c666e3f3cb7b6176c663203db541589 (patch) | |
| tree | dd6de87e861d7fc0c582e961cdb242fa47c7ca08 | |
| parent | 266e7afe1308b6199a4f2b5c0d89572aa580eafc (diff) | |
| parent | 39e492a2beda93355555138d3059d80b674c8b08 (diff) | |
| download | rust-fbb0d70c2c666e3f3cb7b6176c663203db541589.tar.gz rust-fbb0d70c2c666e3f3cb7b6176c663203db541589.zip | |
Rollup merge of #85374 - the8472:hide-internal-traits, r=SimonSapin
mark internal inplace_iteration traits as hidden resolves #85373 r? ``@SimonSapin``
| -rw-r--r-- | library/alloc/src/collections/binary_heap.rs | 2 | ||||
| -rw-r--r-- | library/alloc/src/vec/into_iter.rs | 2 | ||||
| -rw-r--r-- | library/core/src/iter/adapters/mod.rs | 1 | ||||
| -rw-r--r-- | library/core/src/iter/traits/marker.rs | 1 |
4 files changed, 6 insertions, 0 deletions
diff --git a/library/alloc/src/collections/binary_heap.rs b/library/alloc/src/collections/binary_heap.rs index a201af01030..544e18d1ff3 100644 --- a/library/alloc/src/collections/binary_heap.rs +++ b/library/alloc/src/collections/binary_heap.rs @@ -1299,6 +1299,7 @@ impl<T> ExactSizeIterator for IntoIter<T> { impl<T> FusedIterator for IntoIter<T> {} #[unstable(issue = "none", feature = "inplace_iteration")] +#[doc(hidden)] unsafe impl<T> SourceIter for IntoIter<T> { type Source = IntoIter<T>; @@ -1309,6 +1310,7 @@ unsafe impl<T> SourceIter for IntoIter<T> { } #[unstable(issue = "none", feature = "inplace_iteration")] +#[doc(hidden)] unsafe impl<I> InPlaceIterable for IntoIter<I> {} impl<I> AsIntoIter for IntoIter<I> { diff --git a/library/alloc/src/vec/into_iter.rs b/library/alloc/src/vec/into_iter.rs index 2e68161d260..8da4d995ba5 100644 --- a/library/alloc/src/vec/into_iter.rs +++ b/library/alloc/src/vec/into_iter.rs @@ -264,9 +264,11 @@ unsafe impl<#[may_dangle] T, A: Allocator> Drop for IntoIter<T, A> { } #[unstable(issue = "none", feature = "inplace_iteration")] +#[doc(hidden)] unsafe impl<T, A: Allocator> InPlaceIterable for IntoIter<T, A> {} #[unstable(issue = "none", feature = "inplace_iteration")] +#[doc(hidden)] unsafe impl<T, A: Allocator> SourceIter for IntoIter<T, A> { type Source = Self; diff --git a/library/core/src/iter/adapters/mod.rs b/library/core/src/iter/adapters/mod.rs index 61d8351d59f..4f69b82ba4c 100644 --- a/library/core/src/iter/adapters/mod.rs +++ b/library/core/src/iter/adapters/mod.rs @@ -88,6 +88,7 @@ pub use self::zip::zip; /// [`FromIterator`]: crate::iter::FromIterator /// [`as_inner`]: SourceIter::as_inner #[unstable(issue = "none", feature = "inplace_iteration")] +#[doc(hidden)] pub unsafe trait SourceIter { /// A source stage in an iterator pipeline. type Source: Iterator; diff --git a/library/core/src/iter/traits/marker.rs b/library/core/src/iter/traits/marker.rs index c4e21b84863..22b5ffdf886 100644 --- a/library/core/src/iter/traits/marker.rs +++ b/library/core/src/iter/traits/marker.rs @@ -53,4 +53,5 @@ unsafe impl<I: TrustedLen + ?Sized> TrustedLen for &mut I {} /// [`next()`]: Iterator::next /// [`try_fold()`]: Iterator::try_fold #[unstable(issue = "none", feature = "inplace_iteration")] +#[doc(hidden)] pub unsafe trait InPlaceIterable: Iterator {} |