Error out if cargo clean --doc is mixed with -p.#12637
Merged
bors merged 1 commit intorust-lang:masterfrom Sep 7, 2023
Merged
Conversation
Currently the `-p` is ignored. This should help with any confusion about the interaction of different flags. rust-lang#8790 is tracking to fix this.
Collaborator
|
r? @epage (rustbot has picked a reviewer for you, use r? to override) |
rustbot
added
Command-clean
S-waiting-on-review
weihanglo
approved these changes
Sep 7, 2023
Member
weihanglo
left a comment
weihanglo
left a comment
There was a problem hiding this comment.
This may break somebody's script, but I believe that's rare and easy to fix.
Member
|
@bors r+ |
Contributor
bors
added
S-waiting-on-bors
Contributor
Contributor
|
☀️ Test successful - checks-actions |
epage
reviewed
Sep 7, 2023
Comment on lines
+36
to
+37
| if !opts.spec.is_empty() { | ||
| // FIXME: https://github.com/rust-lang/cargo/issues/8790 |
Contributor
There was a problem hiding this comment.
This culd be done with clap but sicne this is just a fixme, it likely doesn't matter
bors
added a commit
to rust-lang-ci/rust
that referenced
this pull request
Sep 9, 2023
Update cargo 14 commits in d14c85f4e6e7671673b1a1bc87231ff7164761e1..2fc85d15a542bfb610aff7682073412cf635352f 2023-09-05 22:28:10 +0000 to 2023-09-09 01:49:46 +0000 - feat: Stabilize lints (rust-lang/cargo#12648) - Ues strip_prefix for cleaner code (rust-lang/cargo#12631) - fix: don't print _TOKEN suggestion when not applicable (rust-lang/cargo#12644) - Bump cargo-credential-1password to v0.4.0 (rust-lang/cargo#12641) - refactor: put `Source` trait under `cargo::sources` (rust-lang/cargo#12527) - Error out if `cargo clean --doc` is mixed with `-p`. (rust-lang/cargo#12637) - Add wrappers around std::fs::metadata (rust-lang/cargo#12636) - Add with_stdout_unordered. (rust-lang/cargo#12635) - Fix example for creating a git project test. (rust-lang/cargo#12632) - Read/write the encoded `cargo update --precise` in the same place (rust-lang/cargo#12629) - docs(guide): Apply feedback on CI (rust-lang/cargo#12630) - fix: improve warning for both token & credential-provider (rust-lang/cargo#12626) - Skip clean up `profile.release.package."*"` (rust-lang/cargo#12624) - Add MSRV validation GitHub Action for cargo-credential (rust-lang/cargo#12623)
bors
added a commit
that referenced
this pull request
Sep 20, 2023
Add some enhancements to `cargo clean` ### What does this PR try to resolve? This adds some enhancements to `cargo clean` that fell out as a result of some refactorings in #12634 for supporting an interface for cleaning from other places in cargo, and these were relatively easy to add and assist with testing in #12634. The changes are: - Introduce some refactoring to offer a cleaning interface that can be used elsewhere in cargo. - Adds a `--dry-run` CLI option which will print what `cargo clean` will delete without deleting it. **NOTE** This PR makes the flag insta-stable. I don't figure there is too much that can be learned about it keeping it unstable, though we could change that. #12634 has this flag gated with `-Zgc`. - Adds a summary line at the end of the `cargo clean` operation that indicates how much was deleted. ### How should we test and review this PR? Note that this PR also includes the changes from #12635 and #12637. Those commits can be dropped if those PRs are merged. For the most part, this involves wrapping the cleaning operations in a `CleanContext` which provides an interface for performing cleaning operations. The dry run is just a flag that is checked at the deletion points. The summary data is also collected at those same points.
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
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
5 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.
This changes
cargo clean --doc -p footo generate an error instead of ignoring the-pflag. There is still an outstanding issue #8790 tracking this. It should support-p, but until it is supported, I think cargo should tell you that the flag is ignored. This is also in preparation for some code changes in #12634 which needs to handle any combination of various different clean flags.