Rollup of 8 pull requests #100048

matthiaskrgr · 2022-08-02T05:30:48Z

Successful merges:

codegen_fulfill_obligation expect erased regions #99156 (codegen_fulfill_obligation expect erased regions)
only run --all-targets in stage0 for Std #99293 (only run --all-targets in stage0 for Std)
Fix item info pos and height #99779 (Fix item info pos and height)
Remove guess_head_span #99994 (Remove guess_head_span)
Use Parser's restrictions instead of let_expr_allowed #100011 (Use Parser's restrictions instead of let_expr_allowed)
kmc-solid: Update Socket::connect_timeout to be in line with #78802 #100017 (kmc-solid: Update Socket::connect_timeout to be in line with Implement network primitives with ideal Rust layout, not C system layout #78802)
Update rustc man page to match rustc --help #100037 (Update rustc man page to match rustc --help)
Update books #100042 (Update books)

Failed merges:

r? @ghost
@rustbot modify labels: rollup

…tAddr` `(x: SocketAddr).into_inner()` evaluates to `(SocketAddrCRepr, socklen_t)` instead of `(*const sockaddr, socklen_t)` as of commit 55e23db.

This brings the `--crate-type`, `--emit`, and `--print` options' allowed arguments into sync with that printed by `rustc --help`.

`codegen_fulfill_obligation` expect erased regions it's a query, so by erasing regions before calling it, we get better caching. This doesn't actually change anything as its already the status quo.

only run --all-targets in stage0 for Std Repro'd the issue with `python3 x.py check --stage 1 library/std` and tested the fix with the same command. r? `@jyn514` I tried to implement [this solution](rust-lang#98720 (comment)), but didn't have any luck. I don't think I fully understood what needed to be done. However, I would love to be mentored on it since it would be a more correct solution, and I can learn more about how bootstrap works.

…d-height, r=notriddle Fix item info pos and height Fixes rust-lang#98266. Fixes rust-lang#98343. You can test it [here](https://rustdoc.crud.net/imperio/fix-item-info-pos-and-height/lib2/trait.Trait.html). Here is a screenshot of the result: ![Screenshot from 2022-07-26 21-55-53](https://user-images.githubusercontent.com/3050060/181100624-18b8b045-5c25-4c7c-9c44-97d55d29b675.png) r? `@jsha`

…ee1-dead Remove `guess_head_span` follow-up to rust-lang#98519

…ion, r=fee1-dead Use Parser's `restrictions` instead of `let_expr_allowed` This also means that the `ALLOW_LET` flag is reset properly for subexpressions, so we can properly deny things like `a && (b && let c = d)`. Also the parser is a tiny bit smaller now. It doesn't reject _all_ bad `let` expr usages, just a bit more. cc `@c410-f3r`

…78802, r=thomcc kmc-solid: Update `Socket::connect_timeout` to be in line with rust-lang#78802 Fixes the build failure of the [`*-kmc-solid_*`](https://doc.rust-lang.org/nightly/rustc/platform-support/kmc-solid.html) Tier 3 targets after rust-lang#78802. ``` error[E0308]: mismatched types --> library\std\src\sys\solid\net.rs:234:45 | 234 | cvt(netc::connect(self.0.raw(), addrp, len)) | ------------- ^^^^^ expected *-ptr, found union `SocketAddrCRepr` | | | arguments to this function are incorrect | = note: expected raw pointer `*const sockets::sockaddr` found union `SocketAddrCRepr` note: function defined here --> library\std\src\sys\solid\abi\sockets.rs:173:12 | 173 | pub fn connect(s: c_int, name: *const sockaddr, namelen: socklen_t) -> c_int; | ^^^^^^^ ```

Update rustc man page to match `rustc --help` This brings the `--crate-type`, `--emit`, and `--print` options' allowed arguments into sync with that printed by `rustc --help`. c.f. the `opt::multi_s` calls for `"crate-type"`, `"emit"`, and `"print"` here: https://github.com/rust-lang/rust/blob/master/compiler/rustc_session/src/config.rs

Update books ## reference 2 commits in a92be0fef439b3d8e0468d82cb24812d303520a0..f3d3953bf3b158d596c96d55ce5366f9f3f972e9 2022-07-21 19:01:23 -0700 to 2022-08-01 17:17:37 -0700 - Add `let_chains` references (rust-lang/reference#1179) - Remove outdated warning (rust-lang/reference#1243) ## rust-by-example 18 commits in 3155db49b0d57cd82c65456ac210b69ecec5ccb1..ee342dc91e1ba1bb1e1f1318f84bbe3bfac04798 2022-07-05 20:35:53 -0300 to 2022-07-27 11:06:36 -0300 - Closure inferred twice (rust-lang/rust-by-example#1588) - fix a syntax bug in example assembly (rust-lang/rust-by-example#1511) - Minor grammar change in src/std/rc.md paragraph 2 (rust-lang/rust-by-example#1586) - Fix typo in asm.md (rust-lang/rust-by-example#1585) - Fix incorrect padding in fixed-width print (rust-lang/rust-by-example#1584) - Update print.md (rust-lang/rust-by-example#1582) - add-chapter-on-defaults (rust-lang/rust-by-example#1580) - Fix typo (rust-lang/rust-by-example#1579) - fix a compile error (rust-lang/rust-by-example#1578) - Suggest using mod.rs pattern to share test code (rust-lang/rust-by-example#1577) - fix a compile error in iter_any.md (rust-lang/rust-by-example#1576) - Mention attribute like macros in attributes.md (rust-lang/rust-by-example#1574) - Update exercise to be clearer (rust-lang/rust-by-example#1573) - fixes link for turbofish in testcase_mapreduce.md (rust-lang/rust-by-example#1572) - Fix inconsistency between comment and code in hello/print.md (rust-lang/rust-by-example#1571) - Fixes a typo in print.md (rust-lang/rust-by-example#1570) - into_iter-moves-elements (rust-lang/rust-by-example#1569) - Fix a typo in print.md (rust-lang/rust-by-example#1568) ## rustc-dev-guide 16 commits in d5201cddace979b299ec1bf9fd8997338151aa9d..04f3cf0bb2f5a6ee2bfc4b1a6a6cd8c11d1c5531 2022-07-21 04:48:49 +0200 to 2022-07-31 07:46:57 +0200 - address review comment - accept review suggestion - try address review comments - summary of chapter - Update src/building/compiler-documenting.md - revamp doc-build chapter - minor fixes - Prefer relative links - Fix the link to clippy docs - Fix the link to `ResolverAstLowering` - Fix the link to `ProcMacro` trait - Fix the link to `Lazy<T>` - Add instructions to fix build errors in std after adding a new target - Document how to build a cross-compiler - Add documentation about Microsoft provided debuggers and CodeView/PDB… (rust-lang/rustc-dev-guide#1406) - rust-analyzer is now a subtree ## embedded-book 2 commits in 766979590da8100998f0d662499d4a901d8d1640..befe6840874311635c417cf731377f07234ee373 2022-07-04 09:13:58 +0000 to 2022-07-25 07:51:14 +0000 - Updated instructions for running first Hardware example (rust-embedded/book#323) - Improved ligability for hardware.md (rust-embedded/book#324)

matthiaskrgr · 2022-08-02T05:31:03Z

@bors r+ rollup=never p=8

bors · 2022-08-02T05:31:04Z

📌 Commit 6ab19fd has been approved by matthiaskrgr

It is now in the queue for this repository.

bors · 2022-08-02T06:09:26Z

⌛ Testing commit 6ab19fd with merge ca37a45...

bors · 2022-08-02T08:50:19Z

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

rust-timer · 2022-08-02T08:52:43Z

📌 Perf builds for each rolled up PR:

PR#	Perf Build Sha
#100042	1e4d9707dc638b65ab09b4e13d2bb259731a393d
#100037	6ac1233a3af09289d5e0f9b64bf3061a021c6f9c
#100017	7b4cfed3ee1c0dfdf9f89603123a4e2a1c52298c
#100011	bf3d871d93dce0cb0ff8c2c2cb4782c8e1407114
#99994	4078a68fa6c9a7d139a031083896fd7dc1f9e102
#99779	92c2df4f40ea8fb7b7193a86e28824fc38f46bcf
#99293	f34a020a6aedb09a98dc6d594be6714170b7359d
#99156	bef8cc7d22cf15d24ecef68ed18937149c65c7ff

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-02T10:11:11Z

Finished benchmarking commit (ca37a45): comparison url.

Instruction count

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

Max RSS (memory usage)

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

Cycles

Results

Primary benchmarks: 🎉 relevant improvement found
Secondary benchmarks: 😿 relevant regressions found

	mean¹	max	count²
Regressions 😿 (primary)	N/A	N/A	0
Regressions 😿 (secondary)	4.4%	6.1%	2
Improvements 🎉 (primary)	-2.5%	-2.5%	1
Improvements 🎉 (secondary)	N/A	N/A	0
All 😿🎉 (primary)	-2.5%	-2.5%	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 ↩

rylev · 2022-08-02T10:35:46Z

Note: this is just for testing purposes. There does not seem to be any perf issue with this rollup so normally perf runs would not be necessary

We've added the ability to run perf tests on individual rolled up PRs. You can see the mapping between a rolled-up PR number and the sha for "unrolled" build in this comment. I'm going to run perf for two of them to just check that the flow works properly.

@rust-timer build 92c2df4f40ea8fb7b7193a86e28824fc38f46bcf
@rust-timer build bef8cc7d22cf15d24ecef68ed18937149c65c7ff

rust-timer · 2022-08-02T10:35:47Z

Queued 92c2df4f40ea8fb7b7193a86e28824fc38f46bcf with parent 9538d2d, future comparison URL.

rust-timer · 2022-08-02T11:52:13Z

Finished benchmarking commit (92c2df4f40ea8fb7b7193a86e28824fc38f46bcf): comparison url.

Instruction count

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

Max RSS (memory usage)

Results

Primary benchmarks: no relevant changes found
Secondary benchmarks: mixed results

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

Cycles

Results

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

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

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

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.

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

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

lcnr and others added 19 commits July 6, 2022 12:21

use TraitEngineExt to register obligations

4387e4b

cg_fulfill_obligation: expect erased regions

bf18310

only run --all-targets in stage0

42c14ab

Fix display of item info and unify their height

51e658f

Add GUI test for item info position

9903f41

Use expr parse restrictions for let expr parsing

6be7a87

kmc-solid: Adapt to a recent change in the IntoInner impl of `Socke…

