mikros/rust
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

fix: handling of --all when dep name and dir name differ (#3664)

Browse Source
This commit is contained in:
Caleb Cartwright 2019-07-06 00:17:35 -05:00 committed by Seiichi Uchida
parent 44149d6ba4
commit ff49b80628
1 changed files with 24 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

34
src/cargo-fmt/main.rs
View File

@ -247,7 +247,7 @@ fn get_targets(strategy: &CargoFmtStrategy) -> Result<BTreeSet<Target>, io::Erro
} }
fn get_targets_root_only(targets: &mut BTreeSet<Target>) -> Result<(), io::Error> { fn get_targets_root_only(targets: &mut BTreeSet<Target>) -> Result<(), io::Error> {
let metadata = get_cargo_metadata(None)?; let metadata = get_cargo_metadata(None, false)?;
let current_dir = env::current_dir()?.canonicalize()?; let current_dir = env::current_dir()?.canonicalize()?;
let current_dir_manifest = current_dir.join("Cargo.toml"); let current_dir_manifest = current_dir.join("Cargo.toml");
let workspace_root_path = PathBuf::from(&metadata.workspace_root).canonicalize()?; let workspace_root_path = PathBuf::from(&metadata.workspace_root).canonicalize()?;
@ -282,7 +282,8 @@ fn get_targets_recursive(
mut targets: &mut BTreeSet<Target>, mut targets: &mut BTreeSet<Target>,
visited: &mut BTreeSet<String>, visited: &mut BTreeSet<String>,
) -> Result<(), io::Error> { ) -> Result<(), io::Error> {
let metadata = get_cargo_metadata(manifest_path)?; let metadata = get_cargo_metadata(manifest_path, false)?;
let metadata_with_deps = get_cargo_metadata(manifest_path, true)?;
for package in metadata.packages { for package in metadata.packages {
add_targets(&package.targets, &mut targets); add_targets(&package.targets, &mut targets);
@ -293,11 +294,19 @@ fn get_targets_recursive(
continue; continue;
} }
let mut manifest_path = PathBuf::from(&package.manifest_path); let dependency_package = metadata_with_deps
.packages
manifest_path.pop(); .iter()
manifest_path.push(&dependency.name); .find(|p| p.name == dependency.name);
manifest_path.push("Cargo.toml"); let manifest_path = if dependency_package.is_some() {
PathBuf::from(&dependency_package.unwrap().manifest_path)
} else {
let mut package_manifest_path = PathBuf::from(&package.manifest_path);
package_manifest_path.pop();
package_manifest_path.push(&dependency.name);
package_manifest_path.push("Cargo.toml");
package_manifest_path
};
if manifest_path.exists() { if manifest_path.exists() {
visited.insert(dependency.name); visited.insert(dependency.name);
@ -313,7 +322,7 @@ fn get_targets_with_hitlist(
hitlist: &[String], hitlist: &[String],
targets: &mut BTreeSet<Target>, targets: &mut BTreeSet<Target>,
) -> Result<(), io::Error> { ) -> Result<(), io::Error> {
let metadata = get_cargo_metadata(None)?; let metadata = get_cargo_metadata(None, false)?;
let mut workspace_hitlist: BTreeSet<&String> = BTreeSet::from_iter(hitlist); let mut workspace_hitlist: BTreeSet<&String> = BTreeSet::from_iter(hitlist);
@ -399,9 +408,14 @@ fn run_rustfmt(
.unwrap_or(SUCCESS)) .unwrap_or(SUCCESS))
} }
fn get_cargo_metadata(manifest_path: Option<&Path>) -> Result<cargo_metadata::Metadata, io::Error> { fn get_cargo_metadata(
manifest_path: Option<&Path>,
include_deps: bool,
) -> Result<cargo_metadata::Metadata, io::Error> {
let mut cmd = cargo_metadata::MetadataCommand::new(); let mut cmd = cargo_metadata::MetadataCommand::new();
cmd.no_deps(); if !include_deps {
cmd.no_deps();
}
if let Some(manifest_path) = manifest_path { if let Some(manifest_path) = manifest_path {
cmd.manifest_path(manifest_path); cmd.manifest_path(manifest_path);
} }