Skip to content

Conversation

@matthiaskrgr
Copy link
Member

Successful merges:

r? @ghost
@rustbot modify labels: rollup

Create a similar rollup

RalfJung and others added 11 commits January 15, 2025 09:21
fix typo in typenames of pin documentation

I noticed this whilst reading the documentation for pin.

Basically there was just one to many closing angle brackets on the type parameters in the documentation where instead of being `Pin<&mut T>` it was `Pin<&mut T>>`
add incremental test for issue 135514

r? `@compiler-errors` as requested in rust-lang#135514 (comment)

This adds parts of `@steffahn's` repro as an incremental test for rust-lang#135514. I had initially added the actual exploitation of the issue into the safe transmute, but removed it because it's not exactly needed for such a test. I can add it back if you'd like.

I've verified that the test fails with rust-lang#133828 reverted.
…er-errors

const traits: remove some known-bug that do not seem to make sense

These tests were made to point to rust-lang#103507 in rust-lang#114134; I think that was a mistake: that issue is about a rather specific problem, and most tests marked as known-bug in that PR are pointing at rust-lang#110395 which makes more sense.

Of the 4 tests that still point to rust-lang#103507:
- One is [the original test](https://github.com/rust-lang/rust/blob/20882608529a969bd878ad787cf0038716c021df/tests/ui/impl-trait/normalize-tait-in-const.rs). It still fails to compile, though currently for unrelated reasons (`~const Fn` is not valid as that is not a const trait). I made it point at rust-lang#110395 like all the other tests that were disabled when the previous const trait impl was removed.
- One is being fixed in rust-lang#135423
- The other two are fixed in this PR

The errors we are getting here are not great but they do look correct?

FWIW there are still a whole lot of tests mentioning rust-lang#110395 despite that issue being closed... I hope someone is tracking that.^^

r? `@compiler-errors`
…notriddle

Add GUI test for rust-lang#135499

Fixes rust-lang#135510.

cc `@lolbinarycat`
r? `@notriddle`
…ler-errors

Methods of const traits are const

Just a small FIXME that gets resolved.

I think the `constness` query should not cover all const callable things
@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-libs Relevant to the library 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 Jan 15, 2025
@matthiaskrgr
Copy link
Member Author

@bors r+ rollup=never p=5

@bors
Copy link
Collaborator

bors commented Jan 15, 2025

📌 Commit 2ea07de 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 15, 2025
@bors
Copy link
Collaborator

bors commented Jan 15, 2025

⌛ Testing commit 2ea07de with merge 6fc8a27...

@bors
Copy link
Collaborator

bors commented Jan 16, 2025

☀️ Test successful - checks-actions
Approved by: matthiaskrgr
Pushing 6fc8a27 to master...

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

📌 Perf builds for each rolled up PR:

PR# Message Perf Build Sha
#135497 fix typo in typenames of pin documentation 60f008610866971b7b0c8d60496292954e2cef54 (link)
#135522 add incremental test for issue 135514 cc682fdb9d318313c0cd6f486b18fb3436f6f7e4 (link)
#135523 const traits: remove some known-bug that do not seem to mak… 5556c272762ceecaf05a786fe743c36c5133587b (link)
#135535 Add GUI test for #135499 b32def5b36787ec0c376399945ea1a6c6dc9cbba (link)
#135541 Methods of const traits are const 64d26f8f6a52949f71dae541e231f2c3330d5ada (link)

previous master: 419b3e2d3e

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 (6fc8a27): 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 (secondary -1.9%)

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.7% [0.7%, 0.7%] 1
Improvements ✅
(primary)
- - 0
Improvements ✅
(secondary)
-2.8% [-3.7%, -2.0%] 3
All ❌✅ (primary) - - 0

Cycles

Results (secondary 2.1%)

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.1% [2.1%, 2.1%] 1
Improvements ✅
(primary)
- - 0
Improvements ✅
(secondary)
- - 0
All ❌✅ (primary) - - 0

Binary size

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

Bootstrap: 763.488s -> 761.656s (-0.24%)
Artifact size: 326.02 MiB -> 326.09 MiB (0.02%)

@matthiaskrgr matthiaskrgr deleted the rollup-jnqdbuu 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

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-libs Relevant to the library 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.

9 participants