Rollup of 8 pull requests by JohnTitor · Pull Request #106786 · rust-lang/rust

JohnTitor · 2023-01-12T20:47:26Z

Successful merges:

Stabilize abi_efiapi feature #105795 (Stabilize abi_efiapi feature)
[LSDA] Take ttype_index into account when taking unwind action #106446 ([LSDA] Take ttype_index into account when taking unwind action)
Mark ZST as FFI-safe if all its fields are PhantomData #106675 (Mark ZST as FFI-safe if all its fields are PhantomData)
Adding a hint on iterator type errors #106740 (Adding a hint on iterator type errors)
Fix reexport of doc(hidden) item #106741 (Fix reexport of doc(hidden) item)
Revert "Make nested RPITIT inherit the parent opaque's generics." #106759 (Revert "Make nested RPITIT inherit the parent opaque's generics.")
Re-add mw to review rotation #106772 (Re-add mw to review rotation)
Exclude formatting commit from blame #106778 (Exclude formatting commit from blame)

Failed merges:

r? @ghost
@rustbot modify labels: rollup

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

Tracking issue: rust-lang#65815

… adjust test This reverts commit e2d41f4.

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#65815Closesrust-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 closesrust-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` fixesrust-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.

JohnTitor · 2023-01-12T20:47:41Z

@bors r+ p=8 rollup=never

bors · 2023-01-12T20:47:43Z

📌 Commit 8dc8e3c has been approved by JohnTitor

It is now in the queue for this repository.

bors · 2023-01-12T22:58:18Z

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

bors · 2023-01-13T02:12:50Z

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

rust-timer · 2023-01-13T02:15:07Z

📌 Perf builds for each rolled up PR:

PR#	Perf Build Sha
#106778	60e4e840de8c29d5338b69e825874c23b76d04a9
#106772	8768d88a8e4bf1c4a32bf7e12749e418c294b3a7
#106759	21261ee0b9499019a148a5ee5e6037ea81a2cee6
#106741	4d32f50f1fe2903d4e6c31828f881f71e8e3f92a
#106740	d31c68f262ae619976aad38d88227c5d588fae32
#106675	1a0d455a16e8cd1b1ce415891077650bf7ffc1cf
#106446	e12f34fae91d873d27e4fe42937748a86044612b
#105795	0a027b44b2655aeb575b58b02b28b0fa2ab819a0

previous master: 61a415be59

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 · 2023-01-13T03:55:22Z

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

bzEqand others added 21 commits January 4, 2023 18:00

[LSDA] Take ttype_index into account when taking action
3453415
If cs_action != 0, we should check the ttype_index field in action record. If ttype_index == 0, a clean up action is taken.

Also check ttype_index when using SJLJ
04a6975

Add comments
8333e5c

Move to intepret_cs_action
d4926eb

Add comment
93ef4b3

Stabilize abi_efiapi feature
46f9e87
Tracking issue: rust-lang#65815

Revert "Make nested RPITIT inherit the parent opaque's generics." and…
0a2b55d
… adjust test This reverts commit e2d41f4.

Mark ZST as FFI-safe if all its fields are PhantomData
797f247
Modify the linting behavior and add the corresponding regression test

add note for float iterator
bdf9900

Add mw to triagebot.toml
86168c3

Fix not displayed re-export of doc(hidden) item
2633d5f

Add test for displayed re-export of doc(hidden)
675640c

Exclude formatting commit from blame
5b51a8e
Excludes rust-lang@c34fbfa to make Git blame a bit more useful.

Rollup merge ofrust-lang#105795- nicholasbishop:bishop-stabilize-ef…
fa8f77a
…iapi, r=joshtriplett Stabilize `abi_efiapi` feature Tracking issue: rust-lang#65815Closesrust-lang#65815

Rollup merge ofrust-lang#106740- petar-dambovaliev:float-iterator-h…
7e5d477
…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 closesrust-lang#106728

Rollup merge ofrust-lang#106741- GuillaumeGomez:reexport-doc-hidden…
ea45b3e
…, 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`

Rollup merge ofrust-lang#106772- michaelwoerister:triagebot-rotatio…
174c6c7
…n, r=wesleywiser Re-add mw to review rotation r? `@wesleywiser`

Rollup merge ofrust-lang#106778- RReverser:patch-1, r=dtolnay
8dc8e3c
Exclude formatting commit from blame Excludes rust-lang@c34fbfa (cc `@dtolnay)` to make Git blame a bit more useful.

bors removed the S-waiting-on-review Status: Awaiting review from the assignee but also interested parties. label Jan 12, 2023

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 added the merged-by-bors This PR was explicitly merged by bors. label Jan 13, 2023

bors merged commit 86ad69d into rust-lang:masterJan 13, 2023

rustbot added this to the 1.68.0 milestone Jan 13, 2023

JohnTitor deleted the rollup-8f4vk8m branch January 13, 2023 02:18

bors mentioned this pull request Jan 13, 2023
Ignore tests move in git blame #106782
Merged

Navigation Menu

Uh oh!

Uh oh!

Rollup of 8 pull requests - #106786

Rollup of 8 pull requests#106786
bors merged 21 commits into
rust-lang:masterfrom
JohnTitor:rollup-8f4vk8m

JohnTitor commented Jan 12, 2023

Uh oh!

JohnTitor commented Jan 12, 2023

Uh oh!

bors commented Jan 12, 2023

Uh oh!

bors commented Jan 12, 2023

Uh oh!

bors commented Jan 13, 2023

Uh oh!

rust-timer commented Jan 13, 2023

Uh oh!

rust-timer commented Jan 13, 2023

Uh oh!

Reviewers

Assignees

Labels

Projects

Milestone

Development

Uh oh!

12 participants

Uh oh!

Uh oh!

Conversation

JohnTitor commented Jan 12, 2023

Uh oh!

JohnTitor commented Jan 12, 2023

Uh oh!

bors commented Jan 12, 2023

Uh oh!

bors commented Jan 12, 2023

Uh oh!

bors commented Jan 13, 2023

Uh oh!

rust-timer commented Jan 13, 2023

Uh oh!

rust-timer commented Jan 13, 2023

Overall result: no relevant changes - no action needed

Instruction count

Max RSS (memory usage)

Cycles

Uh oh!

Reviewers

Assignees

Labels

Projects

Milestone

Development

Uh oh!

12 participants