Rollup of 8 pull requests #101017

JohnTitor · 2022-08-26T00:51:49Z

Successful merges:

distinguish the method and associated function diagnostic information #99064 (distinguish the method and associated function diagnostic information)
Custom allocator support in rustc_serialize #99920 (Custom allocator support in rustc_serialize)
Elaborate all box dereferences in ElaborateBoxDerefs #100034 ( Elaborate all box dereferences in ElaborateBoxDerefs)
make slice::{split_at,split_at_unchecked} const functions #100076 (make slice::{split_at,split_at_unchecked} const functions)
Remove unstable Result::into_ok_or_err #100604 (Remove unstable Result::into_ok_or_err)
Reduce code size of assert_matches_failed #100933 (Reduce code size of assert_matches_failed)
Handle Err in ast::LitKind::to_token_lit. #100978 (Handle Err in ast::LitKind::to_token_lit.)
rustdoc: remove unused CSS for .multi-column #101010 (rustdoc: remove unused CSS for .multi-column)

Failed merges:

r? @ghost
@rustbot modify labels: rollup

Methods are defined within the context of a struct and their first parameter is always self Associated functions don’t take self as a parameter modified: compiler/rustc_typeck/src/check/method/suggest.rs modified: src/test/ui/auto-ref-slice-plus-ref.stderr modified: src/test/ui/block-result/issue-3563.stderr modified: src/test/ui/issues/issue-28344.stderr modified: src/test/ui/suggestions/dont-suggest-pin-array-dot-set.stderr modified: src/test/ui/suggestions/suggest-methods.stderr modified: src/test/ui/traits/trait-upcasting/subtrait-method.stderr

…esult

Fixes rust-lang#100948.

A resume place is evaluated and assigned to only after a yield terminator resumes. Ensure that locals used when evaluating the resume place are live across the yield.

so that it is the only pass responsible for elaboration, instead of splitting this responsibility between the `StateTransform` and `ElaborateBoxDerefs`.

As a sanity check, [this tool] can be used to run a CSS query across an HTML tree to detect if a selector ever matches (I use compiler-docs and std docs). This isn't good enough, because I also need to account for JavaScript, but this class is never mentioned in any of the JS files, either. According to [blame], this class was added when rustdoc was first written, and, as far as I can tell, was never actually used. [this tool]: https://gitlab.com/notriddle/html-scanner [blame]: https://github.com/rust-lang/rust/blame/4d45b0745ab227feb9000bc15713ade4b99241ea/src/librustdoc/html/static/css/rustdoc.css#L753-L761

…that use a custom allocator

distinguish the method and associated function diagnostic information Methods are defined within the context of a struct and their first parameter is always self Associated functions don’t take self as a parameter ``` modified: compiler/rustc_typeck/src/check/method/suggest.rs modified: src/test/ui/auto-ref-slice-plus-ref.stderr modified: src/test/ui/block-result/issue-3563.stderr modified: src/test/ui/issues/issue-28344.stderr modified: src/test/ui/suggestions/dont-suggest-pin-array-dot-set.stderr modified: src/test/ui/suggestions/suggest-methods.stderr modified: src/test/ui/traits/trait-upcasting/subtrait-method.stderr ```

…r=oli-obk Custom allocator support in `rustc_serialize` Adding support for `rustc_serialize` encode/decode for `Box` and `Vec` that use a custom allocator.

…i-obk Elaborate all box dereferences in `ElaborateBoxDerefs` so that it is the only pass responsible for elaboration, instead of splitting this responsibility between the `StateTransform` and `ElaborateBoxDerefs`.

…li-obk make slice::{split_at,split_at_unchecked} const functions Now that `slice::from_raw_parts` is const in stable 1.64, it makes sense to have `split_at` const as well, otherwise unsafe code is required to achieve a const equivalent.

Remove unstable Result::into_ok_or_err Pending FCP: rust-lang#82223 (comment) ```@rustbot``` label +waiting-on-fcp

…r=JoshTriplett Reduce code size of `assert_matches_failed` Using `write_str` instead of `<str as Display>::fmt` avoids the `pad` function which is very expensive to have in size-constrained code.

…nkov Handle `Err` in `ast::LitKind::to_token_lit`. Fixes rust-lang#100948. r? ``@petrochenkov``

…r=jsha rustdoc: remove unused CSS for `.multi-column` As a sanity check, [this tool] can be used to run a CSS query across an HTML tree to detect if a selector ever matches (I use compiler-docs and std docs). This isn't good enough, because I also need to account for JavaScript, but this class is never mentioned in any of the JS files, either. According to [blame], this class was added when rustdoc was first written, and, as far as I can tell, was never actually used. [this tool]: https://gitlab.com/notriddle/html-scanner [blame]: https://github.com/rust-lang/rust/blame/4d45b0745ab227feb9000bc15713ade4b99241ea/src/librustdoc/html/static/css/rustdoc.css#L753-L761

