Replace trait IntoOsString with AsOsStr

to make std::path::Path also work

Author: tao-guo

macros/src/lexer.rs

@@ -64,7 +64,7 @@ pub fn scan_str_lit(lit: &Literal) -> TokenStream {
             }
             if !var.is_empty() {
                 let var = syn::parse_str::<Ident>(&var).unwrap();
-                output.extend(quote!(.append(&#var.into_os_string())));
+                output.extend(quote!(.append(#var.as_os_str())));
             } else {
                 output.extend(quote!(.append(&"$")));
             }
@@ -365,7 +365,7 @@ impl Lexer {
         let peek_no_gap = self.iter.peek_no_gap().map(|tt| tt.to_owned());
         // let peek_no_gap = None;
         if let Some(TokenTree::Ident(var)) = peek_no_gap {
-            self.extend_last_arg(quote!(&#var.into_os_string()));
+            self.extend_last_arg(quote!(#var.as_os_str()));
         } else if let Some(TokenTree::Group(g)) = peek_no_gap {
             if g.delimiter() != Delimiter::Brace && g.delimiter() != Delimiter::Bracket {
                 abort!(
@@ -382,7 +382,7 @@ impl Lexer {
                         abort!(span, "more than one variable in grouping");
                     }
                     if g.delimiter() == Delimiter::Brace {
-                        self.extend_last_arg(quote!(&#var.into_os_string()));
+                        self.extend_last_arg(quote!(#var.as_os_str()));
                     } else {
                         if !self.last_arg_str.is_empty() {
                             abort!(span, "vector variable can only be used alone");

macros/src/lib.rs

@@ -140,7 +140,7 @@ pub fn use_builtin_cmd(item: proc_macro::TokenStream) -> proc_macro::TokenStream
 pub fn run_cmd(input: proc_macro::TokenStream) -> proc_macro::TokenStream {
     let cmds = lexer::Lexer::new(input.into()).scan().parse(false);
     quote! ({
-        use ::cmd_lib::IntoOsString;
+        use ::cmd_lib::AsOsStr;
         #cmds.run_cmd()
     })
     .into()
@@ -162,7 +162,7 @@ pub fn run_cmd(input: proc_macro::TokenStream) -> proc_macro::TokenStream {
 pub fn run_fun(input: proc_macro::TokenStream) -> proc_macro::TokenStream {
     let cmds = lexer::Lexer::new(input.into()).scan().parse(false);
     quote! ({
-        use ::cmd_lib::IntoOsString;
+        use ::cmd_lib::AsOsStr;
         #cmds.run_fun()
     })
     .into()
@@ -184,7 +184,7 @@ pub fn run_fun(input: proc_macro::TokenStream) -> proc_macro::TokenStream {
 pub fn spawn(input: proc_macro::TokenStream) -> proc_macro::TokenStream {
     let cmds = lexer::Lexer::new(input.into()).scan().parse(true);
     quote! ({
-        use ::cmd_lib::IntoOsString;
+        use ::cmd_lib::AsOsStr;
         #cmds.spawn()
     })
     .into()
@@ -196,7 +196,7 @@ pub fn spawn(input: proc_macro::TokenStream) -> proc_macro::TokenStream {
 pub fn cmd_error(input: proc_macro::TokenStream) -> proc_macro::TokenStream {
     let msg = parse_msg(input.into());
     quote!({
-        use ::cmd_lib::IntoOsString;
+        use ::cmd_lib::AsOsStr;
         ::cmd_lib::log::error!("{}", #msg)
     })
     .into()
@@ -208,7 +208,7 @@ pub fn cmd_error(input: proc_macro::TokenStream) -> proc_macro::TokenStream {
 pub fn cmd_warn(input: proc_macro::TokenStream) -> proc_macro::TokenStream {
     let msg = parse_msg(input.into());
     quote!({
-        use ::cmd_lib::IntoOsString;
+        use ::cmd_lib::AsOsStr;
         ::cmd_lib::log::warn!("{}", #msg)
     })
     .into()
@@ -220,7 +220,7 @@ pub fn cmd_warn(input: proc_macro::TokenStream) -> proc_macro::TokenStream {
 pub fn cmd_echo(input: proc_macro::TokenStream) -> proc_macro::TokenStream {
     let msg = parse_msg(input.into());
     quote!({
-        use ::cmd_lib::IntoOsString;
+        use ::cmd_lib::AsOsStr;
         println!("{}", #msg)
     })
     .into()
@@ -241,7 +241,7 @@ pub fn cmd_echo(input: proc_macro::TokenStream) -> proc_macro::TokenStream {
 pub fn cmd_info(input: proc_macro::TokenStream) -> proc_macro::TokenStream {
     let msg = parse_msg(input.into());
     quote!({
-        use ::cmd_lib::IntoOsString;
+        use ::cmd_lib::AsOsStr;
         ::cmd_lib::log::info!("{}", #msg)
     })
     .into()
@@ -253,7 +253,7 @@ pub fn cmd_info(input: proc_macro::TokenStream) -> proc_macro::TokenStream {
 pub fn cmd_debug(input: proc_macro::TokenStream) -> proc_macro::TokenStream {
     let msg = parse_msg(input.into());
     quote!({
-        use ::cmd_lib::IntoOsString;
+        use ::cmd_lib::AsOsStr;
         ::cmd_lib::log::debug!("{}", #msg)
     })
     .into()
@@ -265,7 +265,7 @@ pub fn cmd_debug(input: proc_macro::TokenStream) -> proc_macro::TokenStream {
 pub fn cmd_trace(input: proc_macro::TokenStream) -> proc_macro::TokenStream {
     let msg = parse_msg(input.into());
     quote!({
-        use ::cmd_lib::IntoOsString;
+        use ::cmd_lib::AsOsStr;
         ::cmd_lib::log::trace!("{}", #msg)
     })
     .into()
@@ -290,7 +290,7 @@ pub fn cmd_trace(input: proc_macro::TokenStream) -> proc_macro::TokenStream {
 pub fn cmd_die(input: proc_macro::TokenStream) -> proc_macro::TokenStream {
     let msg = parse_msg(input.into());
     quote!({
-        use ::cmd_lib::IntoOsString;
+        use ::cmd_lib::AsOsStr;
         ::cmd_lib::log::error!("FATAL: {}", #msg);
         std::process::exit(1)
     })

src/lib.rs

@@ -337,8 +337,7 @@ pub use child::CmdChildren;
 pub use log;
 pub use logger::init_builtin_logger;
 pub use process::{
-    export_cmd, set_debug, set_pipefail, Cmd, CmdEnv, CmdString, Cmds, GroupCmds, IntoOsString,
-    Redirect,
+    export_cmd, set_debug, set_pipefail, AsOsStr, Cmd, CmdEnv, CmdString, Cmds, GroupCmds, Redirect,
 };
 
 mod builtins;

src/process.rs

@@ -1,4 +1,3 @@
-#![allow(clippy::wrong_self_convention)]
 use crate::child::{CmdChild, CmdChildren};
 use crate::io::{CmdIn, CmdOut};
 use crate::{builtin_true, CmdResult, FunResult};
@@ -536,12 +535,12 @@ impl Cmd {
 }
 
 #[doc(hidden)]
-pub trait IntoOsString {
-    fn into_os_string(&self) -> OsString;
+pub trait AsOsStr {
+    fn as_os_str(&self) -> OsString;
 }
 
-impl<T: ToString> IntoOsString for T {
-    fn into_os_string(&self) -> OsString {
+impl<T: ToString> AsOsStr for T {
+    fn as_os_str(&self) -> OsString {
         OsString::from(self.to_string())
     }
 }

tests/test_macros.rs

@@ -268,6 +268,9 @@ fn test_buitin_stdout_redirect() {
 
 #[test]
 fn test_path_as_var() {
-    let dir = std::path::PathBuf::from("/");
+    let dir = std::path::Path::new("/");
     assert_eq!("/", run_fun!(cd $dir; pwd).unwrap());
+
+    let dir2 = std::path::PathBuf::from("/");
+    assert_eq!("/", run_fun!(cd $dir2; pwd).unwrap());
 }