From 4e9e8ed837688ab3b7b798f6b0751da15e8d4b4a Mon Sep 17 00:00:00 2001 From: Victor Porof Date: Wed, 1 Feb 2017 12:15:15 +0100 Subject: [PATCH] Use idiomatic `enumerate` method on interators instead of iterating over indices Signed-off-by: Victor Porof --- edn/tests/tests.rs | 17 ++++++++++------- 1 file changed, 10 insertions(+), 7 deletions(-) diff --git a/edn/tests/tests.rs b/edn/tests/tests.rs index 1d855079..4d42d21e 100644 --- a/edn/tests/tests.rs +++ b/edn/tests/tests.rs @@ -926,9 +926,7 @@ fn test_is_and_as_type_helper_functions() { ])), ]; - for i in 0..values.len() { - let value = &values[i]; - + for (i, value) in values.iter().enumerate() { let is_result = [ value.is_nil(), value.is_boolean(), @@ -946,12 +944,17 @@ fn test_is_and_as_type_helper_functions() { value.is_map(), ]; - for j in 0..values.len() { - assert_eq!(j == i, is_result[j]); + assert_eq!(values.len(), is_result.len()); + + for (j, result) in is_result.iter().enumerate() { + assert_eq!(j == i, *result); } - if i == 0 { assert_eq!(value.as_nil().unwrap(), ()) } - else { assert!(!value.as_nil().is_some()) } + if i == 0 { + assert_eq!(value.as_nil().unwrap(), ()) + } else { + assert!(!value.as_nil().is_some()) + } def_test_as_type!(value, as_boolean, i == 1, false); def_test_as_type!(value, as_integer, i == 2, 1i64);