fix(*): more direct Intos

Author: Elsie19

brush-builtins/src/printf.rs

@@ -1,5 +1,5 @@
 use clap::Parser;
-use std::{io::Write, ops::ControlFlow};
+use std::{ffi::OsString, io::Write, ops::ControlFlow};
 use uucore::format;
 
 use brush_core::{Error, ErrorKind, ExecutionResult, builtins, escape, expansion};
@@ -83,12 +83,12 @@ fn format_special_case_for_percent_q(
 
 fn format_via_uucore(
     format_string: &str,
-    args: impl Iterator<Item = impl AsRef<str>>,
+    args: impl Iterator<Item = impl Into<OsString>>,
     mut writer: impl Write,
 ) -> Result<(), brush_core::Error> {
     // Convert string arguments to FormatArgument::Unparsed
     let format_args: Vec<_> = args
-        .map(|s| format::FormatArgument::Unparsed(s.as_ref().to_string().into()))
+        .map(|s| format::FormatArgument::Unparsed(s.into()))
         .collect();
 
     // Parse format string once.
@@ -149,7 +149,7 @@ mod tests {
 
     fn sprintf_via_uucore(
         format_string: &str,
-        args: impl Iterator<Item = impl AsRef<str>>,
+        args: impl Iterator<Item = impl Into<OsString>>,
     ) -> Result<String> {
         let mut result = vec![];
         format_via_uucore(format_string, args, &mut result)?;

brush-core/src/pathcache.rs

@@ -32,8 +32,8 @@ impl PathCache {
     ///
     /// * `name` - The name to set.
     /// * `path` - The path to associate with the name.
-    pub fn set<S: AsRef<str>>(&mut self, name: S, path: PathBuf) {
-        self.cache.insert(name.as_ref().to_string(), path);
+    pub fn set<T: Into<String>>(&mut self, name: T, path: PathBuf) {
+        self.cache.insert(name.into(), path);
     }
 
     /// Projects the cache into a shell value.

brush-core/src/pathsearch.rs

@@ -5,11 +5,7 @@ use std::{collections::VecDeque, path::PathBuf};
 use crate::sys::fs::PathExt;
 
 /// Encapsulates the result of a path search.
-pub struct ExecutablePathSearch<PI, N>
-where
-    PI: AsRef<str>,
-    N: AsRef<str>,
-{
+pub struct ExecutablePathSearch<PI, N> {
     paths: VecDeque<PI>,
     filename: N,
 }
@@ -33,10 +29,7 @@ where
     }
 }
 
-pub(crate) struct ExecutablePathPrefixSearch<PI>
-where
-    PI: AsRef<str>,
-{
+pub(crate) struct ExecutablePathPrefixSearch<PI> {
     paths: VecDeque<PI>,
     queued_items: VecDeque<PathBuf>,
     filename_prefix: String,

brush-core/src/shell.rs

@@ -964,7 +964,7 @@ impl<SE: extensions::ShellExtensions> Shell<SE> {
     /// * `path` - The path to the file to source.
     /// * `args` - The arguments to pass to the script as positional parameters.
     /// * `params` - Execution parameters.
-    pub async fn source_script<S: AsRef<str>, P: AsRef<Path>, I: Iterator<Item = S>>(
+    pub async fn source_script<S: Into<String>, P: AsRef<Path>, I: Iterator<Item = S>>(
         &mut self,
         path: P,
         args: I,
@@ -987,7 +987,11 @@ impl<SE: extensions::ShellExtensions> Shell<SE> {
     /// * `args` - The arguments to pass to the script as positional parameters.
     /// * `params` - Execution parameters.
     /// * `call_type` - The type of script call being made.
-    async fn parse_and_execute_script_file<S: AsRef<str>, P: AsRef<Path>, I: Iterator<Item = S>>(
+    async fn parse_and_execute_script_file<
+        S: Into<String>,
+        P: AsRef<Path>,
+        I: Iterator<Item = S>,
+    >(
         &mut self,
         path: P,
         args: I,
@@ -1040,7 +1044,7 @@ impl<SE: extensions::ShellExtensions> Shell<SE> {
     /// * `args` - The arguments to pass to the script as positional parameters.
     /// * `params` - Execution parameters.
     /// * `call_type` - The type of script call being made.
-    async fn source_file<F: Read, S: AsRef<str>, I: Iterator<Item = S>>(
+    async fn source_file<F: Read, S: Into<String>, I: Iterator<Item = S>>(
         &mut self,
         file: F,
         source_info: &crate::SourceInfo,
@@ -1054,7 +1058,7 @@ impl<SE: extensions::ShellExtensions> Shell<SE> {
         tracing::debug!(target: trace_categories::PARSE, "Parsing sourced file: {}", source_info.source);
         let parse_result = parser.parse_program();
 
-        let script_positional_args = args.map(|s| s.as_ref().to_owned());
+        let script_positional_args = args.map(Into::into);
 
         self.call_stack
             .push_script(call_type, source_info, script_positional_args);
@@ -1195,7 +1199,7 @@ impl<SE: extensions::ShellExtensions> Shell<SE> {
     ///
     /// * `script_path` - The path to the script file to execute.
     /// * `args` - The arguments to pass to the script as positional parameters.
-    pub async fn run_script<S: AsRef<str>, P: AsRef<Path>, I: Iterator<Item = S>>(
+    pub async fn run_script<S: Into<String>, P: AsRef<Path>, I: Iterator<Item = S>>(
         &mut self,
         script_path: P,
         args: I,
@@ -1690,15 +1694,16 @@ impl<SE: extensions::ShellExtensions> Shell<SE> {
     /// # Arguments
     ///
     /// * `candidate_name` - The name of the file to look for.
-    pub fn find_first_executable_in_path_using_cache<S: AsRef<str>>(
+    pub fn find_first_executable_in_path_using_cache<T: Into<String>>(
         &mut self,
-        candidate_name: S,
+        candidate_name: T,
     ) -> Option<PathBuf> {
+        let candidate_name = candidate_name.into();
         if let Some(cached_path) = self.program_location_cache.get(&candidate_name) {
             Some(cached_path)
         } else if let Some(found_path) = self.find_first_executable_in_path(&candidate_name) {
             self.program_location_cache
-                .set(&candidate_name, found_path.clone());
+                .set(candidate_name, found_path.clone());
             Some(found_path)
         } else {
             None