From df68c396c4b67d713fc5eb712158b8cc34fbcd4f Mon Sep 17 00:00:00 2001 From: Roy Ivy III Date: Sun, 29 Dec 2019 11:22:56 -0600 Subject: [PATCH] refactor/polish ~ fix `cargo clippy` complaints (allow map_clone) .# [why] Although `copied()` is preffered, it was not stabilized until rust v1.35.0. So, 'map_clone' is allowed instead of increasing MinSRV to v1.35.0. * ref: https://github.com/rust-lang/rust/blob/master/RELEASES.md --- src/printf/tokenize/num_format/formatters/base_conv/mod.rs | 6 ++++-- src/uutils/uutils.rs | 1 + 2 files changed, 5 insertions(+), 2 deletions(-) diff --git a/src/printf/tokenize/num_format/formatters/base_conv/mod.rs b/src/printf/tokenize/num_format/formatters/base_conv/mod.rs index 59987b850..f4fccea9a 100644 --- a/src/printf/tokenize/num_format/formatters/base_conv/mod.rs +++ b/src/printf/tokenize/num_format/formatters/base_conv/mod.rs @@ -26,7 +26,8 @@ pub fn arrnum_int_mult(arr_num: &[u8], basenum: u8, base_ten_int_fact: u8) -> Ve } } } - let ret: Vec = ret_rev.iter().rev().map(|x| x.clone()).collect(); + #[allow(clippy::map_clone)] + let ret: Vec = ret_rev.iter().rev().map(|x| *x).collect(); ret } @@ -190,7 +191,8 @@ pub fn arrnum_int_add(arrnum: &[u8], basenum: u8, base_ten_int_term: u8) -> Vec< } } } - let ret: Vec = ret_rev.iter().rev().map(|x| x.clone()).collect(); + #[allow(clippy::map_clone)] + let ret: Vec = ret_rev.iter().rev().map(|x| *x).collect(); ret } diff --git a/src/uutils/uutils.rs b/src/uutils/uutils.rs index 36fd738ce..e7bd54345 100644 --- a/src/uutils/uutils.rs +++ b/src/uutils/uutils.rs @@ -28,6 +28,7 @@ fn usage(cmap: &UtilityMap) { println!("Usage:"); println!(" {} [util [arguments...]]\n", NAME); println!("Currently defined functions:"); + #[allow(clippy::map_clone)] let mut utils: Vec<&str> = cmap.keys().map(|&s| s).collect(); utils.sort(); for util in utils {