Skip to content

refactor(lockfile): Make diffing/printing more reusable - #13564

Merged
bors merged 5 commits into
rust-lang:masterfrom
epage:r
Mar 12, 2024
Merged

bors merged 5 commits into
rust-lang:masterfrom
epage:r

Conversation

@epage

@epage epage commented Mar 8, 2024

Copy link
Copy Markdown
Contributor

What does this PR try to resolve?

This is prep for #13561 so we can tailor the printing of lockfile changes to each use without a bunch of flags.

How should we test and review this PR?

Additional information

@rustbot

rustbot commented Mar 8, 2024

Copy link
Copy Markdown
Collaborator

r? @weihanglo

rustbot has assigned @weihanglo.
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 Command-generate-lockfile S-waiting-on-review Status: Awaiting review from the assignee but also interested parties. labels Mar 8, 2024
Comment thread src/cargo/ops/cargo_generate_lockfile.rs
@weihanglo

Copy link
Copy Markdown
Member

Thanks. Looks good.

@bors r+

@bors

bors commented Mar 12, 2024

Copy link
Copy Markdown
Contributor

📌 Commit 619238e has been approved by weihanglo

It is now in the queue for this repository.

@bors bors added S-waiting-on-bors Status: Waiting on bors to run and complete tests. Bors will change the label on completion. and removed S-waiting-on-review Status: Awaiting review from the assignee but also interested parties. labels Mar 12, 2024
@bors

bors commented Mar 12, 2024

Copy link
Copy Markdown
Contributor

⌛ Testing commit 619238e with merge 685c18d...

@bors

bors commented Mar 12, 2024

Copy link
Copy Markdown
Contributor

☀️ Test successful - checks-actions
Approved by: weihanglo
Pushing 685c18d to master...

1 similar comment
@bors

bors commented Mar 12, 2024

Copy link
Copy Markdown
Contributor

☀️ Test successful - checks-actions
Approved by: weihanglo
Pushing 685c18d to master...

@bors
bors merged commit 685c18d into rust-lang:master Mar 12, 2024
@bors

bors commented Mar 12, 2024

Copy link
Copy Markdown
Contributor

👀 Test was successful, but fast-forwarding failed: 422 Changes must be made through a pull request.

@epage
epage deleted the r branch March 12, 2024 02:54
bors added a commit to rust-lang-ci/rust that referenced this pull request Mar 12, 2024
Update cargo

9 commits in a4c63fe5388beaa09e5f91196c86addab0a03580..7065f0ef4aa267a7455e1c478b5ccacb7baea59c
2024-03-06 22:15:17 +0000 to 2024-03-12 13:25:15 +0000
- chore: remove repetitive word (rust-lang/cargo#13575)
- refactor(lockfile): Make diffing/printing more reusable (rust-lang/cargo#13564)
- test: Add tests for using worktrees and sparse checkouts (rust-lang/cargo#13567)
- util/network/http: Use `cargo/1.2.3` user-agent header (rust-lang/cargo#13548)
- fix: Consistently compare MSRVs (rust-lang/cargo#13537)
- refactor(shell): Use alternate to close links (rust-lang/cargo#13562)
- fix(doc): Collapse down Generated statuses without --verbose (rust-lang/cargo#13557)
- doc: Add doc for -Zpublic-dependency (rust-lang/cargo#13556)
- docs: add link to the exported_private_dependencies lint (rust-lang/cargo#13547)

r? ghost
@rustbot rustbot added this to the 1.78.0 milestone Mar 12, 2024
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Labels

Command-generate-lockfile S-waiting-on-bors Status: Waiting on bors to run and complete tests. Bors will change the label on completion.

Projects

None yet

Development

Successfully merging this pull request may close these issues.

4 participants