From 6003d959746a6dadecbd1c6479baa9fff73d1d39 Mon Sep 17 00:00:00 2001
From: Jeong YunWon <jeong@youknowone.org>
Date: Fri, 11 Jun 2021 21:59:16 +0900
Subject: [PATCH 1/2] comm: clean up line-end check

---
 src/uu/comm/src/comm.rs | 5 ++---
 1 file changed, 2 insertions(+), 3 deletions(-)

diff --git a/src/uu/comm/src/comm.rs b/src/uu/comm/src/comm.rs
index f7190fb73..7a6086bb5 100644
--- a/src/uu/comm/src/comm.rs
+++ b/src/uu/comm/src/comm.rs
@@ -50,9 +50,8 @@ fn mkdelim(col: usize, opts: &ArgMatches) -> String {
 }
 
 fn ensure_nl(line: &mut String) {
-    match line.chars().last() {
-        Some('\n') => (),
-        _ => line.push('\n'),
+    if !line.ends_with('\n') {
+        line.push('\n');
     }
 }
 

From 6734d5df932f07b764c0c50640688e08adc5482a Mon Sep 17 00:00:00 2001
From: Jeong YunWon <jeong@youknowone.org>
Date: Fri, 11 Jun 2021 19:51:55 +0900
Subject: [PATCH 2/2] basename: trim separators with function

---
 src/uu/basename/src/basename.rs | 9 +--------
 1 file changed, 1 insertion(+), 8 deletions(-)

diff --git a/src/uu/basename/src/basename.rs b/src/uu/basename/src/basename.rs
index 47ad3117f..098a3e2b2 100644
--- a/src/uu/basename/src/basename.rs
+++ b/src/uu/basename/src/basename.rs
@@ -118,14 +118,7 @@ pub fn uumain(args: impl uucore::Args) -> i32 {
 
 fn basename(fullname: &str, suffix: &str) -> String {
     // Remove all platform-specific path separators from the end
-    let mut path: String = fullname
-        .chars()
-        .rev()
-        .skip_while(|&ch| is_separator(ch))
-        .collect();
-
-    // Undo reverse
-    path = path.chars().rev().collect();
+    let path = fullname.trim_end_matches(is_separator);
 
     // Convert to path buffer and get last path component
     let pb = PathBuf::from(path);