Skip to content

Rollup of 7 pull requests #135702

New issue

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

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

Already on GitHub? # to your account

Closed
wants to merge 19 commits into from

Conversation

matthiaskrgr
Copy link
Member

Successful merges:

r? @ghost
@rustbot modify labels: rollup

Create a similar rollup

marcoieni and others added 19 commits January 17, 2025 09:22
Signed-off-by: Jens Reidel <adrian@travitia.xyz>
- Move `make_bcb_counters` out of `CoverageCounters`
- Split out `make_node_counter_priority_list`
- Flatten `Transcriber` into the function `transcribe_counters`
Making these separate types from `CovTerm` and `Expression` was historically
very helpful, but now that most of the counter-creation work is handled by
`node_flow` they are no longer needed.
…obzol

CI: split i686-msvc job to two free runners

try-job: i686-msvc-1
try-job: i686-msvc-2
…ile, r=Kobzol

ci: use ghcr ubuntu image for mingw-check-tidy
… r=Kobzol

Drop MIPS glibc 2.23 patches that reside in crosstool-ng now

These patches were added to crosstool-ng in crosstool-ng/crosstool-ng@b88d338 and are therefore duplicate and fail to apply, breaking builds of `dist-mips*-linux`.

I have compile tested `dist-mipsel-linux`, I assume the other targets will work just as fine now.
…errors

Fix ICE in resolving associated items as non-bindings

Fixes rust-lang#135614 so that imported associated functions of traits can be shadowed by local bindings and associated constants of traits can be used in patterns.
…piler-errors

Small `rustc_resolve` cleanups

1. Don't open-code `Reverse`
2. Use slice patterns where possible
…ler-errors

coverage: Clean up a few things after the counters overhaul

Follow-up to rust-lang#135481. No functional change; this is mostly just deleting or moving code.
Get rid of `ToPolyTraitRef`

It's generally a footgun, since it throws away `PredicatePolarity`.

This PR doesn't attempt to fix any related bugs having to do with binders or polarity; it just tries to pass through `TraitPredicate`s around instead of `TraitRef`s. There should be basically no functional changes.
@rustbot rustbot added A-testsuite Area: The testsuite used to check the correctness of rustc S-waiting-on-review Status: Awaiting review from the assignee but also interested parties. T-bootstrap Relevant to the bootstrap subteam: Rust's build system (x.py and src/bootstrap) T-compiler Relevant to the compiler team, which will review and decide on the PR/issue. T-infra Relevant to the infrastructure team, which will review and decide on the PR/issue. rollup A PR which is a rollup labels Jan 18, 2025
@matthiaskrgr
Copy link
Member Author

@bors r+ rollup=never p=7

@bors
Copy link
Collaborator

bors commented Jan 18, 2025

📌 Commit 1cef579 has been approved by matthiaskrgr

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 Jan 18, 2025
@bors
Copy link
Collaborator

bors commented Jan 19, 2025

⌛ Testing commit 1cef579 with merge 43aa137...

bors added a commit to rust-lang-ci/rust that referenced this pull request Jan 19, 2025
…iaskrgr

Rollup of 7 pull requests

Successful merges:

 - rust-lang#135616 (CI: split i686-msvc job to two free runners)
 - rust-lang#135623 (ci: use ghcr ubuntu image for mingw-check-tidy)
 - rust-lang#135640 (Drop MIPS glibc 2.23 patches that reside in crosstool-ng now)
 - rust-lang#135663 (Fix ICE in resolving associated items as non-bindings)
 - rust-lang#135677 (Small `rustc_resolve` cleanups)
 - rust-lang#135680 (coverage: Clean up a few things after the counters overhaul)
 - rust-lang#135697 (Get rid of `ToPolyTraitRef`)

r? `@ghost`
`@rustbot` modify labels: rollup
@matthiaskrgr
Copy link
Member Author

#135677 was force pushed since..

@matthiaskrgr matthiaskrgr deleted the rollup-7m0e58h branch January 25, 2025 09:13
# for free to join this conversation on GitHub. Already have an account? # to comment
Labels
A-testsuite Area: The testsuite used to check the correctness of rustc rollup A PR which is a rollup S-waiting-on-bors Status: Waiting on bors to run and complete tests. Bors will change the label on completion. T-bootstrap Relevant to the bootstrap subteam: Rust's build system (x.py and src/bootstrap) T-compiler Relevant to the compiler team, which will review and decide on the PR/issue. T-infra Relevant to the infrastructure team, which will review and decide on the PR/issue.
Projects
None yet
Development

Successfully merging this pull request may close these issues.

9 participants