Skip to content

Conversation

matthiaskrgr
Copy link
Member

Successful merges:

r? @ghost
@rustbot modify labels: rollup

Create a similar rollup

marcoieni and others added 16 commits January 17, 2025 09:22
- 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.
…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 19, 2025
@matthiaskrgr
Copy link
Member Author

@bors r+ rollup=never p=6

@bors
Copy link
Collaborator

bors commented Jan 19, 2025

📌 Commit d810c13 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 19, 2025
@bors
Copy link
Collaborator

bors commented Jan 19, 2025

⌛ Testing commit d810c13 with merge 01706e1...

@bors
Copy link
Collaborator

bors commented Jan 19, 2025

☀️ Test successful - checks-actions
Approved by: matthiaskrgr
Pushing 01706e1 to master...

@bors bors added the merged-by-bors This PR was explicitly merged by bors. label Jan 19, 2025
@bors bors merged commit 01706e1 into rust-lang:master Jan 19, 2025
7 checks passed
@rustbot rustbot added this to the 1.86.0 milestone Jan 19, 2025
@rust-timer
Copy link
Collaborator

📌 Perf builds for each rolled up PR:

PR# Message Perf Build Sha
#135616 CI: split i686-msvc job to two free runners 034d8fe32f8287d547c4056cad23e81df4eecc9d (link)
#135623 ci: use ghcr ubuntu image for mingw-check-tidy a3bf6d937d895ef8614adedac193a5e927982f5e (link)
#135640 Drop MIPS glibc 2.23 patches that reside in crosstool-ng now 2b6426732b8454bcade918850211fe335da5f0ab (link)
#135663 Fix ICE in resolving associated items as non-bindings 20053bd9d4371d27b4d64588b42d770d93d5c0e0 (link)
#135680 coverage: Clean up a few things after the counters overhaul 734095bb1166f4d92b2acdd12f5b867dd5bd04d1 (link)
#135697 Get rid of ToPolyTraitRef beeb1f0486c67a6ee5e17977fc0fb8fba023fbeb (link)

previous master: 1d55f7270d

In the case of a perf regression, run the following command for each PR you suspect might be the cause: @rust-timer build $SHA

@rust-timer
Copy link
Collaborator

Finished benchmarking commit (01706e1): comparison URL.

Overall result: no relevant changes - no action needed

@rustbot label: -perf-regression

Instruction count

This benchmark run did not return any relevant results for this metric.

Max RSS (memory usage)

Results (primary -0.9%, secondary -4.2%)

This is a less reliable metric that may be of interest but was not used to determine the overall result at the top of this comment.

mean range count
Regressions ❌
(primary)
- - 0
Regressions ❌
(secondary)
- - 0
Improvements ✅
(primary)
-0.9% [-0.9%, -0.9%] 1
Improvements ✅
(secondary)
-4.2% [-4.2%, -4.2%] 1
All ❌✅ (primary) -0.9% [-0.9%, -0.9%] 1

Cycles

Results (primary -2.6%)

This is a less reliable metric that may be of interest but was not used to determine the overall result at the top of this comment.

mean range count
Regressions ❌
(primary)
- - 0
Regressions ❌
(secondary)
- - 0
Improvements ✅
(primary)
-2.6% [-2.6%, -2.6%] 1
Improvements ✅
(secondary)
- - 0
All ❌✅ (primary) -2.6% [-2.6%, -2.6%] 1

Binary size

This benchmark run did not return any relevant results for this metric.

Bootstrap: 765.786s -> 765.933s (0.02%)
Artifact size: 326.08 MiB -> 326.08 MiB (-0.00%)

@matthiaskrgr matthiaskrgr deleted the rollup-c04uupz branch January 25, 2025 09:13
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
A-testsuite Area: The testsuite used to check the correctness of rustc merged-by-bors This PR was explicitly merged by bors. 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