Skip to content

Commit 21b77e2

Browse files
committed
Apply formatting to tests
1 parent f3859c5 commit 21b77e2

File tree

1 file changed

+53
-16
lines changed

1 file changed

+53
-16
lines changed

src/arrayformat.rs

+53-16
Original file line numberDiff line numberDiff line change
@@ -140,9 +140,14 @@ where
140140
&[len] => {
141141
let view = view.view().into_dimensionality::<Ix1>().unwrap();
142142
f.write_str("[")?;
143-
format_with_overflow(f, len, fmt_opt.collapse_limit(0), ", ", ELLIPSIS, |f, index| {
144-
format(&view[index], f)
145-
})?;
143+
format_with_overflow(
144+
f,
145+
len,
146+
fmt_opt.collapse_limit(0),
147+
", ",
148+
ELLIPSIS,
149+
|f, index| format(&view[index], f),
150+
)?;
146151
f.write_str("]")?;
147152
}
148153
// For n-dimensional arrays, we proceed recursively
@@ -289,16 +294,24 @@ mod formatting_with_omit {
289294
);
290295
}
291296

292-
fn ellipsize(limit: usize, sep: &str, elements: impl IntoIterator<Item=impl fmt::Display>)
293-
-> String
294-
{
297+
fn ellipsize(
298+
limit: usize,
299+
sep: &str,
300+
elements: impl IntoIterator<Item = impl fmt::Display>,
301+
) -> String {
295302
let elements = elements.into_iter().collect::<Vec<_>>();
296303
let edge = limit / 2;
297304
if elements.len() <= limit {
298305
format!("{}", elements.iter().format(sep))
299306
} else {
300-
format!("{}{}{}{}{}", elements[..edge].iter().format(sep), sep, ELLIPSIS, sep,
301-
elements[elements.len() - edge..].iter().format(sep))
307+
format!(
308+
"{}{}{}{}{}",
309+
elements[..edge].iter().format(sep),
310+
sep,
311+
ELLIPSIS,
312+
sep,
313+
elements[elements.len() - edge..].iter().format(sep)
314+
)
302315
}
303316
}
304317

@@ -348,7 +361,10 @@ mod formatting_with_omit {
348361
#[test]
349362
fn dim_2_last_axis_overflow() {
350363
let overflow: usize = 2;
351-
let a = Array2::from_elem((AXIS_2D_OVERFLOW_LIMIT, AXIS_2D_OVERFLOW_LIMIT + overflow), 1);
364+
let a = Array2::from_elem(
365+
(AXIS_2D_OVERFLOW_LIMIT, AXIS_2D_OVERFLOW_LIMIT + overflow),
366+
1,
367+
);
352368
let actual = format!("{}", a);
353369
let expected = "\
354370
[[1, 1, 1, 1, 1, ..., 1, 1, 1, 1, 1],
@@ -370,7 +386,10 @@ mod formatting_with_omit {
370386
let a = Array2::from_elem((ARRAY_MANY_ELEMENT_LIMIT / 10, 10), 1);
371387
let actual = format!("{}", a);
372388
let row = format!("{}", a.row(0));
373-
let expected = format!("[{}]", ellipsize(AXIS_LIMIT_COL, ",\n ", (0..a.nrows()).map(|_| &row)));
389+
let expected = format!(
390+
"[{}]",
391+
ellipsize(AXIS_LIMIT_COL, ",\n ", (0..a.nrows()).map(|_| &row))
392+
);
374393
assert_str_eq(&expected, &actual);
375394
}
376395

@@ -386,17 +405,32 @@ mod formatting_with_omit {
386405
#[test]
387406
fn dim_2_multi_directional_overflow() {
388407
let overflow: usize = 2;
389-
let a = Array2::from_elem((AXIS_2D_OVERFLOW_LIMIT + overflow, AXIS_2D_OVERFLOW_LIMIT + overflow), 1);
408+
let a = Array2::from_elem(
409+
(
410+
AXIS_2D_OVERFLOW_LIMIT + overflow,
411+
AXIS_2D_OVERFLOW_LIMIT + overflow,
412+
),
413+
1,
414+
);
390415
let actual = format!("{}", a);
391416
let row = format!("[{}]", ellipsize(AXIS_LIMIT_ROW, ", ", a.row(0)));
392-
let expected = format!("[{}]", ellipsize(AXIS_LIMIT_COL, ",\n ", (0..a.nrows()).map(|_| &row)));
417+
let expected = format!(
418+
"[{}]",
419+
ellipsize(AXIS_LIMIT_COL, ",\n ", (0..a.nrows()).map(|_| &row))
420+
);
393421
assert_str_eq(&expected, &actual);
394422
}
395423

396424
#[test]
397425
fn dim_2_multi_directional_overflow_alternate() {
398426
let overflow: usize = 2;
399-
let a = Array2::from_elem((AXIS_2D_OVERFLOW_LIMIT + overflow, AXIS_2D_OVERFLOW_LIMIT + overflow), 1);
427+
let a = Array2::from_elem(
428+
(
429+
AXIS_2D_OVERFLOW_LIMIT + overflow,
430+
AXIS_2D_OVERFLOW_LIMIT + overflow,
431+
),
432+
1,
433+
);
400434
let actual = format!("{:#}", a);
401435
let row = format!("{}", a.row(0));
402436
let expected = format!("[{}]", (0..a.nrows()).map(|_| &row).format(",\n "));
@@ -405,9 +439,12 @@ mod formatting_with_omit {
405439

406440
#[test]
407441
fn dim_3_overflow_most() {
408-
let a = Array3::from_shape_fn((AXIS_LIMIT_STACKED + 1, AXIS_LIMIT_COL, AXIS_LIMIT_ROW + 1), |(i, j, k)| {
409-
1000. + (100. * ((i as f64).sqrt() + (j as f64).sin() + k as f64)).round() / 100.
410-
});
442+
let a = Array3::from_shape_fn(
443+
(AXIS_LIMIT_STACKED + 1, AXIS_LIMIT_COL, AXIS_LIMIT_ROW + 1),
444+
|(i, j, k)| {
445+
1000. + (100. * ((i as f64).sqrt() + (j as f64).sin() + k as f64)).round() / 100.
446+
},
447+
);
411448
let actual = format!("{:6.1}", a);
412449
let expected = "\
413450
[[[1000.0, 1001.0, 1002.0, 1003.0, 1004.0, ..., 1007.0, 1008.0, 1009.0, 1010.0, 1011.0],

0 commit comments

Comments
 (0)