diff --git a/crates/spirv-builder/src/cargo_cmd.rs b/crates/spirv-builder/src/cargo_cmd.rs index a4855701cf..cd4a8709c4 100644 --- a/crates/spirv-builder/src/cargo_cmd.rs +++ b/crates/spirv-builder/src/cargo_cmd.rs @@ -1,7 +1,7 @@ use std::collections::HashSet; use std::env; use std::ffi::{OsStr, OsString}; -use std::fmt::{Display, Formatter}; +use std::fmt::{Debug, Display, Formatter}; use std::ops::{Deref, DerefMut}; use std::process::Command; @@ -107,7 +107,7 @@ impl Default for CargoCmd { } } -impl Display for CargoCmd { +impl Debug for CargoCmd { fn fmt(&self, f: &mut Formatter<'_>) -> std::fmt::Result { f.debug_struct("CargoCmd") .field("cargo", &self.cargo) @@ -116,6 +116,12 @@ impl Display for CargoCmd { } } +impl From for Command { + fn from(cmd: CargoCmd) -> Self { + cmd.cargo + } +} + impl Deref for CargoCmd { type Target = Command; diff --git a/crates/spirv-builder/src/lib.rs b/crates/spirv-builder/src/lib.rs index 51cc8d8f2a..8a9754c516 100644 --- a/crates/spirv-builder/src/lib.rs +++ b/crates/spirv-builder/src/lib.rs @@ -1059,7 +1059,7 @@ fn invoke_rustc(builder: &SpirvBuilder) -> Result { ); cargo.stderr(Stdio::inherit()).current_dir(path_to_crate); - log::debug!("building shaders with `{cargo}`"); + log::debug!("building shaders with `{cargo:?}`"); let build = cargo.output().expect("failed to execute cargo build"); // `get_last_artifact` has the side-effect of printing invalid lines, so