Rollup of 9 pull requests #105512

matthiaskrgr · 2022-12-09T21:32:00Z

Successful merges:

Make missing_copy_implementations more cautious #102406 (Make missing_copy_implementations more cautious)
Add rustc_on_unimplemented to Sum and Product trait. #105265 (Add rustc_on_unimplemented to Sum and Product trait.)
Skip test on s390x as LLD does not support the platform #105385 (Skip test on s390x as LLD does not support the platform)
Make VecDeque::from_iter O(1) from vec(_deque)::IntoIter #105453 (Make VecDeque::from_iter O(1) from vec(_deque)::IntoIter)
Mangle "main" as "__main_void" on wasm32-wasi #105468 (Mangle "main" as "__main_void" on wasm32-wasi)
rustdoc: remove no-op mobile CSS #sidebar-toggle { text-align } #105480 (rustdoc: remove no-op mobile CSS #sidebar-toggle { text-align })
Fix typo in apple_base.rs #105489 (Fix typo in apple_base.rs)
rustdoc: make stability badge CSS more consistent #105504 (rustdoc: make stability badge CSS more consistent)
Tweak rustc_must_implement_one_of diagnostic output #105506 (Tweak rustc_must_implement_one_of diagnostic output)

Failed merges:

r? @ghost
@rustbot modify labels: rollup

test/run-make/issue-71519 requires use of lld as linker, but lld does not currently support the s390x architecture.

On wasm, the age-old C trick of having a main function which can either have no arguments or argc+argv doesn't work, because wasm requires caller and callee signatures to match. WASI's current strategy is to have compilers mangle main's name to indicate which signature they're using. Rust uses the no-argument form, which should be mangled as `__main_void`. This is needed on wasm32-wasi as of rust-lang#105395.

Since 8b001b4 make the sidebar toggle a flex container, and already centers its content in desktop mode, this rule doesn't do anything.

erronous -> erroneous

* They all get rounded corners now. A test case has been added for this, too. * There are now broadly two kinds of stability badge, where there used to be three: item-info "fat badge", and the "thin badge" in both item tables and in docblocks (which got merged). The fat badges can have icons, while the thin badges can't.

Make `missing_copy_implementations` more cautious - Fixes rust-lang#98348 - Also makes the lint not fire on large types and types containing raw pointers. Thoughts?

…lemented, r=estebank Add `rustc_on_unimplemented` to `Sum` and `Product` trait. Helps with rust-lang#105184, but I don't think it fully fixes it.

…mulacrum Skip test on s390x as LLD does not support the platform test/run-make/issue-71519 requires use of lld as linker, but lld does not currently support the s390x architecture.

…8472 Make `VecDeque::from_iter` O(1) from `vec(_deque)::IntoIter` As suggested in rust-lang#105046 (comment) by r? ``@the8472`` `Vec` & `VecDeque`'s `IntoIter`s own the allocations, and even if advanced can be turned into `VecDeque`s in O(1). This is just a specialization, not an API or doc commitment, so I don't think it needs an FCP.

…wasi, r=estebank Mangle "main" as "__main_void" on wasm32-wasi On wasm, the age-old C trick of having a main function which can either have no arguments or argc+argv doesn't work, because wasm requires caller and callee signatures to match. WASI's current strategy is to have compilers mangle main's name to indicate which signature they're using. Rust uses the no-argument form, which should be mangled as `__main_void`. This is needed on wasm32-wasi as of rust-lang#105395.

…-mobile-center, r=GuillaumeGomez rustdoc: remove no-op mobile CSS `#sidebar-toggle { text-align }` Since 8b001b4 make the sidebar toggle a flex container, and already centers its content in desktop mode, this rule doesn't do anything.

Fix typo in apple_base.rs erronous -> erroneous

…illaumeGomez rustdoc: make stability badge CSS more consistent # Before ![image](https://user-images.githubusercontent.com/1593513/206763667-8e0deb74-be63-4906-8229-9a7eb51725c2.png) ![image](https://user-images.githubusercontent.com/1593513/206764007-6301c0e8-4594-4a41-ba93-105824dffee6.png) # After ![image](https://user-images.githubusercontent.com/1593513/206763698-e187cee2-3a50-4e48-b7b5-c3cfa41a797d.png) ![image](https://user-images.githubusercontent.com/1593513/206764058-3999ee67-1439-4c98-8216-b90575342aa8.png) # Description * They all get rounded corners now. A test case has been added for this, too. * There are now broadly two kinds of stability badge, where there used to be three: item-info "fat badge", and the "thin badge" in both item tables and in docblocks (which got merged). The fat badges can have icons, while the thin badges can't. * The old Ayu design doesn't make sense to me. Does anyone know why it was done that way?

