Revert "fix cargo clippy when using with --manifest-path
"
This reverts commit b31bebeea4
.
This commit is contained in:
parent
6ee6fe5776
commit
5b1d849c7e
2 changed files with 3 additions and 9 deletions
|
@ -65,13 +65,8 @@ impl From<json::DecoderError> for Error {
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
pub fn metadata(manifest_path: Option<String>) -> Result<Metadata, Error> {
|
pub fn metadata() -> Result<Metadata, Error> {
|
||||||
let mut cmd = Command::new("cargo");
|
let output = Command::new("cargo").args(&["metadata", "--no-deps"]).output()?;
|
||||||
cmd.arg("metadata").arg("--no-deps");
|
|
||||||
if let Some(ref mani) = manifest_path {
|
|
||||||
cmd.arg(mani);
|
|
||||||
}
|
|
||||||
let output = cmd.output()?;
|
|
||||||
let stdout = from_utf8(&output.stdout)?;
|
let stdout = from_utf8(&output.stdout)?;
|
||||||
Ok(json::decode(stdout)?)
|
Ok(json::decode(stdout)?)
|
||||||
}
|
}
|
||||||
|
|
|
@ -129,8 +129,7 @@ pub fn main() {
|
||||||
};
|
};
|
||||||
|
|
||||||
if let Some("clippy") = std::env::args().nth(1).as_ref().map(AsRef::as_ref) {
|
if let Some("clippy") = std::env::args().nth(1).as_ref().map(AsRef::as_ref) {
|
||||||
let manifest_path = std::env::args().skip(2).find(|val| val.starts_with("--manifest-path="));
|
let mut metadata = cargo::metadata().expect("could not obtain cargo metadata");
|
||||||
let mut metadata = cargo::metadata(manifest_path).expect("could not obtain cargo metadata");
|
|
||||||
assert_eq!(metadata.version, 1);
|
assert_eq!(metadata.version, 1);
|
||||||
for target in metadata.packages.remove(0).targets {
|
for target in metadata.packages.remove(0).targets {
|
||||||
let args = std::env::args().skip(2);
|
let args = std::env::args().skip(2);
|
||||||
|
|
Loading…
Reference in a new issue