Rollup of 9 pull requests by matthiaskrgr · Pull Request #110458 · rust-lang/rust

matthiaskrgr · 2023-04-17T16:13:38Z

Successful merges:

Migrate diagnostics in rustc_borrowck #104055 (Migrate diagnostics in rustc_borrowck)
fix false positives for unused_parens around unary and binary operations #110257 (fix false positives for unused_parens around unary and binary operations)
allow repr(align = x) on inherent methods #110313 (allow repr(align = x) on inherent methods)
Correct default value for default-linker-libraries #110337 (Correct default value for default-linker-libraries)
Clean up traversal macros #110386 (Clean up traversal macros)
Various minor Idx-related tweaks #110394 (Various minor Idx-related tweaks)
Encode def span for ConstParam #110425 (Encode def span for ConstParam)
Check freeze with right param-env in deduced_param_attrs #110434 (Check freeze with right param-env in deduced_param_attrs)
tests: adapt for LLVM change 5b386b864c7619897c51a1da97d78f1cf6f3eff6 #110455 (tests: adapt for LLVM change 5b386b8)

Failed merges:

r? @ghost
@rustbot modify labels: rollup

…tions

… a block

This setting is false by default according to rustc code here: https://github.com/rust-lang/rust/blob/master/compiler/rustc_session/src/options.rs#L1236 I tested on a project and confirmed that setting this to false has no effect, the linker flag still appears. Setting it to true removes the linker flag.

I suspect this macro was around before `TypeFoldable`/`TypeVisitable` were derivable. But now it's only used for two types, `Result` and `Option`. Removing the macro and implementing the traits for those types by hand makes the code much simpler.

They both allow for a lifetime other than `'tcx`, but this isn't needed.

Nothing particularly exciting here, but a couple of things I noticed as I was looking for more index conversions to simplify.

The above-mentioned change modified the output of thread-local.rs by changing some variable names. Rather than assume things get put in %0, we capture the variable so the test passes in both the old and new version.

