Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
10 changes: 8 additions & 2 deletions crates/spirv-builder/src/cargo_cmd.rs
Original file line number Diff line number Diff line change
@@ -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;

Expand Down Expand Up @@ -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)
Expand All @@ -116,6 +116,12 @@ impl Display for CargoCmd {
}
}

impl From<CargoCmd> for Command {
fn from(cmd: CargoCmd) -> Self {
cmd.cargo
}
}

impl Deref for CargoCmd {
type Target = Command;

Expand Down
2 changes: 1 addition & 1 deletion crates/spirv-builder/src/lib.rs
Original file line number Diff line number Diff line change
Expand Up @@ -1059,7 +1059,7 @@ fn invoke_rustc(builder: &SpirvBuilder) -> Result<PathBuf, SpirvBuilderError> {
);

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
Expand Down