From 337460d299e59552620d4a9cc3de3a8cf067a4f8 Mon Sep 17 00:00:00 2001 From: mo8it Date: Fri, 9 Aug 2024 00:12:49 +0200 Subject: [PATCH] Check the status of the `cargo metadata` command --- src/cmd.rs | 16 ++++++++++------ 1 file changed, 10 insertions(+), 6 deletions(-) diff --git a/src/cmd.rs b/src/cmd.rs index ba6ec894..a10a7eaa 100644 --- a/src/cmd.rs +++ b/src/cmd.rs @@ -1,4 +1,4 @@ -use anyhow::{Context, Result}; +use anyhow::{bail, Context, Result}; use serde::Deserialize; use std::{ io::Read, @@ -68,12 +68,16 @@ impl CmdRunner { .stdin(Stdio::null()) .stderr(Stdio::inherit()) .output() - .context(CARGO_METADATA_ERR)? - .stdout; + .context(CARGO_METADATA_ERR)?; - let target_dir = serde_json::de::from_slice::(&metadata_output) - .context("Failed to read the field `target_directory` from the `cargo metadata` output") - .map(|metadata| metadata.target_directory)?; + if !metadata_output.status.success() { + bail!("The command `cargo metadata …` failed. Are you in the `rustlings/` directory?"); + } + + let target_dir = serde_json::de::from_slice::(&metadata_output.stdout) + .context( + "Failed to read the field `target_directory` from the output of the command `cargo metadata …`", + )?.target_directory; Ok(Self { target_dir }) }