From 969c18469d7921eea7235fa6ed1b15b44d84f0c1 Mon Sep 17 00:00:00 2001 From: Christopher Cole Date: Fri, 5 May 2023 11:52:38 -0700 Subject: [PATCH] Replace some range loop expressions in tests with iterators This cleans up clippy warnings --- src/file.rs | 8 ++++---- src/gnu_symver.rs | 16 ++++++++-------- src/parse.rs | 4 ++-- 3 files changed, 14 insertions(+), 14 deletions(-) diff --git a/src/file.rs b/src/file.rs index 8f74336..961709f 100644 --- a/src/file.rs +++ b/src/file.rs @@ -384,8 +384,8 @@ mod parse_tests { fn test_parse_ehdr32_works() { let ident = (AnyEndian::Little, Class::ELF32, abi::ELFOSABI_LINUX, 7u8); let mut tail = [0u8; ELF64_EHDR_TAILSIZE]; - for n in 0..ELF64_EHDR_TAILSIZE { - tail[n] = n as u8; + for (n, elem) in tail.iter_mut().enumerate().take(ELF64_EHDR_TAILSIZE) { + *elem = n as u8; } assert_eq!( @@ -431,8 +431,8 @@ mod parse_tests { fn test_parse_ehdr64_works() { let ident = (AnyEndian::Big, Class::ELF64, abi::ELFOSABI_LINUX, 7u8); let mut tail = [0u8; ELF64_EHDR_TAILSIZE]; - for n in 0..ELF64_EHDR_TAILSIZE { - tail[n] = n as u8; + for (n, elem) in tail.iter_mut().enumerate().take(ELF64_EHDR_TAILSIZE) { + *elem = n as u8; } assert_eq!( diff --git a/src/gnu_symver.rs b/src/gnu_symver.rs index 96d0a62..895ece9 100644 --- a/src/gnu_symver.rs +++ b/src/gnu_symver.rs @@ -1220,8 +1220,8 @@ mod parse_tests { #[test] fn parse_verdef32_lsb() { let mut data = [0u8; ELFVERDEFSIZE]; - for n in 0..ELFVERDEFSIZE { - data[n] = n as u8; + for (n, elem) in data.iter_mut().enumerate().take(ELFVERDEFSIZE) { + *elem = n as u8; } data[0] = 1; data[1] = 0; @@ -1263,8 +1263,8 @@ mod parse_tests { #[test] fn parse_verdef64_msb() { let mut data = [0u8; ELFVERDEFSIZE]; - for n in 2..ELFVERDEFSIZE { - data[n] = n as u8; + for (n, elem) in data.iter_mut().enumerate().take(ELFVERDEFSIZE).skip(2) { + *elem = n as u8; } data[1] = 1; @@ -1393,8 +1393,8 @@ mod parse_tests { #[test] fn parse_verneed32_lsb() { let mut data = [0u8; ELFVERNEEDSIZE]; - for n in 0..ELFVERNEEDSIZE { - data[n] = n as u8; + for (n, elem) in data.iter_mut().enumerate().take(ELFVERNEEDSIZE) { + *elem = n as u8; } data[0] = 1; data[1] = 0; @@ -1434,8 +1434,8 @@ mod parse_tests { #[test] fn parse_verneed64_msb() { let mut data = [0u8; ELFVERNEEDSIZE]; - for n in 0..ELFVERNEEDSIZE { - data[n] = n as u8; + for (n, elem) in data.iter_mut().enumerate().take(ELFVERNEEDSIZE) { + *elem = n as u8; } data[1] = 1; diff --git a/src/parse.rs b/src/parse.rs index 3df34da..ad6fe08 100644 --- a/src/parse.rs +++ b/src/parse.rs @@ -349,8 +349,8 @@ pub(crate) fn test_parse_for