Skip to content

Rollup of 5 pull requests #116112

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

Merged
merged 13 commits into from
Sep 24, 2023
Merged

Rollup of 5 pull requests #116112

merged 13 commits into from
Sep 24, 2023

Conversation

matthiaskrgr
Copy link
Member

Successful merges:

r? @ghost
@rustbot modify labels: rollup

Create a similar rollup

compiler-errors and others added 13 commits September 22, 2023 19:47
Allow higher-ranked fn sigs in `ValuePairs`

For better bookkeeping -- only affects diagnostic path. Allow reporting signature mismatches like "signature"s and not "fn pointer"s.

Improves rust-lang#115897 (comment)
…sg, r=estebank

Tweak expected message to explain what it's actually signifying

r? ``@estebank`` since you added this
…errors

More accurate suggestion for `self.` and `Self::`

Detect that we can't suggest `self.` in an associated function without `&self` receiver.

Partially address rust-lang#115992.

r? ``@compiler-errors``
…t, r=b-naber

Reuse calculate_debuginfo_offset for fragments.

This removes a little code duplication.
…lor-42, r=notriddle

Migrate GUI colors test to original CSS color format

Follow-up of rust-lang#111459.

And with this one I'm finally done with this migration.

r? ``@notriddle``
@rustbot rustbot added S-waiting-on-review Status: Awaiting review from the assignee but also interested parties. T-compiler Relevant to the compiler team, which will review and decide on the PR/issue. T-rustdoc Relevant to the rustdoc team, which will review and decide on the PR/issue. rollup A PR which is a rollup labels Sep 23, 2023
@matthiaskrgr
Copy link
Member Author

@bors r+ rollup=never p=5

@bors
Copy link
Collaborator

bors commented Sep 23, 2023

📌 Commit 164517c 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 Sep 23, 2023
@bors
Copy link
Collaborator

bors commented Sep 24, 2023

⌛ Testing commit 164517c with merge 0f2a9ce...

@bors
Copy link
Collaborator

bors commented Sep 24, 2023

☀️ Test successful - checks-actions
Approved by: matthiaskrgr
Pushing 0f2a9ce to master...

@bors bors added the merged-by-bors This PR was explicitly merged by bors. label Sep 24, 2023
@bors bors merged commit 0f2a9ce into rust-lang:master Sep 24, 2023
@rustbot rustbot added this to the 1.74.0 milestone Sep 24, 2023
@rust-timer
Copy link
Collaborator

📌 Perf builds for each rolled up PR:

PR# Message Perf Build Sha
#116073 Allow higher-ranked fn sigs in ValuePairs 481b66b03e3bba213428f608894a4e7c3751024a (link)
#116082 Tweak expected message to explain what it's actually signif… 601a79d0a2a743635588463d2abd22c322b8d2f3 (link)
#116086 More accurate suggestion for self. and Self:: 8d5baf7f769cd321f1c37387eebb48639017d4d7 (link)
#116104 Reuse calculate_debuginfo_offset for fragments. 46f90572810f726bf57ffe3a490720a17c674a49 (link)
#116106 Migrate GUI colors test to original CSS color format af807b0057002a314024115abee16b104ff64a48 (link)

previous master: acfb46db5a

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 (0f2a9ce): 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

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)
2.5% [2.5%, 2.5%] 1
Improvements ✅
(primary)
- - 0
Improvements ✅
(secondary)
-1.7% [-2.0%, -1.3%] 3
All ❌✅ (primary) - - 0

Cycles

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

Binary size

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

Bootstrap: 629.795s -> 629.123s (-0.11%)
Artifact size: 317.18 MiB -> 317.13 MiB (-0.01%)

@matthiaskrgr matthiaskrgr deleted the rollup-s3cm2f7 branch March 16, 2024 18:19
# for free to join this conversation on GitHub. Already have an account? # to comment
Labels
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-compiler Relevant to the compiler team, which will review and decide on the PR/issue. T-rustdoc Relevant to the rustdoc team, which will review and decide on the PR/issue.
Projects
None yet
Development

Successfully merging this pull request may close these issues.

8 participants