Rollup of 11 pull requests by matthiaskrgr · Pull Request #98545 · rust-lang/rust

matthiaskrgr · 2022-06-26T17:47:10Z

Successful merges:

std: use an event-flag-based thread parker on SOLID #97140 (std: use an event-flag-based thread parker on SOLID)
[rustc_parse] Forbid lets in certain places #97295 ([rustc_parse] Forbid lets in certain places)
make const_err show up in future breakage reports #97743 (make const_err show up in future breakage reports)
Stabilize NonZero* checked operations constness. #97908 (Stabilize NonZero* checked operations constness.)
Transform help popup into a pocket menu #98297 (Transform help popup into a pocket menu)
macros: use typed identifiers in diag and subdiag derive #98428 (macros: use typed identifiers in diag and subdiag derive)
Respect --color when building rustbuild itself #98528 (Respect --color when building rustbuild itself)
Add regression test for generic const in rustdoc #98535 (Add regression test for generic const in rustdoc)
Add a ui test for issue #91883 #98538 (Add a ui test for issue GAT lifetime error is unhelpful #91883)
Add regression test for #87558 #98540 (Add regression test for ICE: Normalizing ImplHeader, compiler/rustc_trait_selection/src/traits/project.rs #87558)
Update std::alloc::System doc example code style #98541 (Update std::alloc::System doc example code style)

Failed merges:

r? @ghost
@rustbot modify labels: rollup

Co-authored-by: Tomoaki Kawada <kawada@kmckk.co.jp>

Using typed identifiers instead of strings with the Fluent identifier enables the diagnostic derive to benefit from the compile-time validation that comes with typed identifiers - use of a non-existent Fluent identifier will not compile. Signed-off-by: David Wood <david.wood@huawei.com>

As in the diagnostic derive, using typed identifiers in the subdiagnostic derive improves the diagnostics of using the subdiagnostic derive as Fluent messages will be confirmed to exist at compile-time. Signed-off-by: David Wood <david.wood@huawei.com>

Now that typed identifiers are used in both derives, constructors for the `DiagnosticMessage` and `SubdiagnosticMessage` types are not required. Signed-off-by: David Wood <david.wood@huawei.com>