Migrate diagnostics in `rustc_borrowck` sorry for making a new PR, [rust-lang#103559](rust-lang#103559) and [rust-lang#103960](rust-lang#103960). I am crawling, joyfully.

…code-like-that-anyway, r=oli-obk fix false positives for `unused_parens` around unary and binary operations fixrust-lang#110251

…d, r=WaffleLapkin allow `repr(align = x)` on inherent methods Discussion: rust-lang#82232 (comment)

Correct default value for default-linker-libraries This setting is false by default according to rustc code here: https://github.com/rust-lang/rust/blob/master/compiler/rustc_session/src/options.rs#L1236 I tested on a project and confirmed the behavior described. First, with no value, the `-nodefaultlibs` linker flag is present. Setting this to false has no effect, as well. The linker flag still appears. Setting it to true removes the linker flag as expected.

…ros, r=lcnr Clean up traversal macros The declarative macros relating to type folding and visiting can be simplified. r? ``@lcnr``

Various minor Idx-related tweaks Nothing particularly exciting here, but a couple of things I noticed as I was looking for more index conversions to simplify. cc rust-lang/compiler-team#606 r? `@WaffleLapkin`

…ram, r=petrochenkov Encode def span for `ConstParam` Fixesrust-lang#110206 r? ``@petrochenkov``

…i-obk Check freeze with right param-env in `deduced_param_attrs` We're checking if a trait (`Freeze`) holds in a polymorphic function, but not using that function's own (reveal-all) param-env. This causes us to try to eagerly normalize a specializable projection type that has no default value, which causes an ICE. Fixesrust-lang#110171

tests: adapt for LLVM change 5b386b8 The above-mentioned change modified the output of thread-local.rs by changing some variable names. Rather than assume things get put in %0, we capture the variable so the test passes in both the old and new version.

matthiaskrgr · 2023-04-17T16:14:00Z

@bors r+ rollup=never p=9

bors · 2023-04-17T16:14:02Z

📌 Commit c81e8b8 has been approved by matthiaskrgr

It is now in the queue for this repository.

bors · 2023-04-17T16:39:04Z

⌛ Testing commit c81e8b8 with merge 31656e7...

bors · 2023-04-17T18:48:55Z

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

rust-timer · 2023-04-17T18:51:29Z

📌 Perf builds for each rolled up PR:

PR#	Perf Build Sha
#110455	fff43c6474d94704da4c023f9985175822d97e07
#110434	a7032f6186afbb93ab251d66ab9c6b890ea03131
#110425	b10362a7bcb3ce871b690733a0af34b18912240f
#110394	087cf65f0b79005881eb48283a71e32e610acc28
#110386	1a6d506f1310149b4c87588296c0d539c6311366
#110337	98ebe1364af6e3d9df46bb258acb715320f970fa
#110313	88ede0c73335270a30740fac55825cd554e630fd
#110257	f7852aa429715beb7af68100f4e819da0a3aa114
#104055	5122354a0940808c9a6f639cf35a63b6d4bd8821

previous master: e49122fb1c

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-04-17T20:06:48Z

Finished benchmarking commit (31656e7): 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.2%	[1.2%, 1.2%]	3
Improvements ✅ (primary)	-1.1%	[-2.9%, -0.3%]	12
Improvements ✅ (secondary)	-3.5%	[-7.7%, -0.2%]	11
All ❌✅ (primary)	-1.1%	[-2.9%, -0.3%]	12

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

Cycles

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

nnethercote · 2023-04-18T03:24:31Z

I think this is all noise: keccak, cranelift-codegen and diesel have just started being noisy.

@rustbot label: +perf-regression-triaged

AndyJadoand others added 23 commits April 13, 2023 09:43

rm var_span_label to var_subdiag & eager subdiag
d0468a2

migrate ftl msg accroding torust-lang#103042
bdf0e74

fix false positives for unused_parens around unary and binary opera…
8df1f41
…tions

emit unused_parens for break if it is not immediately followed by…
0d0949d
… a block

allow repr(align = x) on inherent methods
b59ec16

Remove EnumTypeTraversalImpl.
32f6e7a
I suspect this macro was around before `TypeFoldable`/`TypeVisitable` were derivable. But now it's only used for two types, `Result` and `Option`. Removing the macro and implementing the traits for those types by hand makes the code much simpler.

Simplify CloneLiftImpls and TrivialTypeTraversalImpls.
d2b5a64
They both allow for a lifetime other than `'tcx`, but this isn't needed.

Allow all associated functions and add test
dda8994

Various minor Idx-related tweaks
c98895d
Nothing particularly exciting here, but a couple of things I noticed as I was looking for more index conversions to simplify.

Check freeze with right param-env
e28e190

Encode def span for ConstParam
1ee189c

add test for invalid places of repr align
84de041

tests: adapt for LLVM change5b386b8
bef3502
The above-mentioned change modified the output of thread-local.rs by changing some variable names. Rather than assume things get put in %0, we capture the variable so the test passes in both the old and new version.

Rollup merge ofrust-lang#104055- AndyJado:bck_errors, r=davidtwco
91fe117
Migrate diagnostics in `rustc_borrowck` sorry for making a new PR, [rust-lang#103559](rust-lang#103559) and [rust-lang#103960](rust-lang#103960). I am crawling, joyfully.

Rollup merge ofrust-lang#110257- lukas-code:why-would-anyone-write-…
06d12f6
…code-like-that-anyway, r=oli-obk fix false positives for `unused_parens` around unary and binary operations fixrust-lang#110251

Rollup merge ofrust-lang#110313- fee1-dead-contrib:repr_align_metho…
eb05246
…d, r=WaffleLapkin allow `repr(align = x)` on inherent methods Discussion: rust-lang#82232 (comment)

Rollup merge ofrust-lang#110386- nnethercote:clean-up-traversal-mac…
a6c1fa5
…ros, r=lcnr Clean up traversal macros The declarative macros relating to type folding and visiting can be simplified. r? ``@lcnr``

Rollup merge ofrust-lang#110394- scottmcm:less-idx-new, r=WaffleLapkin
0790996
Various minor Idx-related tweaks Nothing particularly exciting here, but a couple of things I noticed as I was looking for more index conversions to simplify. cc rust-lang/compiler-team#606 r? `@WaffleLapkin`

Rollup merge ofrust-lang#110425- compiler-errors:def-span-for-ct-pa…
d01c62b
…ram, r=petrochenkov Encode def span for `ConstParam` Fixesrust-lang#110206 r? ``@petrochenkov``

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 Apr 17, 2023

bors added the merged-by-bors This PR was explicitly merged by bors. label Apr 17, 2023

bors merged commit 31656e7 into rust-lang:masterApr 17, 2023

rustbot added this to the 1.71.0 milestone Apr 17, 2023

rustbot added the perf-regression Performance regression. label Apr 17, 2023

rustbot added the perf-regression-triaged The performance regression has been triaged. label Apr 18, 2023

nnethercote mentioned this pull request Apr 18, 2023
Bypass the varint path when encoding InitMask #110343
Merged

matthiaskrgr deleted the rollup-1xcxmgc branch March 16, 2024 18:18

Navigation Menu

Uh oh!

Uh oh!

Rollup of 9 pull requests - #110458

Rollup of 9 pull requests#110458
bors merged 23 commits into
rust-lang:masterfrom
matthiaskrgr:rollup-1xcxmgc

matthiaskrgr commented Apr 17, 2023

Uh oh!

matthiaskrgr commented Apr 17, 2023

Uh oh!

bors commented Apr 17, 2023

Uh oh!

bors commented Apr 17, 2023

Uh oh!

bors commented Apr 17, 2023

Uh oh!

rust-timer commented Apr 17, 2023

Uh oh!

rust-timer commented Apr 17, 2023

Uh oh!

nnethercote commented Apr 18, 2023

Uh oh!

Reviewers

Assignees

Labels

Projects

Milestone

Development

Uh oh!

11 participants

Uh oh!

Uh oh!

Conversation

matthiaskrgr commented Apr 17, 2023

Uh oh!

matthiaskrgr commented Apr 17, 2023

Uh oh!

bors commented Apr 17, 2023

Uh oh!

bors commented Apr 17, 2023

Uh oh!

bors commented Apr 17, 2023

Uh oh!

rust-timer commented Apr 17, 2023

Uh oh!

rust-timer commented Apr 17, 2023

Overall result: ❌✅ regressions and improvements - ACTION NEEDED

Instruction count

Max RSS (memory usage)

Cycles

Uh oh!

nnethercote commented Apr 18, 2023

Uh oh!

Reviewers

Assignees

Labels

Projects

Milestone

Development

Uh oh!

11 participants