Skip to content

Commit 461707c

Browse files
borsbors
committed
Auto merge of #74060 - kpp:remove_length_at_most_32, r=dtolnay
Remove trait LengthAtMost32 This is a continuation of #74026 preserving the original burrbull's commit. I talked to @burrbull, he suggested me to finish his PR.
2 parents a4dd850 + 8fc7d47 commit 461707c

30 files changed

+259
-732
lines changed

‎src/liballoc/boxed.rs

+2-9
Original file line numberDiff line numberDiff line change
@@ -130,7 +130,6 @@
130130
#![stable(feature = "rust1", since = "1.0.0")]
131131

132132
use core::any::Any;
133-
use core::array::LengthAtMost32;
134133
use core::borrow;
135134
use core::cmp::Ordering;
136135
use core::convert::{From, TryFrom};
@@ -871,10 +870,7 @@ impl From<Box<str>> for Box<[u8]> {
871870
}
872871

873872
#[stable(feature = "box_from_array", since = "1.45.0")]
874-
impl<T, const N: usize> From<[T; N]> for Box<[T]>
875-
where
876-
[T; N]: LengthAtMost32,
877-
{
873+
impl<T, const N: usize> From<[T; N]> for Box<[T]> {
878874
/// Converts a `[T; N]` into a `Box<[T]>`
879875
///
880876
/// This conversion moves the array to newly heap-allocated memory.
@@ -890,10 +886,7 @@ where
890886
}
891887

892888
#[stable(feature = "boxed_slice_try_from", since = "1.43.0")]
893-
impl<T, const N: usize> TryFrom<Box<[T]>> for Box<[T; N]>
894-
where
895-
[T; N]: LengthAtMost32,
896-
{
889+
impl<T, const N: usize> TryFrom<Box<[T]>> for Box<[T; N]> {
897890
type Error = Box<[T]>;
898891

899892
fn try_from(boxed_slice: Box<[T]>) -> Result<Self, Self::Error> {

‎src/liballoc/collections/vec_deque.rs

+3-4
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,6 @@
99

1010
// ignore-tidy-filelength
1111

12-
use core::array::LengthAtMost32;
1312
use core::cmp::{self, Ordering};
1413
use core::fmt;
1514
use core::hash::{Hash, Hasher};
@@ -2889,9 +2888,9 @@ macro_rules! __impl_slice_eq1 {
28892888
__impl_slice_eq1! { [] VecDeque<A>, Vec<B>, }
28902889
__impl_slice_eq1! { [] VecDeque<A>, &[B], }
28912890
__impl_slice_eq1! { [] VecDeque<A>, &mut [B], }
2892-
__impl_slice_eq1! { [const N: usize] VecDeque<A>, [B; N], [B; N]: LengthAtMost32 }
2893-
__impl_slice_eq1! { [const N: usize] VecDeque<A>, &[B; N], [B; N]: LengthAtMost32 }
2894-
__impl_slice_eq1! { [const N: usize] VecDeque<A>, &mut [B; N], [B; N]: LengthAtMost32 }
2891+
__impl_slice_eq1! { [const N: usize] VecDeque<A>, [B; N], }
2892+
__impl_slice_eq1! { [const N: usize] VecDeque<A>, &[B; N], }
2893+
__impl_slice_eq1! { [const N: usize] VecDeque<A>, &mut [B; N], }
28952894

28962895
#[stable(feature = "rust1", since = "1.0.0")]
28972896
impl<A: PartialOrd> PartialOrd for VecDeque<A> {

‎src/liballoc/lib.rs

-1
Original file line numberDiff line numberDiff line change
@@ -84,7 +84,6 @@
8484
#![feature(cfg_target_has_atomic)]
8585
#![feature(coerce_unsized)]
8686
#![feature(const_btree_new)]
87-
#![feature(const_generic_impls_guard)]
8887
#![feature(const_generics)]
8988
#![feature(const_in_array_repeat_expressions)]
9089
#![feature(cow_is_borrowed)]

‎src/liballoc/rc.rs

+1-5
Original file line numberDiff line numberDiff line change
@@ -235,7 +235,6 @@ use crate::boxed::Box;
235235
use std::boxed::Box;
236236

237237
use core::any::Any;
238-
use core::array::LengthAtMost32;
239238
use core::borrow;
240239
use core::cell::Cell;
241240
use core::cmp::Ordering;
@@ -1516,10 +1515,7 @@ where
15161515
}
15171516

15181517
#[stable(feature = "boxed_slice_try_from", since = "1.43.0")]
1519-
impl<T, const N: usize> TryFrom<Rc<[T]>> for Rc<[T; N]>
1520-
where
1521-
[T; N]: LengthAtMost32,
1522-
{
1518+
impl<T, const N: usize> TryFrom<Rc<[T]>> for Rc<[T; N]> {
15231519
type Error = Rc<[T]>;
15241520

15251521
fn try_from(boxed_slice: Rc<[T]>) -> Result<Self, Self::Error> {

‎src/liballoc/sync.rs

+1-5
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,6 @@
77
//! [arc]: struct.Arc.html
88
99
use core::any::Any;
10-
use core::array::LengthAtMost32;
1110
use core::borrow;
1211
use core::cmp::Ordering;
1312
use core::convert::{From, TryFrom};
@@ -2162,10 +2161,7 @@ where
21622161
}
21632162

21642163
#[stable(feature = "boxed_slice_try_from", since = "1.43.0")]
2165-
impl<T, const N: usize> TryFrom<Arc<[T]>> for Arc<[T; N]>
2166-
where
2167-
[T; N]: LengthAtMost32,
2168-
{
2164+
impl<T, const N: usize> TryFrom<Arc<[T]>> for Arc<[T; N]> {
21692165
type Error = Arc<[T]>;
21702166

21712167
fn try_from(boxed_slice: Arc<[T]>) -> Result<Self, Self::Error> {

‎src/liballoc/vec.rs

+10-14
Original file line numberDiff line numberDiff line change
@@ -59,7 +59,6 @@
5959
6060
#![stable(feature = "rust1", since = "1.0.0")]
6161

62-
use core::array::LengthAtMost32;
6362
use core::cmp::{self, Ordering};
6463
use core::fmt;
6564
use core::hash::{Hash, Hasher};
@@ -2378,18 +2377,18 @@ __impl_slice_eq1! { [] &mut [A], Vec<B>, #[stable(feature = "partialeq_vec_for_r
23782377
__impl_slice_eq1! { [] Cow<'_, [A]>, Vec<B> where A: Clone, #[stable(feature = "rust1", since = "1.0.0")] }
23792378
__impl_slice_eq1! { [] Cow<'_, [A]>, &[B] where A: Clone, #[stable(feature = "rust1", since = "1.0.0")] }
23802379
__impl_slice_eq1! { [] Cow<'_, [A]>, &mut [B] where A: Clone, #[stable(feature = "rust1", since = "1.0.0")] }
2381-
__impl_slice_eq1! { [const N: usize] Vec<A>, [B; N] where [B; N]: LengthAtMost32, #[stable(feature = "rust1", since = "1.0.0")] }
2382-
__impl_slice_eq1! { [const N: usize] Vec<A>, &[B; N] where [B; N]: LengthAtMost32, #[stable(feature = "rust1", since = "1.0.0")] }
2380+
__impl_slice_eq1! { [const N: usize] Vec<A>, [B; N], #[stable(feature = "rust1", since = "1.0.0")] }
2381+
__impl_slice_eq1! { [const N: usize] Vec<A>, &[B; N], #[stable(feature = "rust1", since = "1.0.0")] }
23832382

23842383
// NOTE: some less important impls are omitted to reduce code bloat
23852384
// FIXME(Centril): Reconsider this?
2386-
//__impl_slice_eq1! { [const N: usize] Vec<A>, &mut [B; N], [B; N]: LengthAtMost32 }
2387-
//__impl_slice_eq1! { [const N: usize] [A; N], Vec<B>, [A; N]: LengthAtMost32 }
2388-
//__impl_slice_eq1! { [const N: usize] &[A; N], Vec<B>, [A; N]: LengthAtMost32 }
2389-
//__impl_slice_eq1! { [const N: usize] &mut [A; N], Vec<B>, [A; N]: LengthAtMost32 }
2390-
//__impl_slice_eq1! { [const N: usize] Cow<'a, [A]>, [B; N], [B; N]: LengthAtMost32 }
2391-
//__impl_slice_eq1! { [const N: usize] Cow<'a, [A]>, &[B; N], [B; N]: LengthAtMost32 }
2392-
//__impl_slice_eq1! { [const N: usize] Cow<'a, [A]>, &mut [B; N], [B; N]: LengthAtMost32 }
2385+
//__impl_slice_eq1! { [const N: usize] Vec<A>, &mut [B; N], }
2386+
//__impl_slice_eq1! { [const N: usize] [A; N], Vec<B>, }
2387+
//__impl_slice_eq1! { [const N: usize] &[A; N], Vec<B>, }
2388+
//__impl_slice_eq1! { [const N: usize] &mut [A; N], Vec<B>, }
2389+
//__impl_slice_eq1! { [const N: usize] Cow<'a, [A]>, [B; N], }
2390+
//__impl_slice_eq1! { [const N: usize] Cow<'a, [A]>, &[B; N], }
2391+
//__impl_slice_eq1! { [const N: usize] Cow<'a, [A]>, &mut [B; N], }
23932392

23942393
/// Implements comparison of vectors, lexicographically.
23952394
#[stable(feature = "rust1", since = "1.0.0")]
@@ -2493,10 +2492,7 @@ impl<T: Clone> From<&mut [T]> for Vec<T> {
24932492
}
24942493

24952494
#[stable(feature = "vec_from_array", since = "1.44.0")]
2496-
impl<T, const N: usize> From<[T; N]> for Vec<T>
2497-
where
2498-
[T; N]: LengthAtMost32,
2499-
{
2495+
impl<T, const N: usize> From<[T; N]> for Vec<T> {
25002496
#[cfg(not(test))]
25012497
fn from(s: [T; N]) -> Vec<T> {
25022498
<[T]>::into_vec(box s)

‎src/libcore/array/iter.rs

+10-35
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,5 @@
11
//! Defines the `IntoIter` owned iterator for arrays.
22
3-
use super::LengthAtMost32;
43
use crate::{
54
fmt,
65
iter::{ExactSizeIterator, FusedIterator, TrustedLen},
@@ -13,10 +12,7 @@ use crate::{
1312
///
1413
/// [array]: ../../std/primitive.array.html
1514
#[unstable(feature = "array_value_iter", issue = "65798")]
16-
pub struct IntoIter<T, const N: usize>
17-
where
18-
[T; N]: LengthAtMost32,
19-
{
15+
pub struct IntoIter<T, const N: usize> {
2016
/// This is the array we are iterating over.
2117
///
2218
/// Elements with index `i` where `alive.start <= i < alive.end` have not
@@ -39,10 +35,7 @@ where
3935
alive: Range<usize>,
4036
}
4137

42-
impl<T, const N: usize> IntoIter<T, N>
43-
where
44-
[T; N]: LengthAtMost32,
45-
{
38+
impl<T, const N: usize> IntoIter<T, N> {
4639
/// Creates a new iterator over the given `array`.
4740
///
4841
/// *Note*: this method might never get stabilized and/or removed in the
@@ -99,10 +92,7 @@ where
9992
}
10093

10194
#[stable(feature = "array_value_iter_impls", since = "1.40.0")]
102-
impl<T, const N: usize> Iterator for IntoIter<T, N>
103-
where
104-
[T; N]: LengthAtMost32,
105-
{
95+
impl<T, const N: usize> Iterator for IntoIter<T, N> {
10696
type Item = T;
10797
fn next(&mut self) -> Option<Self::Item> {
10898
if self.alive.start == self.alive.end {
@@ -146,10 +136,7 @@ where
146136
}
147137

148138
#[stable(feature = "array_value_iter_impls", since = "1.40.0")]
149-
impl<T, const N: usize> DoubleEndedIterator for IntoIter<T, N>
150-
where
151-
[T; N]: LengthAtMost32,
152-
{
139+
impl<T, const N: usize> DoubleEndedIterator for IntoIter<T, N> {
153140
fn next_back(&mut self) -> Option<Self::Item> {
154141
if self.alive.start == self.alive.end {
155142
return None;
@@ -182,10 +169,7 @@ where
182169
}
183170

184171
#[stable(feature = "array_value_iter_impls", since = "1.40.0")]
185-
impl<T, const N: usize> Drop for IntoIter<T, N>
186-
where
187-
[T; N]: LengthAtMost32,
188-
{
172+
impl<T, const N: usize> Drop for IntoIter<T, N> {
189173
fn drop(&mut self) {
190174
// SAFETY: This is safe: `as_mut_slice` returns exactly the sub-slice
191175
// of elements that have not been moved out yet and that remain
@@ -195,10 +179,7 @@ where
195179
}
196180

197181
#[stable(feature = "array_value_iter_impls", since = "1.40.0")]
198-
impl<T, const N: usize> ExactSizeIterator for IntoIter<T, N>
199-
where
200-
[T; N]: LengthAtMost32,
201-
{
182+
impl<T, const N: usize> ExactSizeIterator for IntoIter<T, N> {
202183
fn len(&self) -> usize {
203184
// Will never underflow due to the invariant `alive.start <=
204185
// alive.end`.
@@ -210,20 +191,17 @@ where
210191
}
211192

212193
#[stable(feature = "array_value_iter_impls", since = "1.40.0")]
213-
impl<T, const N: usize> FusedIterator for IntoIter<T, N> where [T; N]: LengthAtMost32 {}
194+
impl<T, const N: usize> FusedIterator for IntoIter<T, N> {}
214195

215196
// The iterator indeed reports the correct length. The number of "alive"
216197
// elements (that will still be yielded) is the length of the range `alive`.
217198
// This range is decremented in length in either `next` or `next_back`. It is
218199
// always decremented by 1 in those methods, but only if `Some(_)` is returned.
219200
#[stable(feature = "array_value_iter_impls", since = "1.40.0")]
220-
unsafe impl<T, const N: usize> TrustedLen for IntoIter<T, N> where [T; N]: LengthAtMost32 {}
201+
unsafe impl<T, const N: usize> TrustedLen for IntoIter<T, N> {}
221202

222203
#[stable(feature = "array_value_iter_impls", since = "1.40.0")]
223-
impl<T: Clone, const N: usize> Clone for IntoIter<T, N>
224-
where
225-
[T; N]: LengthAtMost32,
226-
{
204+
impl<T: Clone, const N: usize> Clone for IntoIter<T, N> {
227205
fn clone(&self) -> Self {
228206
// SAFETY: each point of unsafety is documented inside the unsafe block
229207
unsafe {
@@ -249,10 +227,7 @@ where
249227
}
250228

251229
#[stable(feature = "array_value_iter_impls", since = "1.40.0")]
252-
impl<T: fmt::Debug, const N: usize> fmt::Debug for IntoIter<T, N>
253-
where
254-
[T; N]: LengthAtMost32,
255-
{
230+
impl<T: fmt::Debug, const N: usize> fmt::Debug for IntoIter<T, N> {
256231
fn fmt(&self, f: &mut fmt::Formatter<'_>) -> fmt::Result {
257232
// Only print the elements that were not yielded yet: we cannot
258233
// access the yielded elements anymore.

0 commit comments

Comments
 (0)