Update to sap v5

Author: morr0ne

Cargo.lock

@@ -26,4 +26,4 @@ rustix = { version = "1.0.7", features = [
     "fs",
     "stdio",
 ] }
-sap = "0.0.4"
+sap = "0.0.5"

Cargo.toml

@@ -12,7 +12,7 @@ pub fn main() -> Result {
     cli! {
         "cat", stdout, #error
         Value(value) => {
-            files.push(value.to_owned());
+            files.push(value.into_owned());
         }
     };
 
@@ -30,7 +30,7 @@ pub fn main() -> Result {
                 let mut stdin = BufReader::new(stdin());
                 io::copy(&mut stdin, &mut stdout)?;
             } else {
-                let mut reader = BufReader::new(File::open(&file_path)?); // Is it fine to error here? or should we keep going
+                let mut reader = BufReader::new(File::open(file_path)?); // Is it fine to error here? or should we keep going
                 io::copy(&mut reader, &mut stdout)?;
             }
         }

src/bin/cat.rs

@@ -5,7 +5,7 @@ use rustix::process::EXIT_FAILURE;
 use sap::Parser;
 
 pub fn main() -> Result {
-    let args = std::env::args_os();
+    let args = std::env::args();
 
     if args.len() == 2 {
         let mut stdout = stdout();

src/bin/false.rs

@@ -11,7 +11,7 @@ pub fn main() -> Result {
     cli! {
         "mkdir", stdout, #error
         Value(value) => {
-            dirs.push(value.to_owned()); // FIXME: I am not a fan of all this allocation but we can't easily move out of the argument parser
+            dirs.push(value.into_owned()); // FIXME: I am not a fan of all this allocation but we can't easily move out of the argument parser
         }
     };
 

src/bin/mkdir.rs

@@ -3,7 +3,7 @@ use sap::Parser;
 use std::io::stdout;
 
 pub fn main() -> Result {
-    let args = std::env::args_os();
+    let args = std::env::args();
 
     if args.len() == 2 {
         let mut stdout = stdout();

src/bin/true.rs

@@ -51,7 +51,7 @@ pub fn main() -> Result {
         Short('m') | Long("chars") => flags |= Flags::CHARS
         Short('c') | Long("bytes") => flags |= Flags::BYTES
         Value(value) => {
-            files.push(value.to_owned());
+            files.push(value.into_owned());
         }
     };
 
@@ -63,7 +63,7 @@ pub fn main() -> Result {
 
     // If no files, read from stdin
     if files.is_empty() {
-        files.push("-".to_string());
+        files.push("-".into());
     }
 
     for path in files {

src/bin/wc.rs

@@ -1,7 +1,6 @@
 use std::{
     borrow::Cow,
     io::{BufWriter, Write, stdout},
-    os::unix::ffi::OsStringExt,
 };
 
 use puppyutils::{Result, cli};
@@ -10,40 +9,40 @@ pub fn main() -> Result {
     // No point in locking stdout since we only use it once in this program
     let mut stdout = stdout();
 
-    let mut buffer: Option<Vec<u8>> = None;
+    let mut buffer = None;
 
     let arg_parser = cli! {
         "yes", stdout, #error
         Value(value) => {
-            extend_buffer(&mut buffer, value.as_bytes().to_vec());
+            extend_buffer(&mut buffer, value);
         }
     };
 
     arg_parser
         .into_inner()
-        .for_each(|arg| extend_buffer(&mut buffer, arg.into_vec()));
+        .for_each(|arg| extend_buffer(&mut buffer, arg.into()));
 
-    let output: Cow<'_, [u8]> = if let Some(mut buffer) = buffer {
-        buffer.push(b'\n');
+    let output = if let Some(mut buffer) = buffer {
+        buffer.push('\n');
         Cow::Owned(buffer)
     } else {
-        Cow::Borrowed(b"y\n")
+        Cow::Borrowed("y\n")
     };
 
     // Write everything to stdout, BufWriter will handle the buffering
     let mut stdout = BufWriter::new(stdout);
 
     loop {
-        stdout.write_all(&output)?;
+        stdout.write_all(output.as_bytes())?;
     }
 }
 
 #[inline]
-fn extend_buffer(buffer: &mut Option<Vec<u8>>, mut arg: Vec<u8>) {
+fn extend_buffer(buffer: &mut Option<String>, arg: Cow<'_, str>) {
     if let Some(buffer) = buffer {
-        buffer.push(b' '); // Manually put the space
-        buffer.append(&mut arg);
+        buffer.push(' '); // Manually put the space
+        buffer.push_str(arg.as_ref());
     } else {
-        *buffer = Some(arg)
+        *buffer = Some(arg.into_owned())
     }
 }