Rollup of 8 pull requests #102165

matthiaskrgr · 2022-09-23T02:29:21Z

Successful merges:

Split out async_fn_in_trait into a separate feature #100734 (Split out async_fn_in_trait into a separate feature)
Note if mismatched types have a similar name #101664 (Note if mismatched types have a similar name)
Migrated the rustc_passes annotation without effect diagnostic infrastructure #101815 (Migrated the rustc_passes annotation without effect diagnostic infrastructure)
Distribute rust-docs-json via rustup. #102042 (Distribute rust-docs-json via rustup.)
rustdoc: remove unnecessary max-width on headers #102066 (rustdoc: remove unnecessary max-width on headers)
Deduplicate two functions that would soon have been three #102095 (Deduplicate two functions that would soon have been three)
Set 'exec-env:RUST_BACKTRACE=0' in const-eval-select tests #102104 (Set 'exec-env:RUST_BACKTRACE=0' in const-eval-select tests)
Allow full relro on powerpc64-unknown-linux-gnu #102112 (Allow full relro on powerpc64-unknown-linux-gnu)

Failed merges:

r? @ghost
@rustbot modify labels: rollup

…new diagnostic infrastructure

This allows the tests to pass even if the user has RUST_BACKTRACE set when running 'x.py'

This was previously limited to partial relro, citing issues on RHEL6, but that's no longer a supported platform since rust-lang#95026. We have long been enabling full relro in RHEL7's own Rust builds for ppc64, without trouble, so it should be fine to drop this workaround.

This code was added in 003b2bc to prevent these headers from overlapping `.out-of-band` side items. That stopped being a problem when 3f92ff3 switched rustdoc over to using `float`, rather than `position: absolute`, to implement this.

PR rust-lang#101224 added support for async fn in trait desuraging behind the return_position_impl_trait_in_trait feature. Split this out so that it's behind its own feature gate, since async fn in trait doesn't need to follow the same stabilization schedule.

…iler-errors Split out async_fn_in_trait into a separate feature PR rust-lang#101224 added support for async fn in trait desuraging behind the `return_position_impl_trait_in_trait` feature. Split this out so that it's behind its own feature gate, since async fn in trait doesn't need to follow the same stabilization schedule.

Note if mismatched types have a similar name If users get a type error between similarly named types, it will point out that these are actually different types, and where they were defined.

Migrated the rustc_passes annotation without effect diagnostic infrastructure Small change to move the validation for annotations to the new diagnostic infrastructure.

…to-rustup, r=Mark-Simulacrum Distribute rust-docs-json via rustup. I am not 100% sure on how to treat `rust-json-docs` in `target_host_combination`. I went along with a similar strategy to the one used for `rust-docs`, but looking for guidance there.

…dth, r=GuillaumeGomez rustdoc: remove unnecessary `max-width` on headers This code was added in 003b2bc to prevent these headers from overlapping `.out-of-band` side items. That stopped being a problem when 3f92ff3 switched rustdoc over to using `float`, rather than `position: absolute`, to implement this.

Deduplicate two functions that would soon have been three rust-lang#101900 would have added another copy of this for effects

…k-Simulacrum Set 'exec-env:RUST_BACKTRACE=0' in const-eval-select tests This allows the tests to pass even if the user has RUST_BACKTRACE set when running 'x.py'

Allow full relro on powerpc64-unknown-linux-gnu This was previously limited to partial relro, citing issues on RHEL6, but that's no longer a supported platform since rust-lang#95026. We have long been enabling full relro in RHEL7's own Rust builds for ppc64, without trouble, so it should be fine to drop this workaround.

matthiaskrgr · 2022-09-23T02:29:41Z

@bors r+ rollup=never p=8

bors · 2022-09-23T02:29:43Z

📌 Commit 8e3b9bc has been approved by matthiaskrgr

It is now in the queue for this repository.

bors · 2022-09-23T04:20:16Z

⌛ Testing commit 8e3b9bc with merge 7393c37a38739ec3772df63fd56d308384006ab3...

bors · 2022-09-23T04:21:19Z

💔 Test failed - checks-actions

matthiaskrgr · 2022-09-23T05:08:39Z

@bors retry no logs

bors · 2022-09-23T09:33:31Z

⌛ Testing commit 8e3b9bc with merge 4d44e09...

bors · 2022-09-23T12:15:07Z

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

rust-timer · 2022-09-23T12:17:44Z

📌 Perf builds for each rolled up PR:

