Skip to content

Rollup of 5 pull requests #117915

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 11 commits into from
Nov 15, 2023
Merged

Rollup of 5 pull requests #117915

merged 11 commits into from
Nov 15, 2023

Conversation

matthiaskrgr
Copy link
Member

Successful merges:

r? @ghost
@rustbot modify labels: rollup

Create a similar rollup

estebank and others added 11 commits November 7, 2023 01:54
Signed-off-by: cui fliter <imcusg@gmail.com>
Apply structured suggestion that allows test to work since 1.64

Close rust-lang#73497.
…wiser

Build pre-coroutine-transform coroutine body on error

I was accidentally building the post-transform coroutine body, rather than the pre-transform coroutine body. There's no pinning expected here yet, and the return type isn't yet transformed into `CoroutineState`.

Fixes rust-lang#117670
… r=b-naber

target_feature: make it more clear what that 'Option' means

Reading those tables in compiler/rustc_codegen_ssa/src/target_features.rs, it's not immediately clear that `None` means "stable". Let's use an enum with appropriately named variants to make that more obvious.
…leywiser

Suggest dereferencing the LHS for binops such as `&T == T`

Fixes rust-lang#52544
@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. rollup A PR which is a rollup labels Nov 14, 2023
@matthiaskrgr
Copy link
Member Author

@bors r+ rollup=never p=5

@bors
Copy link
Collaborator

bors commented Nov 14, 2023

📌 Commit 2e00c6f 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 Nov 14, 2023
@bors
Copy link
Collaborator

bors commented Nov 14, 2023

⌛ Testing commit 2e00c6f with merge 003fa88...

@bors
Copy link
Collaborator

bors commented Nov 15, 2023

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

@bors bors added the merged-by-bors This PR was explicitly merged by bors. label Nov 15, 2023
@bors bors merged commit 003fa88 into rust-lang:master Nov 15, 2023
@rustbot rustbot added this to the 1.76.0 milestone Nov 15, 2023
@rust-timer
Copy link
Collaborator

📌 Perf builds for each rolled up PR:

PR# Message Perf Build Sha
#116244 Apply structured suggestion that allows test to work since … e51196d451e8c1d19e5e8bc4c04c23a5f5e0b6f3 (link)
#117686 Build pre-coroutine-transform coroutine body on error a3aacb99b611ce84a17f1d3b9625ab03712f5193 (link)
#117834 target_feature: make it more clear what that 'Option' means 0fa29a35a398ed6ad8f2d831ca6044cbc6c69e46 (link)
#117893 Suggest dereferencing the LHS for binops such as &T == T ab3cc7fb095f9ea8ca2841e19a370f2e863b0530 (link)
#117911 Fix some typos c367d2ca2e953c5bdefe49e0ac7237456ec5b1f6 (link)

previous master: dd430bc8c2

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 (003fa88): 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)
1.0% [1.0%, 1.0%] 1
Regressions ❌
(secondary)
- - 0
Improvements ✅
(primary)
- - 0
Improvements ✅
(secondary)
- - 0
All ❌✅ (primary) 1.0% [1.0%, 1.0%] 1

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: 674.834s -> 675.319s (0.07%)
Artifact size: 311.10 MiB -> 311.09 MiB (-0.00%)

@matthiaskrgr matthiaskrgr deleted the rollup-ztljqrr branch March 16, 2024 18:20
# 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 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.
Projects
None yet
Development

Successfully merging this pull request may close these issues.

9 participants