Skip to content
Merged
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
11 changes: 5 additions & 6 deletions crates/spirv-builder/src/lib.rs
Original file line number Diff line number Diff line change
Expand Up @@ -129,6 +129,10 @@ pub enum SpirvBuilderError {
MetadataFileMissing(#[from] std::io::Error),
#[error("unable to parse multi-module metadata file")]
MetadataFileMalformed(#[from] serde_json::Error),
#[error(
"`{ARTIFACT_SUFFIX}` artifact not found in (supposedly successful) build output.\n--- build output ---\n{stdout}"
)]
NoArtifactProduced { stdout: String },
#[error("cargo metadata error")]
CargoMetadata(#[from] cargo_metadata::Error),
#[cfg(feature = "watch")]
Expand Down Expand Up @@ -1096,12 +1100,7 @@ fn invoke_rustc(builder: &SpirvBuilder) -> Result<PathBuf, SpirvBuilderError> {
// that ended up on stdout instead of stderr.
let stdout = String::from_utf8(build.stdout).unwrap();
if build.status.success() {
get_sole_artifact(&stdout).ok_or_else(|| {
eprintln!("--- build output ---\n{stdout}");
panic!(
"`{ARTIFACT_SUFFIX}` artifact not found in (supposedly successful) build output (see above). Verify that `crate-type` is set correctly"
);
})
get_sole_artifact(&stdout).ok_or(SpirvBuilderError::NoArtifactProduced { stdout })
} else {
Err(SpirvBuilderError::BuildFailed)
}
Expand Down