Skip to content
New issue

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

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

Already on GitHub? Sign in to your account

Rollup of 5 pull requests #134374

Merged
merged 11 commits into from
Dec 16, 2024
Merged

Rollup of 5 pull requests #134374

merged 11 commits into from
Dec 16, 2024

Conversation

matthiaskrgr
Copy link
Member

Successful merges:

Failed merges:

r? @ghost
@rustbot modify labels: rollup

Create a similar rollup

compiler-errors and others added 11 commits December 14, 2024 18:05
…ue-const, r=estebank

Make sure to use normalized ty for unevaluated const in default struct value

This cleans up the way that we construct the `mir::Const::Unevaluated` for default struct values. We were previously using `from_unevaluated`, which doesn't normalize the type, and is really only used for inline assembly. Other codepaths (such as `ExprKind::NamedConst`) use the type from the body.

Also, let's stop using `literal_operand`, which also is really not meant for calls other than for literal comparisons in pattern lowering.

Also move all of the tests to a separate subdirectory so they don't need to have the same prefix on all the test files.

Fixes rust-lang#134298
r? estebank or reassign
…-errors

crashes: more tests

try-job: aarch64-apple
try-job: x86_64-msvc
try-job: x86_64-gnu
…rors

Fix `trimmed_def_paths` ICE in the function ptr comparison lint

This PR fixes an ICE with `trimmed_def_paths` ICE in the function ptr comparison lint, specifically when pretty-printing user types but then not using the resulting pretty-printing.

Fixes rust-lang#134345
r? `@saethlin`
…jieyouxu

Update spelling of "referring"

I noticed that `referring` was spelled incorrectly in the output of `unexpected 'cfg' condition name` warnings; it looks like it was also incorrectly spelled in a doc comment. I've update both instances.
…atrieb

Disable `tests/ui/associated-consts/issue-93775.rs` on windows msvc

This test seems to be quite flaky. See:

- rust-lang#132111
- rust-lang#133432
@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. rollup A PR which is a rollup labels Dec 16, 2024
@matthiaskrgr
Copy link
Member Author

@bors r+ rollup=never p=5

@bors
Copy link
Contributor

bors commented Dec 16, 2024

📌 Commit 0a77972 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 Dec 16, 2024
@bors
Copy link
Contributor

bors commented Dec 16, 2024

⌛ Testing commit 0a77972 with merge eedc229...

@bors
Copy link
Contributor

bors commented Dec 16, 2024

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

@bors bors added the merged-by-bors This PR was explicitly merged by bors. label Dec 16, 2024
@bors bors merged commit eedc229 into rust-lang:master Dec 16, 2024
7 checks passed
@rustbot rustbot added this to the 1.85.0 milestone Dec 16, 2024
@rust-timer
Copy link
Collaborator

📌 Perf builds for each rolled up PR:

PR# Message Perf Build Sha
#134314 Make sure to use normalized ty for unevaluated const in def… bbdfa02209b8d9c6b51d8cdad665cafe41ddbd35 (link)
#134342 crashes: more tests b56c11c0e6d7d4915cc79a229997afdac2e5121a (link)
#134357 Fix trimmed_def_paths ICE in the function ptr comparison … 78e679ea2580a74d9ddbee2b3c9ab0abe6ad9728 (link)
#134369 Update spelling of "referring" 0edbd7bfd4862aaaedaa6dc260962c6a79f26a15 (link)
#134372 Disable tests/ui/associated-consts/issue-93775.rs on wind… 153e13355aee000d424bac0cd7757c8b87c04e83 (link)

previous master: f2b91ccbc2

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 (eedc229): 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 -3.0%, secondary 0.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.9% [0.9%, 0.9%] 1
Improvements ✅
(primary)
-3.0% [-3.0%, -3.0%] 1
Improvements ✅
(secondary)
- - 0
All ❌✅ (primary) -3.0% [-3.0%, -3.0%] 1

Cycles

Results (primary -1.5%, secondary -1.5%)

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)
-1.5% [-3.0%, -0.5%] 25
Improvements ✅
(secondary)
-1.5% [-2.3%, -1.2%] 4
All ❌✅ (primary) -1.5% [-3.0%, -0.5%] 25

Binary size

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

Bootstrap: 773.825s -> 770.216s (-0.47%)
Artifact size: 332.94 MiB -> 332.90 MiB (-0.01%)

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.
Projects
None yet
Development

Successfully merging this pull request may close these issues.

8 participants