Skip to content

Fix use with Bazel #55

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
bkchr merged 1 commit into from
Jan 5, 2025
Merged

Fix use with Bazel #55

Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
8 changes: 5 additions & 3 deletions src/lib.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -100,7 +100,6 @@ use toml_edit::{DocumentMut, Item, Table, TomlError};
pub enum Error {
NotFound(PathBuf),
CargoManifestDirNotSet,
CargoEnvVariableNotSet,
FailedGettingWorkspaceManifestPath,
Copy link
Owner

@bkchr bkchr Jan 5, 2025

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Suggested change
FailedGettingWorkspaceManifestPath,
#[deprecated]
CargoEnvVariableNotSet,
FailedGettingWorkspaceManifestPath,

CouldNotRead { path: PathBuf, source: io::Error },
InvalidToml { source: TomlError },
Expand Down Expand Up @@ -138,7 +137,6 @@ impl fmt::Display for Error {
crate_name,
path.display(),
),
Error::CargoEnvVariableNotSet => f.write_str("`CARGO` env variable not set."),
Error::FailedGettingWorkspaceManifestPath =>
Copy link
Owner

@bkchr bkchr Jan 5, 2025

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Suggested change
Error::FailedGettingWorkspaceManifestPath =>
#[allow(deprecated)]
Error::CargoEnvVariableNotSet => f.write_str("`CARGO` env variable not set."),
Error::FailedGettingWorkspaceManifestPath =>

f.write_str("Failed to get the path of the workspace manifest path."),
}
Expand Down Expand Up @@ -241,7 +239,11 @@ pub fn crate_name(orig_name: &str) -> Result<FoundCrate, Error> {
}

fn workspace_manifest_path(cargo_toml_manifest: &Path) -> Result<Option<PathBuf>, Error> {
let stdout = Command::new(env::var("CARGO").map_err(|_| Error::CargoEnvVariableNotSet)?)
let Ok(cargo) = env::var("CARGO") else {
return Ok(None);
};

let stdout = Command::new(cargo)
.arg("locate-project")
.args(&["--workspace", "--message-format=plain"])
.arg(format!("--manifest-path={}", cargo_toml_manifest.display()))
Expand Down
Loading