Rollup of 9 pull requests #98591

matthiaskrgr · 2022-06-27T20:35:16Z

Successful merges:

Fix rustdoc argument error #98331 (Fix rustdoc argument error)
Fix span issues in object safety suggestions #98506 (Fix span issues in object safety suggestions)
interpret: refactor allocation info query #98563 (interpret: refactor allocation info query)
small regions refactoring #98576 (small regions refactoring)
Fix "kind" for associated types in trait implementations in rustdoc JSON #98577 (Fix "kind" for associated types in trait implementations in rustdoc JSON)
Remove eddyb from miri failure pings #98578 (Remove eddyb from miri failure pings)
liballoc tests: avoid int2ptr cast #98579 (liballoc tests: avoid int2ptr cast)
Add triagebot mentions. #98581 (Add triagebot mentions.)
libcore tests: avoid int2ptr casts #98587 (libcore tests: avoid int2ptr casts)

Failed merges:

r? @ghost
@rustbot modify labels: rollup

We now have an infallible function that also tells us which kind of allocation we are talking about. Also we do longer have to distinguish between data and function allocations for liveness.

see comment added to the field in `VerifyBoundCx`.

…entations

…=notriddle Fix rustdoc argument error Fixes rust-lang#88756. It's a take over of rust-lang#88831. I cherry-picked the commits, fixed the merge conflict and the failing test. cc `@inashivb` `@jyn514` r? `@notriddle`

…stions, r=oli-obk Fix span issues in object safety suggestions Fixes rust-lang#98500

…li-obk interpret: refactor allocation info query We now have an infallible function that also tells us which kind of allocation we are talking about. Also we do longer have to distinguish between data and function allocations for liveness. This will help us to avoid "catching" `InterpError`s in Miri. r? `@oli-obk`

…kh726 small regions refactoring these commits should be fairly self-contained r? rust-lang/types

…notriddle Fix "kind" for associated types in trait implementations in rustdoc JSON Fixes rust-lang#81340. Contrary to what is suggested in the issue, I really think we should distinguish between associated items and "normal" constants and types. cc `@CraftSpider` `@SimonSapin` r? `@notriddle`

Remove eddyb from miri failure pings r? `@eddyb`

liballoc tests: avoid int2ptr cast I think we don't need `ptr::from_exposed_addr` here; `ptr::invalid` should be enough for this test. (And this makes Miri less unhappy when running these tests.)

…mulacrum Add triagebot mentions. This migrates the configuration of mentions from highfive to triagebot. I also fixed a few broken paths (error_codes.rs src/librustdoc/html/static/themes src/librustdoc/html/static/themes/ayu.css).

libcore tests: avoid int2ptr casts We don't need any of these pointers to actually be dereferenceable so using `ptr::invalid` should be fine. And then we can run Miri with strict provenance enforcement on the tests.

matthiaskrgr · 2022-06-27T20:35:35Z

@bors r+ rollup=never p=9

bors · 2022-06-27T20:35:36Z

📌 Commit f266821 has been approved by matthiaskrgr

bors · 2022-06-27T22:23:01Z

⌛ Testing commit f266821 with merge 7f08d04...

bors · 2022-06-28T01:03:39Z

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

rust-highfive · 2022-06-28T01:04:13Z

📣 Toolstate changed by #98591!

Tested on commit 7f08d04.
Direct link to PR: #98591

💔 miri on windows: test-pass → build-fail (cc @RalfJung @oli-obk).
💔 miri on linux: test-pass → build-fail (cc @RalfJung @oli-obk).

@RalfJung

Tested on commit rust-lang/rust@7f08d04. Direct link to PR: <rust-lang/rust#98591> 💔 miri on windows: test-pass → build-fail (cc @RalfJung @oli-obk). 💔 miri on linux: test-pass → build-fail (cc @RalfJung @oli-obk).

rust-timer · 2022-06-28T02:08:16Z

Finished benchmarking commit (7f08d04): comparison url.

Instruction count

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

	mean¹	max	count²
Regressions 😿 (primary)	N/A	N/A	0
Regressions 😿 (secondary)	1.2%	1.7%	7
Improvements 🎉 (primary)	N/A	N/A	0
Improvements 🎉 (secondary)	N/A	N/A	0
All 😿🎉 (primary)	N/A	N/A	0

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)	3.6%	4.2%	3
Improvements 🎉 (primary)	N/A	N/A	0
Improvements 🎉 (secondary)	-2.1%	-2.1%	2
All 😿🎉 (primary)	N/A	N/A	0

Cycles

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

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

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

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

rylev · 2022-06-28T15:32:19Z

It seems like #98576 is probably the only likely candidate for this regression.

