Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

refactor(package): split cargo_package to modules #14982

Merged
merged 6 commits into from
Dec 25, 2024

Conversation

weihanglo
Copy link
Member

@weihanglo weihanglo commented Dec 25, 2024

What does this PR try to resolve?

Do nothing but move code around

  • cargo_package.rs -> cargo_package/mod.rs
  • Extract vcs info helpers to cargo_package/vcs.rs
  • Extract verification helpers to cargo_package/verify.rs

Doing so because I realized how big cargo_package.rs has grown.
Like, the vcs helpers will continue growing with #14981 and potentially other optimizations.

How should we test and review this PR?

All tests pass.

@rustbot
Copy link
Collaborator

rustbot commented Dec 25, 2024

r? @ehuss

rustbot has assigned @ehuss.
They will have a look at your PR within the next two weeks and either review your PR or reassign to another reviewer.

Use r? to explicitly pick a reviewer

@rustbot rustbot added the S-waiting-on-review Status: Awaiting review from the assignee but also interested parties. label Dec 25, 2024
@rustbot rustbot added the A-infrastructure Area: infrastructure around the cargo repo, ci, releases, etc. label Dec 25, 2024
Copy link
Contributor

@epage epage left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Feel free to merge when the labels are fixed

@epage
Copy link
Contributor

epage commented Dec 25, 2024

As a future refactor, i wonder if the archive creation is enough to be a mod.

@weihanglo weihanglo enabled auto-merge December 25, 2024 03:23
@weihanglo weihanglo added this pull request to the merge queue Dec 25, 2024
Merged via the queue into rust-lang:master with commit 0276088 Dec 25, 2024
20 checks passed
@weihanglo weihanglo deleted the new-mod branch December 25, 2024 04:00
bors added a commit to rust-lang-ci/rust that referenced this pull request Dec 31, 2024
Update cargo

5 commits in c86f4b3a1b153218e6e50861214b0b4b4e695f23..d73d2caf9e41a39daf2a8d6ce60ec80bf354d2a7
2024-12-24 17:49:48 +0000 to 2024-12-31 20:51:21 +0000
- fix(package): warn if symlinks checked out as plain text files (rust-lang/cargo#14994)
- test: track caller for `.crate` file publish verification (rust-lang/cargo#14992)
- test: relax panic output assertion (rust-lang/cargo#14989)
- test: relax `bad_crate_type` to only match error message prefix (rust-lang/cargo#14990)
- refactor(package): split `cargo_package` to modules (rust-lang/cargo#14982)

r? ghost
@rustbot rustbot added this to the 1.85.0 milestone Jan 1, 2025
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
A-infrastructure Area: infrastructure around the cargo repo, ci, releases, etc. Command-package S-waiting-on-review Status: Awaiting review from the assignee but also interested parties.
Projects
None yet
Development

Successfully merging this pull request may close these issues.

4 participants