about summary refs log tree commit diff
diff options
context:
space:
mode:
authorJoshua Nelson <jyn514@gmail.com>2020-02-01 13:15:50 +0000
committerJoshua Nelson <jyn514@gmail.com>2020-03-10 23:44:46 +0000
commit96794d86f127dd409760765a64a36c07d9ed585f (patch)
tree7e963b0e474332e18b678deb38c1961756e922f4
parentba46b61bbcd0d2860105c429cf73254c388e9118 (diff)
downloadrust-96794d86f127dd409760765a64a36c07d9ed585f.tar.gz
rust-96794d86f127dd409760765a64a36c07d9ed585f.zip
fix test failure
-rw-r--r--src/liballoc/vec.rs9
1 files changed, 7 insertions, 2 deletions
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<T, const N: usize> From<[T; N]> for Vec<T>
 where
     [T; N]: LengthAtMost32,
 {
-    fn from(arr: [T; N]) -> Self {
-        <[T]>::into_vec(box arr)
+    #[cfg(not(test))]
+    fn from(s: [T; N]) -> Vec<T> {
+        (box s as Box<[T]>).into_vec()
+    }
+    #[cfg(test)]
+    fn from(s: [T; N]) -> Vec<T> {
+        crate::slice::into_vec(box s)
     }
 }