Skip to content

fix parsing of cargo locate-project output #2452

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
senekor merged 3 commits into from
Sep 29, 2026
Merged

fix parsing of cargo locate-project output #2452

Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
359ece4
fix parsing of cargo locate-project output
senekor Sep 21, 2026
cf3a66f
use --message-format=plain for `cargo locate-project`
senekor Sep 21, 2026
b677a2c
parse command output consistently
senekor Sep 29, 2026
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
25 changes: 9 additions & 16 deletions src/init.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,6 @@ use crossterm::{
QueueableCommand,
style::{Attribute, Color, ResetColor, SetAttribute, SetForegroundColor},
};
use serde::Deserialize;
use std::{
env::{current_dir, set_current_dir},
fs::{self, create_dir},
Expand All @@ -17,22 +16,17 @@ use crate::{
info_file::InfoFile, term::press_enter_prompt,
};

#[derive(Deserialize)]
struct CargoLocateProject<'a> {
#[serde(borrow)]
root: &'a Path,
}

pub fn init() -> Result<()> {
let rustlings_dir = Path::new("rustlings");
if rustlings_dir.exists() {
bail!(RUSTLINGS_DIR_ALREADY_EXISTS_ERR);
}

let locate_project_output = Command::new("cargo")
let mut locate_project_output = Command::new("cargo")
.arg("locate-project")
.arg("-q")
.arg("--workspace")
.arg("--message-format=plain")
.stdin(Stdio::null())
.stderr(Stdio::null())
.output()
Expand Down Expand Up @@ -66,15 +60,14 @@ pub fn init() -> Result<()> {
bail!(IN_INITIALIZED_DIR_ERR);
}

let workspace_manifest =
serde_json::de::from_slice::<CargoLocateProject>(&locate_project_output.stdout)
.context(
"Failed to read the field `root` from the output of `cargo locate-project …`",
)?
.root;
// Remove newline
locate_project_output.stdout.pop();

let workspace_manifest = String::try_from(locate_project_output.stdout)
.context("Failed to convert the output of `cargo locate-project …` to a string")?;

let workspace_manifest_content = fs::read_to_string(workspace_manifest)
.with_context(|| format!("Failed to read the file {}", workspace_manifest.display()))?;
let workspace_manifest_content = fs::read_to_string(&workspace_manifest)
.with_context(|| format!("Failed to read the file {workspace_manifest}"))?;
if !workspace_manifest_content.contains("[workspace]")
&& !workspace_manifest_content.contains("workspace.")
{
Expand Down
Loading