@@ -26,30 +26,30 @@ pub type Inc<T, U> = <U as AddLength<T, U1>>::Output;
26
26
#[ macro_export]
27
27
macro_rules! arr_impl {
28
28
( $T: ty; $N: ty, [ $( $x: expr) ,* ] , [ ] ) => ( {
29
- unsafe { $crate:: transmute:: <_, $crate:: GenericArray <$T, $N>>( [ $( $x) ,* ] ) }
29
+ unsafe { $crate:: transmute:: <_, $crate:: GenericArray <$T, $N>>( [ $( $x) ,* ] ) }
30
30
} ) ;
31
31
( $T: ty; $N: ty, [ ] , [ $x1: expr] ) => (
32
32
arr_impl!( $T; $crate:: arr:: Inc <$T, $N>, [ $x1 as $T] , [ ] )
33
33
) ;
34
34
( $T: ty; $N: ty, [ ] , [ $x1: expr, $( $x: expr) ,+] ) => (
35
- arr_impl!( $T; $crate:: arr:: Inc <$T, $N>, [ $x1 as $T] , [ $( $x) ,* ] )
35
+ arr_impl!( $T; $crate:: arr:: Inc <$T, $N>, [ $x1 as $T] , [ $( $x) ,+ ] )
36
36
) ;
37
37
( $T: ty; $N: ty, [ $( $y: expr) ,+] , [ $x1: expr] ) => (
38
- arr_impl!( $T; $crate:: arr:: Inc <$T, $N>, [ $( $y) ,* , $x1 as $T] , [ ] )
38
+ arr_impl!( $T; $crate:: arr:: Inc <$T, $N>, [ $( $y) ,+ , $x1 as $T] , [ ] )
39
39
) ;
40
40
( $T: ty; $N: ty, [ $( $y: expr) ,+] , [ $x1: expr, $( $x: expr) ,+] ) => (
41
- arr_impl!( $T; $crate:: arr:: Inc <$T, $N>, [ $( $y) ,* , $x1 as $T] , [ $( $x) ,* ] )
41
+ arr_impl!( $T; $crate:: arr:: Inc <$T, $N>, [ $( $y) ,+ , $x1 as $T] , [ $( $x) ,+ ] )
42
42
) ;
43
43
}
44
44
45
45
/// Macro allowing for easy generation of Generic Arrays.
46
46
/// Example: `let test = arr![u32; 1, 2, 3];`
47
47
#[ macro_export]
48
48
macro_rules! arr {
49
- ( $T: ty; ) => ( {
49
+ ( $T: ty; $ ( , ) * ) => ( {
50
50
unsafe { $crate:: transmute:: <[ $T; 0 ] , $crate:: GenericArray <$T, $crate:: typenum:: U0 >>( [ ] ) }
51
51
} ) ;
52
- ( $T: ty; $( $x: expr) ,* ) => (
52
+ ( $T: ty; $( $x: expr) ,* $ ( , ) * ) => (
53
53
arr_impl!( $T; $crate:: typenum:: U0 , [ ] , [ $( $x) ,* ] )
54
54
) ;
55
55
( $( $x: expr, ) +) => ( arr![ $( $x) ,* ] ) ;
0 commit comments