PR#	Perf Build Sha
#102112	125609db0df6222cd3090fd834d8cb12ae4b3f6b
#102104	cbbcacf5a5ce1dbcb7a8322ee7182037eda0154d
#102095	5b567b510083887eb4b801aac1bc322c9430ae06
#102066	1f62ca75e44a480b26c6ba22342b48ed6d79c7af
#102042	ecf907ac2cd70801e8ce0d07904020dbe4f899c2
#101815	550146463d0a5098ec2631a79411ee08e2323f4b
#101664	50bcf570c415d69fab5822a9e8ce6539e238582d
#100734	4e9c61458cf8e1f94450560581260d9b18b59fb6

previous master: bc4d574ff2

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-09-23T13:33:27Z

Finished benchmarking commit (4d44e09): comparison URL.

Overall result: no relevant changes - no action needed

@rustbot label: -perf-regression

Instruction count

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

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.4%	[1.2%, 1.6%]	7
Improvements ✅ (primary)	-	-	0
Improvements ✅ (secondary)	-2.4%	[-3.1%, -1.9%]	4
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)	-	-	0
Regressions ❌ (secondary)	3.5%	[3.4%, 3.7%]	3
Improvements ✅ (primary)	-2.9%	[-3.0%, -2.7%]	2
Improvements ✅ (secondary)	-	-	0
All ❌✅ (primary)	-2.9%	[-3.0%, -2.7%]	2

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

rust-log-analyzer · 2022-09-24T00:57:10Z

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

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

diegooliveira and others added 20 commits September 14, 2022 15:05

Migrated the rustc_passes lint for annotations without effect to the …

6a47326

…new diagnostic infrastructure

Note if mismatched types have a similar name

8477b9b

Address feedback

3699c24

Print out the proper crate path

14e9893

Incorporate feedback

c658660

Deduplicate two functions that would soon have been three

e0a2e2d

Set 'exec-env:RUST_BACKTRACE=0' in const-eval-select tests

3d8b3e6

This allows the tests to pass even if the user has RUST_BACKTRACE set when running 'x.py'

rustdoc: update test case for headers without max-width

f528d49

Distribute rust-json-docs via rustup.

e572d51

Rollup merge of rust-lang#101664 - mejrs:similarity, r=fee1-dead

c2d2535

Note if mismatched types have a similar name If users get a type error between similarly named types, it will point out that these are actually different types, and where they were defined.

Rollup merge of rust-lang#101815 - diegooliveira:master, r=davidtwco

695b708

Migrated the rustc_passes annotation without effect diagnostic infrastructure Small change to move the validation for annotations to the new diagnostic infrastructure.

Rollup merge of rust-lang#102095 - oli-obk:simplify, r=TaKO8Ki

dac0f6e

Deduplicate two functions that would soon have been three rust-lang#101900 would have added another copy of this for effects

Rollup merge of rust-lang#102104 - Aaron1011:no-test-backtrace, r=Mar…

3148b3d

…k-Simulacrum Set 'exec-env:RUST_BACKTRACE=0' in const-eval-select tests This allows the tests to pass even if the user has RUST_BACKTRACE set when running 'x.py'

bors added the S-waiting-on-bors Status: Waiting on bors to run and complete tests. Bors will change the label on completion. label Sep 23, 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 Sep 23, 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 Sep 23, 2022

bors added the merged-by-bors This PR was explicitly merged by bors. label Sep 23, 2022

bors merged commit 4d44e09 into rust-lang:master Sep 23, 2022

rustbot added this to the 1.66.0 milestone Sep 23, 2022

davidtwco removed the A-translation Area: Translation infrastructure, and migrating existing diagnostics to SessionDiagnostic label Oct 4, 2022

RalfJung mentioned this pull request Oct 4, 2022

Missing documentation of -o flags supported on push josh-project/josh#962

Open

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

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

Rollup of 8 pull requests #102165

Rollup of 8 pull requests #102165

matthiaskrgr commented Sep 23, 2022

matthiaskrgr commented Sep 23, 2022

bors commented Sep 23, 2022

bors commented Sep 23, 2022

bors commented Sep 23, 2022

matthiaskrgr commented Sep 23, 2022

bors commented Sep 23, 2022

bors commented Sep 23, 2022

rust-timer commented Sep 23, 2022

rust-timer commented Sep 23, 2022

rust-log-analyzer commented Sep 24, 2022

Rollup of 8 pull requests #102165

Rollup of 8 pull requests #102165

Conversation

matthiaskrgr commented Sep 23, 2022

matthiaskrgr commented Sep 23, 2022

bors commented Sep 23, 2022

bors commented Sep 23, 2022

bors commented Sep 23, 2022

matthiaskrgr commented Sep 23, 2022

bors commented Sep 23, 2022

bors commented Sep 23, 2022

rust-timer commented Sep 23, 2022

rust-timer commented Sep 23, 2022

Overall result: no relevant changes - no action needed

Instruction count

Max RSS (memory usage)

Cycles

Footnotes

rust-log-analyzer commented Sep 24, 2022