From 19e967ef31e4ccbc0da9f12690f51bc897802600 Mon Sep 17 00:00:00 2001 From: 16yuki0702 Date: Wed, 26 Aug 2020 16:42:27 +0900 Subject: [PATCH] ls: deleting user defined max function (#1591) This is trivial refactor. ```usize``` can call max method, so deleting user defined max function. --- src/uu/ls/src/ls.rs | 12 ++---------- 1 file changed, 2 insertions(+), 10 deletions(-) diff --git a/src/uu/ls/src/ls.rs b/src/uu/ls/src/ls.rs index d69ed4254..d6c7d0d7b 100644 --- a/src/uu/ls/src/ls.rs +++ b/src/uu/ls/src/ls.rs @@ -271,14 +271,6 @@ fn sort_entries(entries: &mut Vec, options: &getopts::Matches) { } } -fn max(lhs: usize, rhs: usize) -> usize { - if lhs > rhs { - lhs - } else { - rhs - } -} - fn should_display(entry: &DirEntry, options: &getopts::Matches) -> bool { let ffi_name = entry.file_name(); let name = ffi_name.to_string_lossy(); @@ -350,8 +342,8 @@ fn display_items(items: &[PathBuf], strip: Option<&Path>, options: &getopts::Mat let (mut max_links, mut max_size) = (1, 1); for item in items { let (links, size) = display_dir_entry_size(item, options); - max_links = max(links, max_links); - max_size = max(size, max_size); + max_links = links.max(max_links); + max_size = size.max(max_size); } for item in items { display_item_long(item, strip, max_links, max_size, options);