[naga] Remove naga::path_like. Use String instead. (#8284)

Delete the `naga::path_like` module, and simply using `String` and
`str` instead.

Nothing in Naga uses `Path` or `PathBuf` methods; indeed, Naga only
converts these values back and forth from string-like types with
`to_string_lossy` and `into`, such that using string-like, rather than
path-like, types actually simplifies the code.

This also avoids dead code warnings starting in Rust 1.89 that would
otherwise require distracting `#[cfg_attr]` conditionals.

Author: jimblandy

naga-cli/src/bin/naga.rs

@@ -452,7 +452,7 @@ fn run() -> anyhow::Result<()> {
     params.spv_in = naga::front::spv::Options {
         adjust_coordinate_space: !args.keep_coordinate_space,
         strict_capabilities: false,
-        block_ctx_dump_prefix: args.block_ctx_dir.clone().map(Into::into),
+        block_ctx_dump_prefix: args.block_ctx_dir.clone(),
     };
 
     params.entry_point.clone_from(&args.entry_point);
@@ -482,7 +482,7 @@ fn run() -> anyhow::Result<()> {
     params.compact = args.compact;
 
     if args.bulk_validate {
-        return bulk_validate(args, &params);
+        return bulk_validate(&args, &params);
     }
 
     let mut files = args.files.iter();
@@ -498,6 +498,8 @@ fn run() -> anyhow::Result<()> {
         return Err(CliError("Input file path is not specified").into());
     };
 
+    let file_name = input_path.to_string_lossy();
+
     params.input_kind = args.input_kind;
     params.shader_stage = args.shader_stage;
 
@@ -516,7 +518,7 @@ fn run() -> anyhow::Result<()> {
                 .set(naga::back::spv::WriterFlags::DEBUG, true);
             params.spv_out.debug_info = Some(naga::back::spv::DebugInfo {
                 source_code: input_text,
-                file_name: input_path.into(),
+                file_name: &file_name,
                 language,
             })
         } else {
@@ -913,9 +915,9 @@ fn write_output(
     Ok(())
 }
 
-fn bulk_validate(args: Args, params: &Parameters) -> anyhow::Result<()> {
+fn bulk_validate(args: &Args, params: &Parameters) -> anyhow::Result<()> {
     let mut invalid = vec![];
-    for input_path in args.files {
+    for input_path in &args.files {
         let path = Path::new(&input_path);
         let input = fs::read(path)?;
 

naga/src/back/spv/mod.rs

@@ -26,7 +26,6 @@ use spirv::Word;
 use thiserror::Error;
 
 use crate::arena::{Handle, HandleVec};
-use crate::path_like::PathLikeRef;
 use crate::proc::{BoundsCheckPolicies, TypeResolution};
 
 #[derive(Clone)]
@@ -96,7 +95,7 @@ impl IdGenerator {
 #[derive(Debug, Clone)]
 pub struct DebugInfo<'a> {
     pub source_code: &'a str,
-    pub file_name: PathLikeRef<'a>,
+    pub file_name: &'a str,
     pub language: SourceLanguage,
 }
 

naga/src/back/spv/writer.rs

@@ -14,7 +14,6 @@ use super::{
 use crate::{
     arena::{Handle, HandleVec, UniqueArena},
     back::spv::{BindingInfo, WrappedFunction},
-    path_like::PathLike,
     proc::{Alignment, TypeResolution},
     valid::{FunctionInfo, ModuleInfo},
 };
@@ -2519,10 +2518,8 @@ impl Writer {
         if self.flags.contains(WriterFlags::DEBUG) {
             if let Some(debug_info) = debug_info.as_ref() {
                 let source_file_id = self.id_gen.next();
-                self.debugs.push(Instruction::string(
-                    &debug_info.file_name.to_string_lossy(),
-                    source_file_id,
-                ));
+                self.debugs
+                    .push(Instruction::string(debug_info.file_name, source_file_id));
 
                 debug_info_inner = Some(DebugInfoInner {
                     source_code: debug_info.source_code,

naga/src/front/spv/mod.rs

@@ -44,7 +44,6 @@ use petgraph::graphmap::GraphMap;
 use super::atomic_upgrade::Upgrades;
 use crate::{
     arena::{Arena, Handle, UniqueArena},
-    path_like::PathLikeOwned,
     proc::{Alignment, Layouter},
     FastHashMap, FastHashSet, FastIndexMap,
 };
@@ -384,7 +383,7 @@ pub struct Options {
     pub adjust_coordinate_space: bool,
     /// Only allow shaders with the known set of capabilities.
     pub strict_capabilities: bool,
-    pub block_ctx_dump_prefix: Option<PathLikeOwned>,
+    pub block_ctx_dump_prefix: Option<String>,
 }
 
 impl Default for Options {

naga/src/lib.rs

@@ -116,7 +116,6 @@ pub mod front;
 pub mod ir;
 pub mod keywords;
 mod non_max_u32;
-mod path_like;
 pub mod proc;
 mod racy_lock;
 mod span;

naga/src/path_like.rs

@@ -6,7 +6,7 @@ use alloc::{
 };
 use core::{error::Error, fmt, ops::Range};
 
-use crate::{error::replace_control_chars, path_like::PathLike, Arena, Handle, UniqueArena};
+use crate::{error::replace_control_chars, Arena, Handle, UniqueArena};
 
 /// A source code span, used for error reporting.
 #[derive(Clone, Copy, Debug, PartialEq, Default)]
@@ -283,14 +283,12 @@ impl<E> WithSpan<E> {
 
     /// Emits a summary of the error to standard error stream.
     #[cfg(feature = "stderr")]
-    pub fn emit_to_stderr_with_path<P>(&self, source: &str, path: P)
+    pub fn emit_to_stderr_with_path(&self, source: &str, path: &str)
     where
         E: Error,
-        P: PathLike,
     {
         use codespan_reporting::{files, term};
 
-        let path = path.to_string_lossy();
         let files = files::SimpleFile::new(path, replace_control_chars(source));
         let config = term::Config::default();
 
@@ -315,14 +313,12 @@ impl<E> WithSpan<E> {
     }
 
     /// Emits a summary of the error to a string.
-    pub fn emit_to_string_with_path<P>(&self, source: &str, path: P) -> String
+    pub fn emit_to_string_with_path(&self, source: &str, path: &str) -> String
     where
         E: Error,
-        P: PathLike,
     {
         use codespan_reporting::{files, term};
 
-        let path = path.to_string_lossy();
         let files = files::SimpleFile::new(path, replace_control_chars(source));
         let config = term::Config::default();