From 0835fc61ebbda4159667765b13664d3bf743669c Mon Sep 17 00:00:00 2001
From: Daniel Hofstetter <daniel.hofstetter@42dh.com>
Date: Sat, 7 Jun 2025 16:54:34 +0200
Subject: [PATCH 1/2] uname: print OS last

---
 src/uu/uname/src/uname.rs | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/uu/uname/src/uname.rs b/src/uu/uname/src/uname.rs
index d89f0d93f..c5eec4ef3 100644
--- a/src/uu/uname/src/uname.rs
+++ b/src/uu/uname/src/uname.rs
@@ -45,9 +45,9 @@ impl UNameOutput {
             self.kernel_release.as_ref(),
             self.kernel_version.as_ref(),
             self.machine.as_ref(),
-            self.os.as_ref(),
             self.processor.as_ref(),
             self.hardware_platform.as_ref(),
+            self.os.as_ref(),
         ]
         .into_iter()
         .flatten()

From 05bcb65b269383c481e5cfcf7015ee8dbc5494a3 Mon Sep 17 00:00:00 2001
From: Daniel Hofstetter <daniel.hofstetter@42dh.com>
Date: Sat, 7 Jun 2025 17:42:28 +0200
Subject: [PATCH 2/2] uname: remove unnecessary mut & trim_end() call

---
 src/uu/uname/src/uname.rs | 13 +++++--------
 1 file changed, 5 insertions(+), 8 deletions(-)

diff --git a/src/uu/uname/src/uname.rs b/src/uu/uname/src/uname.rs
index c5eec4ef3..2a0c3fe6a 100644
--- a/src/uu/uname/src/uname.rs
+++ b/src/uu/uname/src/uname.rs
@@ -38,8 +38,7 @@ pub struct UNameOutput {
 
 impl UNameOutput {
     fn display(&self) -> String {
-        let mut output = String::new();
-        for name in [
+        [
             self.kernel_name.as_ref(),
             self.nodename.as_ref(),
             self.kernel_release.as_ref(),
@@ -51,11 +50,9 @@ impl UNameOutput {
         ]
         .into_iter()
         .flatten()
-        {
-            output.push_str(name);
-            output.push(' ');
-        }
-        output
+        .map(|name| name.as_str())
+        .collect::<Vec<_>>()
+        .join(" ")
     }
 
     pub fn new(opts: &Options) -> UResult<Self> {
@@ -138,7 +135,7 @@ pub fn uumain(args: impl uucore::Args) -> UResult<()> {
         os: matches.get_flag(options::OS),
     };
     let output = UNameOutput::new(&options)?;
-    println!("{}", output.display().trim_end());
+    println!("{}", output.display());
     Ok(())
 }