Skip to content

Conversation

JohnTitor
Copy link
Member

Successful merges:

Failed merges:

r? @ghost
@rustbot modify labels: rollup

Create a similar rollup

bzEq and others added 21 commits January 4, 2023 18:00
If cs_action != 0, we should check the ttype_index field in
action record. If ttype_index == 0, a clean up action is taken.
Modify the linting behavior and add the corresponding
regression test
Excludes rust-lang@c34fbfa to make Git blame a bit more useful.
…iapi, r=joshtriplett

Stabilize `abi_efiapi` feature

Tracking issue: rust-lang#65815
Closes rust-lang#65815
[LSDA] Take ttype_index into account when taking unwind action

If `cs_action != 0`, we should check the `ttype_index` field in action record. If `ttype_index == 0`, a clean up action is taken; otherwise catch action is taken.

This can fix unwind failure on AIX which uses LLVM's libunwind by default. IIUC, rust's LSDA is borrowed from c++ and I'm assuming itanium-cxx-abi https://itanium-cxx-abi.github.io/cxx-abi/exceptions.pdf should be followed, so the fix follows what libcxxabi does. See https://github.com/llvm/llvm-project/blob/ec48682ce9f61d056361c5095f21e930b8365661/libcxxabi/src/cxa_personality.cpp#L152 for use of `ttype_index`.
…twco

Mark ZST as FFI-safe if all its fields are PhantomData

This presents one possible solution to issue: rust-lang#106629.

This is my first (tentative) contribution to the compiler itself.

I'm looking forward for comments and feedback

Closes: rust-lang#106629
…int, r=Nilstrieb

Adding a hint on iterator type errors

Issue reference rust-lang#106728

- [x] add a case in the attribute
- [x] add a test

closes rust-lang#106728
…, r=notriddle

Fix reexport of `doc(hidden)` item

Part of rust-lang#59368.

It doesn't fix the `doc(inline)` nor the `doc(hidden)` on macro. I'll do it in a follow-up PR.

r? `@notriddle`
…jgillot

Revert "Make nested RPITIT inherit the parent opaque's generics."

This reverts commit e2d41f4, and adjusts the `tests/ui/async-await/in-trait/nested-rpit.rs` test.

r? `@cjgillot`

fixes rust-lang#106332, manually verified because it had no minimization :/

reopens rust-lang#105197
cc rust-lang#106729
…n, r=wesleywiser

Re-add mw to review rotation

r? `@wesleywiser`
Exclude formatting commit from blame

Excludes rust-lang@c34fbfa (cc `@dtolnay)` to make Git blame a bit more useful.
@rustbot rustbot added A-meta Area: Issues & PRs about the rust-lang/rust repository itself 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 12, 2023
@JohnTitor
Copy link
Member Author

@bors r+ p=8 rollup=never

@bors
Copy link
Collaborator

bors commented Jan 12, 2023

📌 Commit 8dc8e3c has been approved by JohnTitor

It is now in the queue for this repository.

@bors bors removed the S-waiting-on-review Status: Awaiting review from the assignee but also interested parties. label Jan 12, 2023
@bors bors added the S-waiting-on-bors Status: Waiting on bors to run and complete tests. Bors will change the label on completion. label Jan 12, 2023
@bors
Copy link
Collaborator

bors commented Jan 12, 2023

⌛ Testing commit 8dc8e3c with merge 86ad69d...

@bors
Copy link
Collaborator

bors commented Jan 13, 2023

☀️ Test successful - checks-actions
Approved by: JohnTitor
Pushing 86ad69d to master...

@bors bors added the merged-by-bors This PR was explicitly merged by bors. label Jan 13, 2023
@bors bors merged commit 86ad69d into rust-lang:master Jan 13, 2023
@rustbot rustbot added this to the 1.68.0 milestone Jan 13, 2023
@rust-timer
Copy link
Collaborator

@JohnTitor JohnTitor deleted the rollup-8f4vk8m branch January 13, 2023 02:18
@rust-timer
Copy link
Collaborator

Finished benchmarking commit (86ad69d): 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)
2.1% [0.4%, 3.1%] 3
Regressions ❌
(secondary)
- - 0
Improvements ✅
(primary)
-0.8% [-0.8%, -0.8%] 1
Improvements ✅
(secondary)
- - 0
All ❌✅ (primary) 1.4% [-0.8%, 3.1%] 4

Cycles

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

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
A-meta Area: Issues & PRs about the rust-lang/rust repository itself 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.