From 975a8ed312bbe262171b4c950c52cf992293bd55 Mon Sep 17 00:00:00 2001 From: Without Boats Date: Fri, 14 Aug 2015 10:11:19 -0700 Subject: [PATCH] Implemented Default for arrays up to [T; 32]. --- src/libcore/array.rs | 24 ++++++++++++++++++++++++ 1 file changed, 24 insertions(+) diff --git a/src/libcore/array.rs b/src/libcore/array.rs index cfe22b8917874..d8b363b8cf784 100644 --- a/src/libcore/array.rs +++ b/src/libcore/array.rs @@ -21,6 +21,7 @@ use clone::Clone; use cmp::{PartialEq, Eq, PartialOrd, Ord, Ordering}; use convert::{AsRef, AsMut}; +use default::Default; use fmt; use hash::{Hash, self}; use iter::IntoIterator; @@ -161,3 +162,26 @@ array_impls! { 20 21 22 23 24 25 26 27 28 29 30 31 32 } + +// The Default impls cannot be generated using the array_impls! macro because +// they require array literals. + +macro_rules! array_impl_default { + {$n:expr, $t:ident $($ts:ident)*} => { + #[stable(since = "1.4.0", feature = "array_default")] + impl Default for [T; $n] where T: Default { + fn default() -> [T; $n] { + [$t::default(), $($ts::default()),*] + } + } + array_impl_default!{($n - 1), $($ts)*} + }; + {$n:expr,} => { + #[stable(since = "1.4.0", feature = "array_default")] + impl Default for [T; $n] { + fn default() -> [T; $n] { [] } + } + }; +} + +array_impl_default!{32, T T T T T T T T T T T T T T T T T T T T T T T T T T T T T T T T}