…of, r=compiler-errors Tweak `rustc_must_implement_one_of` diagnostic output

matthiaskrgr · 2022-12-09T21:32:22Z

@bors r+ rollup=never p=9

bors · 2022-12-09T21:32:24Z

📌 Commit 376b0bc has been approved by matthiaskrgr

It is now in the queue for this repository.

bors · 2022-12-10T00:08:21Z

⌛ Testing commit 376b0bc with merge 16b85d9df13f842fefe5b2558952cc56e68163ce...

bors · 2022-12-10T04:23:22Z

💥 Test timed out

matthiaskrgr · 2022-12-10T05:32:37Z

@bors retry

bors · 2022-12-10T05:32:47Z

⌛ Testing commit 376b0bc with merge a000811...

bors · 2022-12-10T08:23:10Z

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

rust-timer · 2022-12-10T08:25:42Z

📌 Perf builds for each rolled up PR:

PR#	Perf Build Sha
#105506	94e0fa57b1aa0b6f6357728f1d6650de0abfc455
#105504	a166e4bc0a167f74fcc42b50996d976248d95463
#105489	e601fbc62fab2c823bca957dd4ab7947021beefc
#105480	873a0d51d029a123636d4ca94ad00e8dc6b60cbe
#105468	1687a11a8172380419423696620ca2371db2f2cc
#105453	fc4db2d648e018aff3274e873d9c15001de2822f
#105385	af6bd8e8826e852ac57121dc97e79c56c49c8b4b
#105265	f302f9b4d23e0ef2f4e913042cdfa00a67a88c81
#102406	09e38137b08a550ed25097e45ec33afa069b0054

previous master: 0d5573e6da

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 · 2022-12-10T09:41:48Z

Finished benchmarking commit (a000811): comparison URL.

Overall result: ❌✅ regressions and improvements - ACTION NEEDED

Next Steps: If you can justify the regressions found in this perf run, please indicate this with @rustbot label: +perf-regression-triaged along with sufficient written justification. If you cannot justify the regressions please open an issue or create a new PR that fixes the regressions, add a comment linking to the newly created issue or PR, and then add the perf-regression-triaged label to this PR.

@rustbot label: +perf-regression
cc @rust-lang/wg-compiler-performance

Instruction count

This is a highly reliable metric that was used to determine the overall result at the top of this comment.

	mean	range	count
Regressions ❌ (primary)	-	-	0
Regressions ❌ (secondary)	1.1%	[1.1%, 1.1%]	1
Improvements ✅ (primary)	-0.2%	[-0.2%, -0.2%]	1
Improvements ✅ (secondary)	-0.4%	[-0.6%, -0.2%]	6
All ❌✅ (primary)	-0.2%	[-0.2%, -0.2%]	1

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)	-	-	0
Regressions ❌ (secondary)	1.5%	[1.4%, 1.6%]	2
Improvements ✅ (primary)	-1.0%	[-1.0%, -1.0%]	1
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.

lqd · 2022-12-10T17:11:48Z

The regressions is small in absolute terms, only in instructions count, it's a short stress test that doesn't seem to be the only one to exercize some codepath changed in this PR. Nothing jumps out in the rolled up PRs nor seems to apply to the other benchmarks. There are also small wins elsewhere, so this seems fine. What do the others think ?

rust-log-analyzer · 2022-12-11T08:54:39Z

A job failed! Check out the build log: (web) (plain)

Click to see the possible cause of the failure (guessed by this bot)

nnethercote · 2022-12-11T09:13:18Z

Yeah, this is fine, perf-wise.

@rustbot label: +perf-regression-triaged

mejrs and others added 21 commits November 29, 2022 17:33

Make missing_copy_implementations more cautious

4ced370

Update trait check

b209ff2

Rebase

34277fc

Skip test on s390x as LLD does not support the platform

17766c1

test/run-make/issue-71519 requires use of lld as linker, but lld does not currently support the s390x architecture.