JohnTitor · 2022-08-26T00:52:01Z

@bors r+ p=8 rollup=never

bors · 2022-08-26T00:52:02Z

📌 Commit b4d5f48 has been approved by JohnTitor

It is now in the queue for this repository.

bors · 2022-08-26T03:23:57Z

⌛ Testing commit b4d5f48 with merge 13a6aaf...

bors · 2022-08-26T06:04:59Z

☀️ Test successful - checks-actions
Approved by: JohnTitor
Pushing 13a6aaf to master...

rust-timer · 2022-08-26T06:07:33Z

📌 Perf builds for each rolled up PR:

PR#	Perf Build Sha
#101010	55d6b5277fede7cff032c5db99e24c42ebb85930
#100978	f14b59ac63be7df0d5c2c0eeb52ffcd0496aeec4
#100933	38e3674a28c1f59b915ba401c4bad73a1f801a72
#100604	c1fd5749f35dd936508f92d315df9e8f85b4b206
#100076	208532919a1743925a22ee6c05b00c376e60700e
#100034	0fcc3f7cb58982a7dea6cdb52d99e258201f2cba
#99920	dc9f4f334db1845795e7c1f3554340a0f98182c9
#99064	3765a7b50daa2b77c1f526375905389998458296

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-08-26T07:27:11Z

Finished benchmarking commit (13a6aaf): 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.3%	[0.3%, 0.3%]	2
Regressions ❌ (secondary)	1.5%	[0.2%, 3.6%]	14
Improvements ✅ (primary)	-0.4%	[-0.6%, -0.3%]	8
Improvements ✅ (secondary)	-	-	0
All ❌✅ (primary)	-0.3%	[-0.6%, 0.3%]	10

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)	3.7%	[3.7%, 3.7%]	1
Regressions ❌ (secondary)	3.1%	[3.1%, 3.1%]	1
Improvements ✅ (primary)	-3.1%	[-3.1%, -3.1%]	1
Improvements ✅ (secondary)	-2.3%	[-2.7%, -1.9%]	2
All ❌✅ (primary)	0.3%	[-3.1%, 3.7%]	2

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)	2.9%	[2.5%, 3.3%]	2
Regressions ❌ (secondary)	-	-	0
Improvements ✅ (primary)	-5.5%	[-5.5%, -5.5%]	1
Improvements ✅ (secondary)	-	-	0
All ❌✅ (primary)	0.1%	[-5.5%, 3.3%]	3

the arithmetic mean of the percent change ↩ ↩² ↩³
number of relevant changes ↩ ↩² ↩³

lqd · 2022-08-26T08:21:36Z

@rust-timer build 0fcc3f7cb58982a7dea6cdb52d99e258201f2cba

rust-timer · 2022-08-26T08:21:38Z

Queued 0fcc3f7cb58982a7dea6cdb52d99e258201f2cba with parent 76f3b89, future comparison URL.

rust-timer · 2022-08-26T09:54:16Z

Finished benchmarking commit (0fcc3f7cb58982a7dea6cdb52d99e258201f2cba): comparison URL.

Overall result: ❌✅ regressions and improvements - ACTION NEEDED

Benchmarking this pull request likely means that it is perf-sensitive, so we're automatically marking it as not fit for rolling up. While you can manually mark this PR as fit for rollup, we strongly recommend not doing so since this PR may lead to changes in compiler perf.

Next Steps: If you can justify the regressions found in this try perf run, please indicate this with @rustbot label: +perf-regression-triaged along with sufficient written justification. If you cannot justify the regressions please fix the regressions and do another perf run. If the next run shows neutral or positive results, the label will be automatically removed.

@bors rollup=never
@rustbot label: +S-waiting-on-review -S-waiting-on-perf +perf-regression

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)	0.8%	[0.6%, 1.1%]	6
Improvements ✅ (primary)	-	-	0
Improvements ✅ (secondary)	-0.3%	[-0.4%, -0.3%]	9
All ❌✅ (primary)	-	-	0

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)	4.7%	[2.5%, 6.8%]	2
Improvements ✅ (primary)	-	-	0
Improvements ✅ (secondary)	-2.7%	[-2.7%, -2.7%]	1
All ❌✅ (primary)	-	-	0

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)	1.7%	[1.7%, 1.7%]	1
Regressions ❌ (secondary)	4.2%	[4.2%, 4.2%]	1
Improvements ✅ (primary)	-3.3%	[-3.3%, -3.3%]	1
Improvements ✅ (secondary)	-	-	0
All ❌✅ (primary)	-0.8%	[-3.3%, 1.7%]	2

the arithmetic mean of the percent change ↩ ↩² ↩³
number of relevant changes ↩ ↩² ↩³

lqd · 2022-08-26T10:38:01Z

