Auto merge of #7502 - matthiaskrgr:dont_lock_target_dir_7490, r=ehuss

don't lock the package cache when cleaning target dir. Fixes #7490
rust-lang · Oct 10, 2019 · d5d7557 · d5d7557
2 parents aa4820b 9883d20
commit d5d7557
Showing 1 changed file with 1 addition and 1 deletion.
diff --git a/src/cargo/ops/cargo_clean.rs b/src/cargo/ops/cargo_clean.rs
@@ -39,7 39,6 @@ pub fn clean(ws: &Workspace<'_>, opts: &CleanOptions<'_>) -> CargoResult<()> {
  return rm_rf(&target_dir.into_path_unlocked(), config);
  }
 
- let (packages, resolve) = ops::resolve_ws(ws)?;
  let profiles = ws.profiles();
 
  // Check for whether the profile is defined.
@@ -61,6 60,7 @@ pub fn clean(ws: &Workspace<'_>, opts: &CleanOptions<'_>) -> CargoResult<()> {
  if opts.spec.is_empty() {
  return rm_rf(&target_dir.into_path_unlocked(), config);
  }
  let (packages, resolve) = ops::resolve_ws(ws)?;
 
  let interner = UnitInterner::new();
  let mut build_config = BuildConfig::new(config, Some(1), &opts.target, CompileMode::Build)?;