Skip to content
Draft
Show file tree
Hide file tree
Changes from 1 commit
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
26 changes: 26 additions & 0 deletions crates/cargo-wdk/src/actions/build/mod.rs
Original file line number Diff line number Diff line change
Expand Up @@ -158,6 +158,32 @@ impl<'a> BuildAction<'a> {
return self.run_from_workspace_root(&self.working_dir);
}

if let Ok(cargo_metadata) = self.get_cargo_metadata(&self.working_dir) {
let owns_working_dir = cargo_metadata.workspace_packages().iter().any(|p| {
p.manifest_path
.parent()
.and_then(|path| absolute(path.as_std_path()).ok())
.is_some_and(|package_dir| package_dir.starts_with(&self.working_dir))
});

if owns_working_dir {
let workspace_root = absolute(cargo_metadata.workspace_root.as_std_path())
.map_err(|e| {
BuildActionError::NotAbsolute(
cargo_metadata.workspace_root.clone().into(),
e,
)
})?;
debug!(
"Working directory {} lies inside the workspace rooted at {}; running build \
from workspace root",
self.working_dir.display(),
workspace_root.display()
);
return self.run_from_workspace_root(&workspace_root);
}
}

// Emulated workspaces support
let dirs = self.fs.read_dir_entries(&self.working_dir)?;
debug!(
Expand Down
2 changes: 2 additions & 0 deletions crates/cargo-wdk/src/actions/clean/error.rs
Original file line number Diff line number Diff line change
Expand Up @@ -13,6 +13,8 @@ use crate::providers::error::{CommandError, FileError};
pub enum CleanActionError {
#[error(transparent)]
FileIo(#[from] FileError),
#[error("Provided path is not absolute: {0}")]
NotAbsolute(PathBuf, #[source] std::io::Error),
#[error("No valid rust projects in the current working directory: {0}")]
NoValidRustProjectsInTheDirectory(PathBuf),
#[error("One or more projects failed to clean in the emulated workspace: {0}")]
Expand Down
Loading
Loading