std: use an event-flag-based thread parker on SOLID `Mutex` and `Condvar` are being replaced by more efficient implementations, which need thread parking themselves (see rust-lang#93740). Therefore, the generic `Parker` needs to be replaced on all platforms where the new lock implementation will be used, which, after rust-lang#96393, are SOLID, SGX and Hermit (more PRs coming soon). SOLID, conforming to the [μITRON specification](http://www.ertl.jp/ITRON/SPEC/FILE/mitron-400e.pdf), has event flags, which are a thread parking primitive very similar to `Parker`. However, they do not make any atomic ordering guarantees (even though those can probably be assumed) and necessitate a system call even when the thread token is already available. Hence, this `Parker`, like the Windows parker, uses an extra atomic state variable. I future-proofed the code by wrapping the event flag in a `WaitFlag` structure, as both SGX and Hermit can share the Parker implementation, they just have slightly different primitives (SGX uses signals and Hermit has a thread blocking API). `````@kawadakk````` I assume you are the target maintainer? Could you test this for me?

…ompiler-errors [rustc_parse] Forbid `let`s in certain places Currently only forbids in locals to resolverust-lang#94927 (comment) but feel free to point any other places.

… r=estebank make const_err show up in future breakage reports As tracked in rust-lang#71800, const_err should become a hard error Any Day Now (TM). I'd love to move forward with that sooner rather than later; it has been deny-by-default for many years and a future incompat lint since rust-lang#80394 (landed more than a year ago). Some CTFE errors are already hard errors since rust-lang#86194. But before we truly make it a hard error in all cases, we now have one more intermediate step we can take -- to make it show up in future breakage reports. Cc `````@rust-lang/wg-const-eval`````

…_ops_constness, r=scottmcm Stabilize NonZero* checked operations constness. Partial stabilization for rust-lang#97547 (continued).

…notriddle Transform help popup into a pocket menu Just like we moved the settings menu into a "pocket menu", it's doing the same to the help popup. You can test it [here](https://rustdoc.crud.net/imperio/help-pocket-menu/doc/foo/index.html) and here is a screenshot: ![Screenshot from 2022-06-20 20-58-29](https://user-images.githubusercontent.com/3050060/174663718-538e9d11-3bf9-48b2-8909-f9bfe75af135.png) r? ``````````@jsha``````````

…identifiers, r=oli-obk macros: use typed identifiers in diag and subdiag derive Using typed identifiers instead of strings with the Fluent identifiers in the diagnostic and subdiagnostic derives - this enables the diagnostic derive to benefit from the compile-time validation that comes with typed identifiers, namely that use of a non-existent Fluent identifier will not compile. r? `````@oli-obk`````

…lacrum Respect --color when building rustbuild itself Separated out from rust-lang#95503.

…9, r=lcnr Add regression test for generic const in rustdoc Fixesrust-lang#92859. r? ```@lcnr```

…=Mark-Simulacrum Add a ui test for issue rust-lang#91883closesrust-lang#91883

…58, r=Mark-Simulacrum Add regression test for rust-lang#87558Fixesrust-lang#87558

Update `std::alloc::System` doc example code style `return` on the last line of a block is unidiomatic so I don't think the example should be using that here

matthiaskrgr · 2022-06-26T17:47:23Z

@bors r+ rollup=never p=11

bors · 2022-06-26T17:47:24Z

📌 Commit 935958e has been approved by matthiaskrgr

bors · 2022-06-26T19:02:03Z

⌛ Testing commit 935958e with merge c80c4b8...

bors · 2022-06-26T21:28:18Z

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

rust-timer · 2022-06-26T22:33:30Z

Finished benchmarking commit (c80c4b8): comparison url.

Instruction count

Primary benchmarks: 😿 relevant regression found
Secondary benchmarks: no relevant changes found

	mean¹	max	count²
Regressions 😿 (primary)	0.4%	0.4%	1
Regressions 😿 (secondary)	N/A	N/A	0
Improvements 🎉 (primary)	N/A	N/A	0
Improvements 🎉 (secondary)	N/A	N/A	0
All 😿🎉 (primary)	0.4%	0.4%	1

Max RSS (memory usage)

Results

Primary benchmarks: 😿 relevant regressions found
Secondary benchmarks: mixed results

	mean¹	max	count²
Regressions 😿 (primary)	5.9%	7.2%	2
Regressions 😿 (secondary)	2.5%	2.5%	1
Improvements 🎉 (primary)	N/A	N/A	0
Improvements 🎉 (secondary)	-3.2%	-3.2%	1
All 😿🎉 (primary)	5.9%	7.2%	2

Cycles

Results

Primary benchmarks: 😿 relevant regression found
Secondary benchmarks: 😿 relevant regression found

	mean¹	max	count²
Regressions 😿 (primary)	4.7%	4.7%	1
Regressions 😿 (secondary)	4.2%	4.2%	1
Improvements 🎉 (primary)	N/A	N/A	0
Improvements 🎉 (secondary)	N/A	N/A	0
All 😿🎉 (primary)	4.7%	4.7%	1

If you disagree with this performance assessment, please file an issue in rust-lang/rustc-perf.

@rustbot label: -perf-regression

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

joboetand others added 30 commits May 18, 2022 12:18

std: use an event flag based thread parker on SOLID
fd76552

std: fix deadlock in Parker
3b6ae15

std: solve priority issue for Parker
b9660de

Partial stabilization of "nonzero_unchecked_ops".
5823d7b

Stabilize NonZero* checked operations constness.
69e8e7e

std: relax memory orderings in Parker
caff723
Co-authored-by: Tomoaki Kawada <kawada@kmckk.co.jp>

Move help popup into a pocket menu as well
cc4f804

Add/update GUI tests for help pocket menu
3eb9e1a

Merge all popover hide functions into one
e4b2b41

errors: remove diagnostic message ctors
dc90d1d
Now that typed identifiers are used in both derives, constructors for the `DiagnosticMessage` and `SubdiagnosticMessage` types are not required. Signed-off-by: David Wood <david.wood@huawei.com>

[rustc_parse] Forbid lets in certain places
7475867

make const_err show up in future breakage reports
dc2cc10

bless remaining tests
af58692

bless after rebase
3899914

Update since to 1.64 (since we're after 1.63)
2339bb2

Respect --color when building rustbuild itself
028fd63

Add regression test forrust-lang#92859
0398aa8

add regression test forrust-lang#87558
0d71862

add a ui test for issuerust-lang#91883
30724eb

Update std::alloc::System docs
756118e

Rollup merge ofrust-lang#97295- c410-f3r:yet-another-let-chain, r=c…
5b31271
…ompiler-errors [rustc_parse] Forbid `let`s in certain places Currently only forbids in locals to resolverust-lang#94927 (comment) but feel free to point any other places.

Rollup merge ofrust-lang#97908- iago-lito:stabilize_nonzero_checked…
e8a2e26
…_ops_constness, r=scottmcm Stabilize NonZero* checked operations constness. Partial stabilization for rust-lang#97547 (continued).

Rollup merge ofrust-lang#98528- jyn514:bootstrap-color, r=Mark-Simu…
0c09846
…lacrum Respect --color when building rustbuild itself Separated out from rust-lang#95503.

Rollup merge ofrust-lang#98535- GuillaumeGomez:regression-test-9285…
50b6e7d
…9, r=lcnr Add regression test for generic const in rustdoc Fixesrust-lang#92859. r? ```@lcnr```

matthiaskrgr added 3 commits June 26, 2022 19:47

Rollup merge ofrust-lang#98538- TaKO8Ki:add-test-for-issue-91883, r…
5efe7c7
…=Mark-Simulacrum Add a ui test for issue rust-lang#91883closesrust-lang#91883

Rollup merge ofrust-lang#98540- TaKO8Ki:add-regression-test-for-875…
93ea1ec
…58, r=Mark-Simulacrum Add regression test for rust-lang#87558Fixesrust-lang#87558

Rollup merge ofrust-lang#98541- Veykril:patch-2, r=Dylan-DPC
935958e
Update `std::alloc::System` doc example code style `return` on the last line of a block is unidiomatic so I don't think the example should be using that here

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

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

bors merged commit c80c4b8 into rust-lang:masterJun 26, 2022

rustbot added this to the 1.64.0 milestone Jun 26, 2022

This was referenced Jun 26, 2022
Suggest adding a => after match guard #94932
Closed
Use CSS variables to handle theming #98460
Merged
Shorten def_span of closures to just their header #98482
Merged
std: use block_current_task for thread parking on Hermit #98534
Closed

matthiaskrgr deleted the rollup-njely29 branch July 30, 2022 10:32

Navigation Menu

Uh oh!

Uh oh!

Rollup of 11 pull requests - #98545

Rollup of 11 pull requests#98545
bors merged 33 commits into
rust-lang:masterfrom
matthiaskrgr:rollup-njely29

matthiaskrgr commented Jun 26, 2022

Uh oh!

matthiaskrgr commented Jun 26, 2022

Uh oh!

bors commented Jun 26, 2022

Uh oh!

bors commented Jun 26, 2022

Uh oh!

bors commented Jun 26, 2022

Uh oh!

rust-timer commented Jun 26, 2022

Uh oh!

Reviewers

Assignees

Labels

Projects

Milestone

Development

Uh oh!

14 participants

Uh oh!

Uh oh!

Conversation

matthiaskrgr commented Jun 26, 2022

Uh oh!

matthiaskrgr commented Jun 26, 2022

Uh oh!

bors commented Jun 26, 2022

Uh oh!

bors commented Jun 26, 2022

Uh oh!

bors commented Jun 26, 2022

Uh oh!

rust-timer commented Jun 26, 2022

Instruction count

Max RSS (memory usage)

Cycles

Footnotes

Uh oh!

Reviewers

Assignees

Labels

Projects

Milestone

Development

Uh oh!

14 participants