bfbda81

…tAddr` `(x: SocketAddr).into_inner()` evaluates to `(SocketAddrCRepr, socklen_t)` instead of `(*const sockaddr, socklen_t)` as of commit 55e23db.

add comment

c5d661a

Update rustc man page to match rustc --help

9864db6

This brings the `--crate-type`, `--emit`, and `--print` options' allowed arguments into sync with that printed by `rustc --help`.

Update books

1bdb0ab

remove a SourceMap::guess_head_span

a3c2d55

Rollup merge of rust-lang#99156 - lcnr:omoe-wa, r=wesleywiser

0629445

`codegen_fulfill_obligation` expect erased regions it's a query, so by erasing regions before calling it, we get better caching. This doesn't actually change anything as its already the status quo.

Rollup merge of rust-lang#99994 - TaKO8Ki:remove-guess-head-span, r=f…

17f76a1

…ee1-dead Remove `guess_head_span` follow-up to rust-lang#98519

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

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

bors merged commit ca37a45 into rust-lang:master Aug 2, 2022

rustbot added this to the 1.64.0 milestone Aug 2, 2022

bors mentioned this pull request Aug 2, 2022

Fix item-info color #99761

Open

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

lqd mentioned this pull request Aug 24, 2022

Bisect through rollups using perf.rlo's individual PR artifacts rust-lang/cargo-bisect-rustc#202

Closed

matthiaskrgr deleted the rollup-agimvm6 branch October 9, 2022 00:31

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

Rollup of 8 pull requests #100048

Rollup of 8 pull requests #100048

matthiaskrgr commented Aug 2, 2022

matthiaskrgr commented Aug 2, 2022

bors commented Aug 2, 2022

bors commented Aug 2, 2022

bors commented Aug 2, 2022

rust-timer commented Aug 2, 2022

rust-timer commented Aug 2, 2022

rylev commented Aug 2, 2022

rust-timer commented Aug 2, 2022

rust-timer commented Aug 2, 2022

Rollup of 8 pull requests #100048

Rollup of 8 pull requests #100048

Conversation

matthiaskrgr commented Aug 2, 2022

matthiaskrgr commented Aug 2, 2022

bors commented Aug 2, 2022

bors commented Aug 2, 2022

bors commented Aug 2, 2022

rust-timer commented Aug 2, 2022

rust-timer commented Aug 2, 2022

Instruction count

Max RSS (memory usage)

Cycles

Footnotes

rylev commented Aug 2, 2022

rust-timer commented Aug 2, 2022

rust-timer commented Aug 2, 2022

Instruction count

Max RSS (memory usage)

Cycles

Footnotes