Skip to content

remove some legacy public dependency code from the resolver - #14090

Merged
bors merged 1 commit into
rust-lang:masterfrom
Eh2406:clean_up_public_deps
Jun 17, 2024
Merged

remove some legacy public dependency code from the resolver#14090
bors merged 1 commit into
rust-lang:masterfrom
Eh2406:clean_up_public_deps

Conversation

@Eh2406

@Eh2406 Eh2406 commented Jun 17, 2024

Copy link
Copy Markdown
Contributor

These conflict reasons are no longer constructed, since we removed backtracking caused by public dependencies. Let's go ahead and remove them.

r? @epage

@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 Jun 17, 2024

@weihanglo weihanglo left a comment

Copy link
Copy Markdown
Member

Choose a reason for hiding this comment

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

Looks reasonable. Thanks!

@weihanglo

Copy link
Copy Markdown
Member

@bors r+

@bors

bors commented Jun 17, 2024

Copy link
Copy Markdown
Contributor

📌 Commit 94acc28 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 Jun 17, 2024
@bors

bors commented Jun 17, 2024

Copy link
Copy Markdown
Contributor

⌛ Testing commit 94acc28 with merge d899ce7...

@bors

bors commented Jun 17, 2024

Copy link
Copy Markdown
Contributor

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

@bors
bors merged commit d899ce7 into rust-lang:master Jun 17, 2024
bors added a commit to rust-lang-ci/rust that referenced this pull request Jun 19, 2024
Update cargo

13 commits in a1f47ec3f7cd076986f1bfcd7061f2e8cb1a726e..3ed207e416fb2f678a40cc79c02dcf4f936a21ce
2024-06-15 01:10:07 +0000 to 2024-06-18 19:18:22 +0000
- test: prefer raw string for regex reduction (rust-lang/cargo#14099)
- test: migrate tree and tree_graph_features to snapbox (rust-lang/cargo#14094)
- test: Migrate some files to snapbox (rust-lang/cargo#14069)
- remove some legacy public dependency code from the resolver (rust-lang/cargo#14090)
- fix(fix): Address problems with implicit -> explicit feature migration (rust-lang/cargo#14018)
- refactor: 1.79 cleanup (rust-lang/cargo#14088)
- test: migrate `git_(gc|shallow)` to snapbox (rust-lang/cargo#14087)
- test: migrate timings_works to snapbox (rust-lang/cargo#14082)
- test: migrate minimal_versions to snapbox (rust-lang/cargo#14080)
- Remove `run_expect_error` to avoid tests incorrectly passing (rust-lang/cargo#14078)
- test: migrate help to snapbox (rust-lang/cargo#14060)
- test: Migrate tests/testsuite/co*.rs to snapbox (rust-lang/cargo#14079)
- Use `std::fs::absolute` instead of reimplementing it (rust-lang/cargo#14075)

<!--
r? ghost
-->
@rustbot rustbot added this to the 1.81.0 milestone Jun 19, 2024
@Eh2406
Eh2406 deleted the clean_up_public_deps branch June 19, 2024 16:45
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