Make VecDeque::from_iter O(1) from vec(_deque)::IntoIter

58e60ac

Add rustc_on_unimplemented to Sum and Product trait.

5626df9

rustdoc: remove no-op mobile CSS #sidebar-toggle { text-align }

90da11d

Since 8b001b4 make the sidebar toggle a flex container, and already centers its content in desktop mode, this rule doesn't do anything.

Apply review feedback; Fix no_global_oom_handling build

6648134

Fix typo in apple_base.rs

f41576b

erronous -> erroneous

Tweak rustc_must_implement_one_of diagnostic output

b3b17bd

Rollup merge of rust-lang#102406 - mejrs:missing_copy, r=wesleywiser

4fae589

Make `missing_copy_implementations` more cautious - Fixes rust-lang#98348 - Also makes the lint not fire on large types and types containing raw pointers. Thoughts?

Rollup merge of rust-lang#105265 - aDotInTheVoid:sum-product-on-unimp…

856027a

…lemented, r=estebank Add `rustc_on_unimplemented` to `Sum` and `Product` trait. Helps with rust-lang#105184, but I don't think it fully fixes it.

Rollup merge of rust-lang#105385 - uweigand:s390x-test-lld, r=Mark-Si…

c44326e

…mulacrum Skip test on s390x as LLD does not support the platform test/run-make/issue-71519 requires use of lld as linker, but lld does not currently support the s390x architecture.

Rollup merge of rust-lang#105489 - eltociear:patch-17, r=Dylan-DPC

f78babd

Fix typo in apple_base.rs erronous -> erroneous

Rollup merge of rust-lang#105506 - estebank:rustc_must_implement_one_…

376b0bc

…of, r=compiler-errors Tweak `rustc_must_implement_one_of` diagnostic output

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 9, 2022

bors added S-waiting-on-review Status: Awaiting review from the assignee but also interested parties. and removed S-waiting-on-bors Status: Waiting on bors to run and complete tests. Bors will change the label on completion. labels Dec 10, 2022

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 10, 2022

bors added the merged-by-bors This PR was explicitly merged by bors. label Dec 10, 2022

bors merged commit a000811 into rust-lang:master Dec 10, 2022

rustbot added this to the 1.68.0 milestone Dec 10, 2022

This was referenced Dec 10, 2022

Allow const iterator implementations #102225

Closed

Allow using Range as an Iterator in const contexts. #104100

Merged

Check ADT fields for copy implementations considering regions #105102

Merged

rustdoc: Fix badge alignment #105509

Closed

rustbot added the perf-regression Performance regression. label Dec 10, 2022

rustbot added the perf-regression-triaged The performance regression has been triaged. label Dec 11, 2022

matthiaskrgr deleted the rollup-i74avrf branch December 22, 2022 10:46

matthiaskrgr mentioned this pull request Feb 22, 2024

ICE: Got a scalar pair where a scalar was expected #121363

Open

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

Rollup of 9 pull requests #105512

Rollup of 9 pull requests #105512

matthiaskrgr commented Dec 9, 2022

matthiaskrgr commented Dec 9, 2022

bors commented Dec 9, 2022

bors commented Dec 10, 2022

bors commented Dec 10, 2022

matthiaskrgr commented Dec 10, 2022

bors commented Dec 10, 2022

bors commented Dec 10, 2022

rust-timer commented Dec 10, 2022

rust-timer commented Dec 10, 2022

lqd commented Dec 10, 2022

rust-log-analyzer commented Dec 11, 2022

nnethercote commented Dec 11, 2022

Rollup of 9 pull requests #105512

Rollup of 9 pull requests #105512

Conversation

matthiaskrgr commented Dec 9, 2022

matthiaskrgr commented Dec 9, 2022

bors commented Dec 9, 2022

bors commented Dec 10, 2022

bors commented Dec 10, 2022

matthiaskrgr commented Dec 10, 2022

bors commented Dec 10, 2022

bors commented Dec 10, 2022

rust-timer commented Dec 10, 2022

rust-timer commented Dec 10, 2022

Overall result: ❌✅ regressions and improvements - ACTION NEEDED

Instruction count

Max RSS (memory usage)

Cycles

lqd commented Dec 10, 2022

rust-log-analyzer commented Dec 11, 2022

nnethercote commented Dec 11, 2022