nordic-dev.net/rust
nordic-dev.net/rust
2
0
Fork 0
mirror of https://github.com/rust-lang/rust.git synced 2024-11-24 15:54:15 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #1288 from Arnavion/fix-1247

Browse Source 
Don't assume the first package in the result of `cargo metadata` is the current crate.
This commit is contained in:
Oliver Schneider 2016-10-24 09:25:52 +02:00 committed by GitHub
commit 9fcc04e7df
2 changed files with 25 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
clippy_lints/src/utils/cargo.rs
View File

@ -20,7 +20,7 @@ pub struct Package {
pub dependencies: Vec<Dependency>, pub dependencies: Vec<Dependency>,
pub targets: Vec<Target>, pub targets: Vec<Target>,
features: HashMap<String, Vec<String>>, features: HashMap<String, Vec<String>>,
manifest_path: String, pub manifest_path: String,
} }
#[derive(RustcDecodable, Debug)] #[derive(RustcDecodable, Debug)]
@ -65,10 +65,10 @@ impl From<json::DecoderError> for Error {
} }
} }
pub fn metadata(manifest_path: Option<String>) -> Result<Metadata, Error> { pub fn metadata(manifest_path_arg: Option<&str>) -> Result<Metadata, Error> {
let mut cmd = Command::new("cargo"); let mut cmd = Command::new("cargo");
cmd.arg("metadata").arg("--no-deps"); cmd.arg("metadata").arg("--no-deps");
if let Some(ref mani) = manifest_path { if let Some(mani) = manifest_path_arg {
cmd.arg(mani); cmd.arg(mani);
} }
let output = cmd.output()?; let output = cmd.output()?;

25
src/main.rs
View File

@ -138,10 +138,29 @@ 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) {
// this arm is executed on the initial call to `cargo clippy` // this arm is executed on the initial call to `cargo clippy`
let manifest_path = std::env::args().skip(2).find(|val| val.starts_with("--manifest-path=")); let manifest_path_arg = std::env::args().skip(2).find(|val| val.starts_with("--manifest-path="));
let mut metadata = cargo::metadata(manifest_path).expect("could not obtain cargo metadata");
let mut metadata = cargo::metadata(manifest_path_arg.as_ref().map(AsRef::as_ref)).expect("could not obtain cargo metadata");
assert_eq!(metadata.version, 1); assert_eq!(metadata.version, 1);
for target in metadata.packages.remove(0).targets {
let manifest_path = manifest_path_arg.map(|arg| PathBuf::from(Path::new(&arg["--manifest-path=".len()..])));
let current_dir = std::env::current_dir();
let package_index = metadata.packages.iter()
.position(|package| {
let package_manifest_path = Path::new(&package.manifest_path);
if let Some(ref manifest_path) = manifest_path {
package_manifest_path == manifest_path
} else {
let current_dir = current_dir.as_ref().expect("could not read current directory");
let package_manifest_directory = package_manifest_path.parent().expect("could not find parent directory of package manifest");
package_manifest_directory == current_dir
}
})
.expect("could not find matching package");
let package = metadata.packages.remove(package_index);
for target in package.targets {
let args = std::env::args().skip(2); let args = std::env::args().skip(2);
if let Some(first) = target.kind.get(0) { if let Some(first) = target.kind.get(0) {
if target.kind.len() > 1 || first.ends_with("lib") { if target.kind.len() > 1 || first.ends_with("lib") {