#100034 seems involved for deeply-nested-multi at least. Sensible, as that benchmark contains a long Box chain, but it's not the whole picture here. (And a big part of the regression here looks to be related to the privacy checker that I've been hoping to optimize with @oli-obk, for these big deep recursive type chains.)

There's not a whole lot else in this rollup otherwise so what am I missing ?

rylev · 2022-08-30T15:55:29Z

I don't see anything in addition to @lqd's analysis. Going to mark this as triaged.

@rustbot label: perf-regression-triaged

Yiming Lei and others added 21 commits July 8, 2022 17:23

make slice::{split_at,split_at_unchecked} const functions

97c963d

Remove unstable Result::into_ok_or_err

83f081f

Replace a try_fold in rustc_transmute to use ControlFlow instead of R…

39809c5

…esult

Reduce code size of assert_matches_failed

289d7cc

Handle Err in ast::LitKind::to_token_lit.

b997af9

Fixes rust-lang#100948.

Fix liveness analysis for yield terminators

31d892a

A resume place is evaluated and assigned to only after a yield terminator resumes. Ensure that locals used when evaluating the resume place are live across the yield.

Elaborate all box dereferences in ElaborateBoxDerefs

4462b4a

so that it is the only pass responsible for elaboration, instead of splitting this responsibility between the `StateTransform` and `ElaborateBoxDerefs`.

Add method that applies DefUse effect

58eabb2

Inline trivial From<Local> for Place<'_> impl

4394ea8

review

bc3d719

Adding support for rustc_serialize encode and decode for Box and Vec …

258d367

…that use a custom allocator

Rollup merge of rust-lang#99920 - emarteca:custom-allocator-support, …

28457e1

…r=oli-obk Custom allocator support in `rustc_serialize` Adding support for `rustc_serialize` encode/decode for `Box` and `Vec` that use a custom allocator.

Rollup merge of rust-lang#100604 - dtolnay:okorerr, r=m-ou-se

ba31a9b

Remove unstable Result::into_ok_or_err Pending FCP: rust-lang#82223 (comment) ```@rustbot``` label +waiting-on-fcp

Rollup merge of rust-lang#100933 - a1phyr:cheap_assert_match_failed, …

6849555

…r=JoshTriplett Reduce code size of `assert_matches_failed` Using `write_str` instead of `<str as Display>::fmt` avoids the `pad` function which is very expensive to have in size-constrained code.

Rollup merge of rust-lang#100978 - nnethercote:fix-100948, r=petroche…

d4a5ec1

…nkov Handle `Err` in `ast::LitKind::to_token_lit`. Fixes rust-lang#100948. r? ``@petrochenkov``

bors added the S-waiting-on-bors Status: Waiting on bors to run and complete tests. Bors will change the label on completion. label Aug 26, 2022

bors added the merged-by-bors This PR was explicitly merged by bors. label Aug 26, 2022

bors merged commit 13a6aaf into rust-lang:master Aug 26, 2022

rustbot added this to the 1.65.0 milestone Aug 26, 2022

bors mentioned this pull request Aug 26, 2022

Add slice::{split_,}{first,last}_chunk{,_mut} #95198

Merged

rustbot added the perf-regression Performance regression. label Aug 26, 2022

JohnTitor deleted the rollup-73f2fhb branch August 26, 2022 08:54

rustbot added the S-waiting-on-review Status: Awaiting review from the assignee but also interested parties. label Aug 26, 2022

rustbot added the perf-regression-triaged The performance regression has been triaged. label Aug 30, 2022

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

Rollup of 8 pull requests #101017

Rollup of 8 pull requests #101017

JohnTitor commented Aug 26, 2022

JohnTitor commented Aug 26, 2022

bors commented Aug 26, 2022

bors commented Aug 26, 2022

bors commented Aug 26, 2022

rust-timer commented Aug 26, 2022

rust-timer commented Aug 26, 2022

lqd commented Aug 26, 2022

rust-timer commented Aug 26, 2022

rust-timer commented Aug 26, 2022

lqd commented Aug 26, 2022

rylev commented Aug 30, 2022

Rollup of 8 pull requests #101017

Rollup of 8 pull requests #101017

Conversation

JohnTitor commented Aug 26, 2022

JohnTitor commented Aug 26, 2022

bors commented Aug 26, 2022

bors commented Aug 26, 2022

bors commented Aug 26, 2022

rust-timer commented Aug 26, 2022

rust-timer commented Aug 26, 2022

Overall result: ❌✅ regressions and improvements - ACTION NEEDED

Instruction count

Max RSS (memory usage)

Cycles

Footnotes

lqd commented Aug 26, 2022

rust-timer commented Aug 26, 2022

rust-timer commented Aug 26, 2022

Overall result: ❌✅ regressions and improvements - ACTION NEEDED

Instruction count

Max RSS (memory usage)

Cycles

Footnotes

lqd commented Aug 26, 2022

rylev commented Aug 30, 2022