@@ -17,10 +17,10 @@ use crate::dimension::IntoDimension;
17
17
18
18
const PRINT_ELEMENTS_LIMIT : Ix = 3 ;
19
19
20
- fn format_array_v2 < A , S , D , F > ( view : & ArrayBase < S , D > ,
21
- f : & mut fmt:: Formatter ,
22
- mut format : F ,
23
- limit : Ix ) -> fmt:: Result
20
+ fn format_array < A , S , D , F > ( view : & ArrayBase < S , D > ,
21
+ f : & mut fmt:: Formatter ,
22
+ mut format : F ,
23
+ limit : Ix ) -> fmt:: Result
24
24
where F : FnMut ( & A , & mut fmt:: Formatter ) -> fmt:: Result ,
25
25
D : Dimension ,
26
26
S : Data < Elem =A > ,
@@ -151,7 +151,7 @@ impl<'a, A: fmt::Display, S, D: Dimension> fmt::Display for ArrayBase<S, D>
151
151
where S : Data < Elem =A > ,
152
152
{
153
153
fn fmt ( & self , f : & mut fmt:: Formatter ) -> fmt:: Result {
154
- format_array_v2 ( self , f, <_ >:: fmt, PRINT_ELEMENTS_LIMIT )
154
+ format_array ( self , f, <_ >:: fmt, PRINT_ELEMENTS_LIMIT )
155
155
}
156
156
}
157
157
@@ -164,7 +164,7 @@ impl<'a, A: fmt::Debug, S, D: Dimension> fmt::Debug for ArrayBase<S, D>
164
164
{
165
165
fn fmt ( & self , f : & mut fmt:: Formatter ) -> fmt:: Result {
166
166
// Add extra information for Debug
167
- format_array_v2 ( self , f, <_ >:: fmt, PRINT_ELEMENTS_LIMIT ) ?;
167
+ format_array ( self , f, <_ >:: fmt, PRINT_ELEMENTS_LIMIT ) ?;
168
168
write ! ( f, " shape={:?}, strides={:?}, layout={:?}" ,
169
169
self . shape( ) , self . strides( ) , layout=self . view( ) . layout( ) ) ?;
170
170
match D :: NDIM {
@@ -183,7 +183,7 @@ impl<'a, A: fmt::LowerExp, S, D: Dimension> fmt::LowerExp for ArrayBase<S, D>
183
183
where S : Data < Elem =A > ,
184
184
{
185
185
fn fmt ( & self , f : & mut fmt:: Formatter ) -> fmt:: Result {
186
- format_array_v2 ( self , f, <_ >:: fmt, PRINT_ELEMENTS_LIMIT )
186
+ format_array ( self , f, <_ >:: fmt, PRINT_ELEMENTS_LIMIT )
187
187
}
188
188
}
189
189
@@ -195,7 +195,7 @@ impl<'a, A: fmt::UpperExp, S, D: Dimension> fmt::UpperExp for ArrayBase<S, D>
195
195
where S : Data < Elem =A > ,
196
196
{
197
197
fn fmt ( & self , f : & mut fmt:: Formatter ) -> fmt:: Result {
198
- format_array_v2 ( self , f, <_ >:: fmt, PRINT_ELEMENTS_LIMIT )
198
+ format_array ( self , f, <_ >:: fmt, PRINT_ELEMENTS_LIMIT )
199
199
}
200
200
}
201
201
/// Format the array using `LowerHex` and apply the formatting parameters used
@@ -206,7 +206,7 @@ impl<'a, A: fmt::LowerHex, S, D: Dimension> fmt::LowerHex for ArrayBase<S, D>
206
206
where S : Data < Elem =A > ,
207
207
{
208
208
fn fmt ( & self , f : & mut fmt:: Formatter ) -> fmt:: Result {
209
- format_array_v2 ( self , f, <_ >:: fmt, PRINT_ELEMENTS_LIMIT )
209
+ format_array ( self , f, <_ >:: fmt, PRINT_ELEMENTS_LIMIT )
210
210
}
211
211
}
212
212
@@ -218,7 +218,7 @@ impl<'a, A: fmt::Binary, S, D: Dimension> fmt::Binary for ArrayBase<S, D>
218
218
where S : Data < Elem =A > ,
219
219
{
220
220
fn fmt ( & self , f : & mut fmt:: Formatter ) -> fmt:: Result {
221
- format_array_v2 ( self , f, <_ >:: fmt, PRINT_ELEMENTS_LIMIT )
221
+ format_array ( self , f, <_ >:: fmt, PRINT_ELEMENTS_LIMIT )
222
222
}
223
223
}
224
224
0 commit comments