From 62722735fb62c2f93656a012c29310155de35467 Mon Sep 17 00:00:00 2001 From: Joshua Nelson Date: Fri, 31 Jan 2020 00:30:55 -0500 Subject: impl From<[T; N]> for Vec --- src/liballoc/vec.rs | 7 +++++++ 1 file changed, 7 insertions(+) (limited to 'src/liballoc') diff --git a/src/liballoc/vec.rs b/src/liballoc/vec.rs index f661b830428..c8ff4a41536 100644 --- a/src/liballoc/vec.rs +++ b/src/liballoc/vec.rs @@ -2397,6 +2397,13 @@ impl From<&mut [T]> for Vec { } } +#[stable(feature = "vec_from_array", since = "1.42.0")] +impl From<[T; N]> for Vec { + fn from(arr: [T; N]) -> Vec { + <[T]>::into_vec(box arr) + } +} + #[stable(feature = "vec_from_cow_slice", since = "1.14.0")] impl<'a, T> From> for Vec where -- cgit 1.4.1-3-g733a5 From daeb8ece8c930174baa874aa3f2f278fbec9637d Mon Sep 17 00:00:00 2001 From: Joshua Nelson Date: Fri, 31 Jan 2020 10:46:08 -0500 Subject: fix error compiling stage2 Co-Authored-By: lzutao --- src/liballoc/vec.rs | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'src/liballoc') diff --git a/src/liballoc/vec.rs b/src/liballoc/vec.rs index c8ff4a41536..f557d056dc8 100644 --- a/src/liballoc/vec.rs +++ b/src/liballoc/vec.rs @@ -2399,7 +2399,7 @@ impl From<&mut [T]> for Vec { #[stable(feature = "vec_from_array", since = "1.42.0")] impl From<[T; N]> for Vec { - fn from(arr: [T; N]) -> Vec { + fn from(arr: [T; N]) -> Self { <[T]>::into_vec(box arr) } } -- cgit 1.4.1-3-g733a5 From f267d9dc191debfef74cc211dbca3d286b51f761 Mon Sep 17 00:00:00 2001 From: Joshua Nelson Date: Fri, 31 Jan 2020 11:41:19 -0500 Subject: limit From impl to LengthAtMost32 Co-Authored-By: Mazdak Farrokhzad --- src/liballoc/vec.rs | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) (limited to 'src/liballoc') diff --git a/src/liballoc/vec.rs b/src/liballoc/vec.rs index f557d056dc8..8fede31847c 100644 --- a/src/liballoc/vec.rs +++ b/src/liballoc/vec.rs @@ -2398,7 +2398,10 @@ impl From<&mut [T]> for Vec { } #[stable(feature = "vec_from_array", since = "1.42.0")] -impl From<[T; N]> for Vec { +impl From<[T; N]> for Vec +where + [T; N]: LengthAtMost32, +{ fn from(arr: [T; N]) -> Self { <[T]>::into_vec(box arr) } -- cgit 1.4.1-3-g733a5 From 96794d86f127dd409760765a64a36c07d9ed585f Mon Sep 17 00:00:00 2001 From: Joshua Nelson Date: Sat, 1 Feb 2020 13:15:50 +0000 Subject: fix test failure --- src/liballoc/vec.rs | 9 +++++++-- 1 file changed, 7 insertions(+), 2 deletions(-) (limited to 'src/liballoc') diff --git a/src/liballoc/vec.rs b/src/liballoc/vec.rs index 8fede31847c..d5339453f81 100644 --- a/src/liballoc/vec.rs +++ b/src/liballoc/vec.rs @@ -2402,8 +2402,13 @@ impl From<[T; N]> for Vec where [T; N]: LengthAtMost32, { - fn from(arr: [T; N]) -> Self { - <[T]>::into_vec(box arr) + #[cfg(not(test))] + fn from(s: [T; N]) -> Vec { + (box s as Box<[T]>).into_vec() + } + #[cfg(test)] + fn from(s: [T; N]) -> Vec { + crate::slice::into_vec(box s) } } -- cgit 1.4.1-3-g733a5 From 1ac4a461425b7a2e29aeb3c2b2cae944f8cbcc77 Mon Sep 17 00:00:00 2001 From: Joshua Nelson Date: Sat, 1 Feb 2020 13:35:26 +0000 Subject: make the impl a little prettier --- src/liballoc/vec.rs | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'src/liballoc') diff --git a/src/liballoc/vec.rs b/src/liballoc/vec.rs index d5339453f81..921c0427959 100644 --- a/src/liballoc/vec.rs +++ b/src/liballoc/vec.rs @@ -2404,7 +2404,7 @@ where { #[cfg(not(test))] fn from(s: [T; N]) -> Vec { - (box s as Box<[T]>).into_vec() + <[T]>::into_vec(box s) } #[cfg(test)] fn from(s: [T; N]) -> Vec { -- cgit 1.4.1-3-g733a5 From 8212584c9ecdbd91736fc7a480fe3b7409b73477 Mon Sep 17 00:00:00 2001 From: Joshua Nelson Date: Tue, 10 Mar 2020 23:13:56 +0000 Subject: Bump release cutoff --- src/liballoc/vec.rs | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'src/liballoc') diff --git a/src/liballoc/vec.rs b/src/liballoc/vec.rs index 921c0427959..9f30ca29c03 100644 --- a/src/liballoc/vec.rs +++ b/src/liballoc/vec.rs @@ -2397,7 +2397,7 @@ impl From<&mut [T]> for Vec { } } -#[stable(feature = "vec_from_array", since = "1.42.0")] +#[stable(feature = "vec_from_array", since = "1.44.0")] impl From<[T; N]> for Vec where [T; N]: LengthAtMost32, -- cgit 1.4.1-3-g733a5 From 3477e67a92878adae48b975915cb7a5c21026cd4 Mon Sep 17 00:00:00 2001 From: Joshua Nelson Date: Tue, 10 Mar 2020 23:49:45 +0000 Subject: Allow vec.rs to be over 3000 lines :( --- src/liballoc/vec.rs | 1 + 1 file changed, 1 insertion(+) (limited to 'src/liballoc') diff --git a/src/liballoc/vec.rs b/src/liballoc/vec.rs index 9f30ca29c03..b9bd0dd8a1e 100644 --- a/src/liballoc/vec.rs +++ b/src/liballoc/vec.rs @@ -1,3 +1,4 @@ +// ignore-tidy-filelength //! A contiguous growable array type with heap-allocated contents, written //! `Vec`. //! -- cgit 1.4.1-3-g733a5