Implement review suggestions

Author: yannham

cli/tests/integration/inputs/mixed_formats.ncl

@@ -996,7 +996,7 @@ impl<'a> Pretty<'a, Allocator> for &Node<'_> {
                     "import",
                     allocator.space(),
                     allocator.as_string(path.to_string_lossy()).double_quotes(),
-                    if Some(*format) != InputFormat::from_path(std::path::Path::new(path)) {
+                    if Some(*format) != InputFormat::from_path(path) {
                         docs![
                             allocator,
                             allocator.space(),

cli/tests/snapshot/snapshots/snapshot__export_stdout_mixed_formats.ncl.snap

@@ -68,8 +68,8 @@ pub enum InputFormat {
 
 impl InputFormat {
     /// Returns an [InputFormat] based on the file extension of a path.
-    pub fn from_path(path: &Path) -> Option<InputFormat> {
-        match path.extension().and_then(OsStr::to_str) {
+    pub fn from_path(path: impl AsRef<Path>) -> Option<InputFormat> {
+        match path.as_ref().extension().and_then(OsStr::to_str) {
             Some("ncl") => Some(InputFormat::Nickel),
             Some("json") => Some(InputFormat::Json),
             Some("yaml") | Some("yml") => Some(InputFormat::Yaml),

core/src/bytecode/pretty.rs

@@ -395,8 +395,7 @@ pub fn mk_import_based_on_filename(
     _span: RawSpan,
 ) -> Result<Node<'_>, ParseError> {
     let path = OsString::from(path);
-    let format: Option<InputFormat> =
-        InputFormat::from_path(std::path::Path::new(path.as_os_str()));
+    let format: Option<InputFormat> = InputFormat::from_path(&path);
 
     // Fall back to InputFormat::Nickel in case of unknown filename extension for backwards compatiblilty.
     let format = format.unwrap_or_default();

core/src/cache.rs

@@ -1158,9 +1158,7 @@ impl<'a> Pretty<'a, Allocator> for &Term {
                     "import",
                     allocator.space(),
                     allocator.as_string(path.to_string_lossy()).double_quotes(),
-                    if Some(*format)
-                        != InputFormat::from_path(std::path::Path::new(path.as_os_str()))
-                    {
+                    if Some(*format) != InputFormat::from_path(path) {
                         docs![
                             allocator,
                             allocator.space(),

core/src/parser/utils.rs

@@ -286,7 +286,7 @@ impl<EC: EvalCache> Program<EC> {
         let main_id = match input {
             Input::Path(path) => {
                 let path = path.into();
-                let format = InputFormat::from_path(Path::new(&path)).unwrap_or_default();
+                let format = InputFormat::from_path(&path).unwrap_or_default();
                 cache.sources.add_file(path, format)?
             }
             Input::Source(source, name) => {
@@ -332,7 +332,7 @@ impl<EC: EvalCache> Program<EC> {
             .map(|input| match input {
                 Input::Path(path) => {
                     let path = path.into();
-                    let format = InputFormat::from_path(Path::new(&path)).unwrap_or_default();
+                    let format = InputFormat::from_path(&path).unwrap_or_default();
 
                     RichTerm::from(Term::Import(Import::Path { path, format }))
                 }