diff options
| -rw-r--r-- | src/libcore/array.rs | 36 | ||||
| -rw-r--r-- | src/test/run-pass/deriving-clone-array.rs | 18 |
2 files changed, 26 insertions, 28 deletions
diff --git a/src/libcore/array.rs b/src/libcore/array.rs index 613ed0d14ee..0c5eada2165 100644 --- a/src/libcore/array.rs +++ b/src/libcore/array.rs @@ -27,7 +27,7 @@ use default::Default; use fmt; use hash::{Hash, self}; use iter::IntoIterator; -use marker::{Sized, Unsize}; +use marker::{Copy, Sized, Unsize}; use option::Option; use slice::{Iter, IterMut, SliceExt}; @@ -127,6 +127,13 @@ macro_rules! array_impls { } #[stable(feature = "rust1", since = "1.0.0")] + impl<T:Copy> Clone for [T; $N] { + fn clone(&self) -> [T; $N] { + *self + } + } + + #[stable(feature = "rust1", since = "1.0.0")] impl<T: Hash> Hash for [T; $N] { fn hash<H: hash::Hasher>(&self, state: &mut H) { Hash::hash(&self[..], state) @@ -235,30 +242,3 @@ macro_rules! array_impl_default { } 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} - -macro_rules! array_impl_clone { - {$n:expr, $i:expr, $($idx:expr,)*} => { - #[stable(feature = "rust1", since = "1.0.0")] - impl<T: Clone> Clone for [T; $n] { - fn clone(&self) -> [T; $n] { - [self[$i-$i].clone(), $(self[$i-$idx].clone()),*] - } - } - array_impl_clone!{$i, $($idx,)*} - }; - {$n:expr,} => { - #[stable(feature = "rust1", since = "1.0.0")] - impl<T: Clone> Clone for [T; 0] { - fn clone(&self) -> [T; 0] { - [] - } - } - }; -} - -array_impl_clone! { - 32, 31, 30, - 29, 28, 27, 26, 25, 24, 23, 22, 21, 20, - 19, 18, 17, 16, 15, 14, 13, 12, 11, 10, - 9, 8, 7, 6, 5, 4, 3, 2, 1, 0, -} diff --git a/src/test/run-pass/deriving-clone-array.rs b/src/test/run-pass/deriving-clone-array.rs new file mode 100644 index 00000000000..182a1390b1f --- /dev/null +++ b/src/test/run-pass/deriving-clone-array.rs @@ -0,0 +1,18 @@ +// Copyright 2015 The Rust Project Developers. See the COPYRIGHT +// file at the top-level directory of this distribution and at +// http://rust-lang.org/COPYRIGHT. +// +// Licensed under the Apache License, Version 2.0 <LICENSE-APACHE or +// http://www.apache.org/licenses/LICENSE-2.0> or the MIT license +// <LICENSE-MIT or http://opensource.org/licenses/MIT>, at your +// option. This file may not be copied, modified, or distributed +// except according to those terms. + +// test for issue #30244 + +#[derive(Copy, Clone)] +struct Array { + arr: [[u8; 256]; 4] +} + +pub fn main() {} |