@lcnr any thoughts on this? The cachegrind diff didn't reveal anything immediately interesting to me:

 -260,149,424  ???:<rustc_middle::ty::fold::RegionFolder as rustc_middle::ty::fold::FallibleTypeFolder>::try_fold_ty
  257,528,448  ???:<rustc_middle::ty::Ty as rustc_middle::ty::fold::TypeSuperFoldable>::super_fold_with::<rustc_middle::ty::fold::RegionFolder>
   67,497,361  ???:rustc_middle::ty::util::fold_list::<rustc_middle::ty::fold::RegionFolder, rustc_middle::ty::subst::GenericArg, <&rustc_middle::ty::list::List<rustc_middle::ty::subst::GenericArg> as rustc_middle::ty::fold::TypeFoldable>::try_fold_with<rustc_middle::ty::fold::RegionFolder>::{closure
  -38,998,821  ???:<&rustc_middle::ty::list::List<rustc_middle::ty::subst::GenericArg> as rustc_middle::ty::fold::TypeFoldable>::try_fold_with::<rustc_middle::ty::fold::RegionFolder>
   19,003,492  ???:<&rustc_middle::ty::list::List<rustc_middle::ty::Ty> as rustc_middle::ty::fold::TypeFoldable>::try_fold_with::<rustc_middle::ty::fold::RegionFolder>
   -6,228,826  ???:rustc_middle::ty::util::fold_list::<rustc_trait_selection::opaque_types::ReverseMapper, rustc_middle::ty::Ty, <&rustc_middle::ty::list::List<rustc_middle::ty::Ty> as rustc_middle::ty::fold::TypeFoldable>::try_fold_with<rustc_trait_selection::opaque_types::ReverseMapper>::{closure
    4,098,107  ???:<&rustc_middle::ty::list::List<rustc_middle::ty::Ty> as rustc_middle::ty::fold::TypeFoldable>::try_fold_with::<rustc_trait_selection::opaque_types::ReverseMapper>
   -3,605,392  ???:<rustc_middle::ty::fold::RegionFolder as rustc_middle::ty::fold::TypeFolder>::fold_region
    1,317,140  ???:<rustc_middle::ty::Ty as rustc_middle::ty::fold::TypeFoldable>::fold_with::<rustc_middle::ty::fold::RegionFolder>

compiler-errors and others added 25 commits June 25, 2022 14:59

Fix span issues in object safety suggestions

eff865c

interpret: refactor allocation info query

b094116

We now have an infallible function that also tells us which kind of allocation we are talking about. Also we do longer have to distinguish between data and function allocations for liveness.

Fix rustdoc argument error

e1b6f16

Add test for default rustdoc run

ed62a09

Add test for help output with -W

70ced25

Finish rustdoc error improvement

768129d

outside of borrowck, do not provide an implicit_region_bound

4dbf9ba

see comment added to the field in `VerifyBoundCx`.

fold_region: remove unused parameter

70497d9

Fix kind for associated types in rustdoc JSON output for trait implem…

c1c0d25

…entations

Add test for associated items in rustdoc JSON

9277f95

lower-generic vs. outlive

28fafc4

Remove eddyb from miri failure pings

dfb592a

liballoc tests: avoid int2ptr cast

9b497ab

make AllocKind actually public

8e73c3e

libcore tests: avoid int2ptr casts

8c977cf

Add triagebot mentions.

44e5715

Rollup merge of rust-lang#98506 - compiler-errors:object-safety-sugge…

6391f23

…stions, r=oli-obk Fix span issues in object safety suggestions Fixes rust-lang#98500

Rollup merge of rust-lang#98576 - lcnr:region-stuff-cool-beans, r=jac…

9509348

…kh726 small regions refactoring these commits should be fairly self-contained r? rust-lang/types

Rollup merge of rust-lang#98578 - rust-lang:oli-obk-patch-1, r=eddyb

9f66799

Remove eddyb from miri failure pings r? `@eddyb`

Rollup merge of rust-lang#98579 - RalfJung:alloc-tests, r=thomcc

b52c362

liballoc tests: avoid int2ptr cast I think we don't need `ptr::from_exposed_addr` here; `ptr::invalid` should be enough for this test. (And this makes Miri less unhappy when running these tests.)

Rollup merge of rust-lang#98587 - RalfJung:core-tests, r=thomcc

f266821

libcore tests: avoid int2ptr casts We don't need any of these pointers to actually be dereferenceable so using `ptr::invalid` should be fine. And then we can run Miri with strict provenance enforcement on the tests.

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

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

bors merged commit 7f08d04 into rust-lang:master Jun 28, 2022

rustbot added this to the 1.64.0 milestone Jun 28, 2022

rust-highfive mentioned this pull request Jun 28, 2022

miri no longer builds after rust-lang/rust#98591 #98599

Closed

bors mentioned this pull request Jun 28, 2022

Remove ReEmpty #98559

Merged

rustbot added the perf-regression Performance regression. label Jun 28, 2022

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

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

Rollup of 9 pull requests #98591

Rollup of 9 pull requests #98591

matthiaskrgr commented Jun 27, 2022

matthiaskrgr commented Jun 27, 2022

bors commented Jun 27, 2022

bors commented Jun 27, 2022

bors commented Jun 28, 2022

rust-highfive commented Jun 28, 2022

rust-timer commented Jun 28, 2022

rylev commented Jun 28, 2022

Rollup of 9 pull requests #98591

Rollup of 9 pull requests #98591

Conversation

matthiaskrgr commented Jun 27, 2022

matthiaskrgr commented Jun 27, 2022

bors commented Jun 27, 2022

bors commented Jun 27, 2022

bors commented Jun 28, 2022

rust-highfive commented Jun 28, 2022

rust-timer commented Jun 28, 2022

Instruction count

Max RSS (memory usage)

Cycles

Footnotes

rylev commented Jun 28, 2022