Skip to content

Commit 0c3ed63

Browse files
committed
fix(clean): Don't confuse glob-like characters with new layout
1 parent aa04395 commit 0c3ed63

File tree

2 files changed

+2
-2
lines changed

2 files changed

+2
-2
lines changed

src/cargo/ops/cargo_clean.rs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -203,7 +203,7 @@ fn clean_specs(
203203
if clean_ctx.gctx.cli_unstable().build_dir_new_layout {
204204
for (_compile_kind, layout) in &layouts_with_host {
205205
let dir = layout.build_dir().build_unit(&pkg.name());
206-
clean_ctx.rm_rf_glob(&dir)?;
206+
clean_ctx.rm_rf(&dir)?;
207207
}
208208

209209
for target in pkg.targets() {

tests/testsuite/clean_new_layout.rs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -143,7 +143,7 @@ fn clean_multiple_packages_in_glob_char_path() {
143143
.arg("-Zbuild-dir-new-layout")
144144
.masquerade_as_nightly_cargo(&["new build-dir layout"])
145145
.run();
146-
assert_eq!(get_build_artifacts(foo_path, file_glob).len(), 2); // FIXME
146+
assert_eq!(get_build_artifacts(foo_path, file_glob).len(), 0);
147147
}
148148

149149
fn get_build_artifacts(path: &PathBuf, file_glob: &str) -> Vec<Result<PathBuf, GlobError>> {

0 commit comments

Comments
 (0)