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: misc refactors for ops::resolve #13917

Merged
merged 5 commits into from
May 15, 2024
Merged

Conversation

weihanglo
Copy link
Member

What does this PR try to resolve?

This is a preparation for another -Zpatch-files experiment,
so that the future PR can move things around easier without too many conflicts.

How should we test and review this PR?

Generally they shouldn't affect anything existing behavior.
a6230e3 might be a bit dubious,
though I believe preloading workspace members is kinda idempotent
and registering patches/lockfile never cares about it.

Additional information

@rustbot
Copy link
Collaborator

rustbot commented May 15, 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 A-dependency-resolution Area: dependency resolution and the resolver S-waiting-on-review Status: Awaiting review from the assignee but also interested parties. labels May 15, 2024
@epage
Copy link
Contributor

epage commented May 15, 2024

@bors r+

@bors
Copy link
Collaborator

bors commented May 15, 2024

📌 Commit 327649b has been approved by epage

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 May 15, 2024
@bors
Copy link
Collaborator

bors commented May 15, 2024

⌛ Testing commit 327649b with merge fc13634...

@bors
Copy link
Collaborator

bors commented May 15, 2024

☀️ Test successful - checks-actions
Approved by: epage
Pushing fc13634 to master...

@bors bors merged commit fc13634 into rust-lang:master May 15, 2024
21 checks passed
@weihanglo weihanglo deleted the resolve branch May 16, 2024 00:16
bors added a commit to rust-lang-ci/rust that referenced this pull request May 18, 2024
Update cargo

6 commits in 4de0094ac78743d2c8ff682489e35c8a7cafe8e4..0de7f2ec6c39d68022e6b97a39559d2f4dbf3930
2024-05-09 16:09:22 +0000 to 2024-05-17 16:54:54 +0000
- Add special `check-cfg` lint config for the `unexpected_cfgs` lint (rust-lang/cargo#13913)
- refactor: more comments and variable rename (rust-lang/cargo#13924)
- test: set safe.directory for git repo in apache container (rust-lang/cargo#13920)
- refactor: misc refactors for `ops::resolve` (rust-lang/cargo#13917)
- Preserve file permissions on unix during `write_atomic` (rust-lang/cargo#13898)
- Update benchmark formatting for new nightly (rust-lang/cargo#13901)

r? ghost
@rustbot rustbot added this to the 1.80.0 milestone May 18, 2024
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
A-dependency-resolution Area: dependency resolution and the resolver 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.

5 participants