diff --git a/src/uu/pgrep/src/process_matcher.rs b/src/uu/pgrep/src/process_matcher.rs index c991092d..e82ef1af 100644 --- a/src/uu/pgrep/src/process_matcher.rs +++ b/src/uu/pgrep/src/process_matcher.rs @@ -405,9 +405,9 @@ fn process_flag_o_n( .collect::>(); if settings.newest { - filtered.sort_by(|a, b| b.pid.cmp(&a.pid)); + filtered.sort_by_key(|b| std::cmp::Reverse(b.pid)); } else { - filtered.sort_by(|a, b| a.pid.cmp(&b.pid)); + filtered.sort_by_key(|a| a.pid); } vec![filtered.first().cloned().unwrap().clone()] diff --git a/src/uu/pmap/src/smaps_format_parser.rs b/src/uu/pmap/src/smaps_format_parser.rs index f4789165..1ece26cd 100644 --- a/src/uu/pmap/src/smaps_format_parser.rs +++ b/src/uu/pmap/src/smaps_format_parser.rs @@ -316,10 +316,8 @@ pub fn parse_smaps(contents: &str) -> Result { let val = val.strip_suffix(" kB").unwrap_or(val); let val = get_smap_item_value(val)?; match key { - pmap_field_name::SIZE => { - if smap_entry.map_line.size_in_kb != val { - return Err(Error::from(ErrorKind::InvalidData)); - } + pmap_field_name::SIZE if smap_entry.map_line.size_in_kb != val => { + return Err(Error::from(ErrorKind::InvalidData)); } pmap_field_name::KERNEL_PAGE_SIZE => { smap_entry.kernel_page_size_in_kb = val; diff --git a/src/uu/ps/src/sorting.rs b/src/uu/ps/src/sorting.rs index bed49467..5e90d0a8 100644 --- a/src/uu/ps/src/sorting.rs +++ b/src/uu/ps/src/sorting.rs @@ -13,5 +13,5 @@ pub(crate) fn sort(input: &mut [ProcessInformation], _matches: &ArgMatches) { /// Sort by pid. (Default) fn sort_by_pid(input: &mut [ProcessInformation]) { - input.sort_by(|a, b| a.pid.cmp(&b.pid)); + input.sort_by_key(|a| a.pid); }