Prefix snapshot outputs with input language

Author: cwfitzgerald

naga/tests/snapshots.rs

@@ -3,6 +3,7 @@
 #![allow(dead_code, unused_imports)]
 
 use std::{
+    fmt::Write,
     fs,
     path::{Path, PathBuf},
 };
@@ -159,7 +160,7 @@ struct Input {
     ///
     /// If the subdirectory is omitted, we assume that the output goes
     /// to "wgsl".
-    subdirectory: Option<PathBuf>,
+    subdirectory: PathBuf,
 
     /// The input filename name, without a directory.
     file_name: PathBuf,
@@ -182,9 +183,9 @@ impl Input {
     /// The `input` path is interpreted relative to the `BASE_DIR_IN`
     /// subdirectory of the directory given by the `CARGO_MANIFEST_DIR`
     /// environment variable.
-    fn new(subdirectory: Option<&str>, name: &str, extension: &str) -> Input {
+    fn new(subdirectory: &str, name: &str, extension: &str) -> Input {
         Input {
-            subdirectory: subdirectory.map(PathBuf::from),
+            subdirectory: PathBuf::from(subdirectory),
             // Don't wipe out any extensions on `name`, as
             // `with_extension` would do.
             file_name: PathBuf::from(format!("{name}.{extension}")),
@@ -194,13 +195,11 @@ impl Input {
 
     /// Return an iterator that produces an `Input` for each entry in `subdirectory`.
     fn files_in_dir(
-        subdirectory: Option<&'static str>,
+        subdirectory: &'static str,
         file_extensions: &'static [&'static str],
     ) -> impl Iterator<Item = Input> + 'static {
-        let mut input_directory = Path::new(env!("CARGO_MANIFEST_DIR")).join(BASE_DIR_IN);
-        if let Some(ref subdirectory) = subdirectory {
-            input_directory.push(subdirectory);
-        }
+        let input_directory = Path::new(CRATE_ROOT).join(BASE_DIR_IN).join(subdirectory);
+
         let entries = match std::fs::read_dir(&input_directory) {
             Ok(entries) => entries,
             Err(err) => panic!(
@@ -237,14 +236,12 @@ impl Input {
     /// Return the path to the input directory.
     fn input_directory(&self) -> PathBuf {
         let mut dir = Path::new(CRATE_ROOT).join(BASE_DIR_IN);
-        if let Some(ref subdirectory) = self.subdirectory {
-            dir.push(subdirectory);
-        }
+        dir.push(&self.subdirectory);
         dir
     }
 
     /// Return the path to the output directory.
-    fn output_directory(&self, subdirectory: &str) -> PathBuf {
+    fn output_directory(subdirectory: &str) -> PathBuf {
         let mut dir = Path::new(CRATE_ROOT).join(BASE_DIR_OUT);
         dir.push(subdirectory);
         dir
@@ -258,14 +255,22 @@ impl Input {
     }
 
     fn output_path(&self, subdirectory: &str, extension: &str) -> PathBuf {
-        let mut output = self.output_directory(subdirectory);
+        let mut output = Self::output_directory(subdirectory);
         if self.keep_input_extension {
-            let mut file_name = self.file_name.as_os_str().to_owned();
-            file_name.push(".");
-            file_name.push(extension);
+            let mut file_name = String::new();
+            write!(&mut file_name, "{}", self.subdirectory.display()).unwrap();
+            file_name.push_str("-");
+            write!(&mut file_name, "{}", self.file_name.display()).unwrap();
+            file_name.push('.');
+            file_name.push_str(extension);
             output.push(&file_name);
         } else {
-            output.push(&self.file_name);
+            let mut file_name = String::new();
+            write!(&mut file_name, "{}", self.subdirectory.display()).unwrap();
+            file_name.push_str("-");
+            write!(&mut file_name, "{}", self.file_name.display()).unwrap();
+
+            output.push(&file_name);
             output.set_extension(extension);
         }
         output
@@ -771,7 +776,7 @@ fn write_output_wgsl(
 fn convert_snapshots_wgsl() {
     let _ = env_logger::try_init();
 
-    for input in Input::files_in_dir(Some("wgsl"), &["wgsl"]) {
+    for input in Input::files_in_dir("wgsl", &["wgsl"]) {
         let source = input.read_source();
         // crlf will make the large split output different on different platform
         let source = source.replace('\r', "");
@@ -792,7 +797,7 @@ fn convert_snapshots_spv() {
 
     let _ = env_logger::try_init();
 
-    for input in Input::files_in_dir(Some("spv"), &["spvasm"]) {
+    for input in Input::files_in_dir("spv", &["spvasm"]) {
         println!("Assembling '{}'", input.file_name.display());
 
         let command = Command::new("spirv-as")
@@ -840,7 +845,7 @@ fn convert_snapshots_spv() {
 fn convert_snapshots_glsl() {
     let _ = env_logger::try_init();
 
-    for input in Input::files_in_dir(Some("glsl"), &["vert", "frag", "comp"]) {
+    for input in Input::files_in_dir("glsl", &["vert", "frag", "comp"]) {
         let input = Input {
             keep_input_extension: true,
             ..input