Clean artifacts with new layout #16330
Closed
+115
−3
Conversation
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
rustbot
added
Command-clean
S-waiting-on-review
Collaborator
|
r? @weihanglo rustbot has assigned @weihanglo. Use |
epage
reviewed
Dec 2, 2025
tests/testsuite/clean_new_layout.rs
Outdated
Comment on lines
14
to
16
| // Ensures that all files for the package have been deleted. | ||
| #[track_caller] | ||
| fn assert_all_clean(build_dir: &Path) { |
Contributor
There was a problem hiding this comment.
Please put this where it matches with clean.rs
epage
reviewed
Dec 2, 2025
src/cargo/ops/cargo_clean.rs
Outdated
Comment on lines
308
to
318
| // Clean incremental compilation files. | ||
| for target in pkg.targets() { | ||
| if target.is_custom_build() { | ||
| continue; | ||
| } | ||
| let crate_name = target.crate_name(); | ||
| for (_, layout) in &layouts { | ||
| let incremental_dir = escape_glob_path(layout.build_dir().incremental())?; | ||
| let pattern = Path::new(&incremental_dir).join(format!("{crate_name}-*")); | ||
| clean_ctx.rm_rf_glob(&pattern)?; | ||
| } |
Contributor
There was a problem hiding this comment.
Why is this in a new loop body rather than the existing one like for the old layout?
epage
reviewed
Dec 2, 2025
src/cargo/ops/cargo_clean.rs
Outdated
Comment on lines
247
to
249
| // Clean hashed example files and depinfo/debug files from examples directory. | ||
| // These files have hashes in their names (e.g., foo-abc123, foo-abc123.d) and | ||
| // are not covered by the uplifted file cleanup above. |
Contributor
There was a problem hiding this comment.
What I'm looking for is an answer to #16302 (comment) before moving forward. Something is missing to this puzzle
This test demonstrates that `cargo clean -p` with the new build layout (`-Zbuild-dir-new-layout`) does not clean all example artifacts, specifically hashed depinfo files and incremental compilation outputs. The test is marked `#[should_panic]` as it currently fails without the corresponding fix. Signed-off-by: Charalampos Mitrodimas <[email protected]>
Add cleanup for hashed example files, depinfo, debug files, and incremental compilation outputs when using `cargo clean -p` with `-Zbuild-dir-new-layout`. The new layout was missing glob-based cleanup for: - Hashed example artifacts in build_dir().examples() - Rustc-generated depinfo (.d) and debug files (.o, .dwo, .dwp) - Incremental compilation files in build_dir().incremental() Signed-off-by: Charalampos Mitrodimas <[email protected]>
charmitro
force-pushed
the
clean-artifacts
branch
from
cc928fc to
7293210
Compare
Contributor
Author
|
Closing in favor of #16302 |
rustbot
removed
the
S-waiting-on-review
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
4 participants
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
Add cleanup for hashed example files, depinfo, debug files, and
incremental compilation outputs when using
cargo clean -pwith-Zbuild-dir-new-layout.The new layout was missing glob-based cleanup for:
Closes #16302
@epage had this in my stash, so let me know if I'm doing something you're already in progress of doing.