@@ -92,7 +92,10 @@ fn iter_to_pyarray() {
92
92
let gil = pyo3:: Python :: acquire_gil ( ) ;
93
93
let np = PyArrayModule :: import ( gil. python ( ) ) . unwrap ( ) ;
94
94
let arr = PyArray :: from_iter ( gil. python ( ) , & np, ( 0 ..10 ) . map ( |x| x * x) ) ;
95
- assert_eq ! ( arr. as_slice( ) . unwrap( ) , & [ 0 , 1 , 4 , 9 , 16 , 25 , 36 , 49 , 64 , 81 ] ) ;
95
+ assert_eq ! (
96
+ arr. as_slice( ) . unwrap( ) ,
97
+ & [ 0 , 1 , 4 , 9 , 16 , 25 , 36 , 49 , 64 , 81 ]
98
+ ) ;
96
99
}
97
100
98
101
#[ test]
@@ -130,15 +133,6 @@ fn from_vec3() {
130
133
) ;
131
134
}
132
135
133
- #[ test]
134
- fn from_small_array ( ) {
135
- let gil = pyo3:: Python :: acquire_gil ( ) ;
136
- let np = PyArrayModule :: import ( gil. python ( ) ) . unwrap ( ) ;
137
- let array: [ i32 ; 5 ] = [ 1 , 2 , 3 , 4 , 5 ] ;
138
- let pyarray = array. into_pyarray ( gil. python ( ) , & np) ;
139
- assert_eq ! ( pyarray. as_slice( ) . unwrap( ) , & [ 1 , 2 , 3 , 4 , 5 ] ) ;
140
- }
141
-
142
136
#[ test]
143
137
fn from_eval ( ) {
144
138
let gil = pyo3:: Python :: acquire_gil ( ) ;
@@ -168,3 +162,22 @@ fn from_eval_fail() {
168
162
assert ! ( converted. is_err( ) ) ;
169
163
}
170
164
165
+ macro_rules! small_array_test {
166
+ ( $( $t: ident) +) => {
167
+ #[ test]
168
+ fn from_small_array( ) {
169
+ let gil = pyo3:: Python :: acquire_gil( ) ;
170
+ let np = PyArrayModule :: import( gil. python( ) ) . unwrap( ) ;
171
+ $( {
172
+ let array: [ $t; 2 ] = [ $t:: min_value( ) , $t:: max_value( ) ] ;
173
+ let pyarray = array. into_pyarray( gil. python( ) , & np) ;
174
+ assert_eq!(
175
+ pyarray. as_slice( ) . unwrap( ) ,
176
+ & [ $t:: min_value( ) , $t:: max_value( ) ]
177
+ ) ;
178
+ } ) +
179
+ }
180
+ } ;
181
+ }
182
+
183
+ small_array_test ! ( i8 u8 i16 u16 i32 u32 i64 u64 ) ;
0 commit comments