Skip to content

Rollup of 9 pull requests - #98591

Merged
bors merged 25 commits into
rust-lang:masterfrom
matthiaskrgr:rollup-7dok1wq
Jun 28, 2022
Merged

Rollup of 9 pull requests#98591
bors merged 25 commits into
rust-lang:masterfrom
matthiaskrgr:rollup-7dok1wq

Conversation

@matthiaskrgr

Copy link
Copy Markdown
Member

Successful merges:

Failed merges:

r? @ghost
@rustbot modify labels: rollup

Create a similar rollup

compiler-errorsand others added 25 commits June 25, 2022 14:59
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`.
…=notriddle
Fix rustdoc argument error
Fixesrust-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
Fixesrust-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
Fixesrust-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.
@rustbotrustbot added T-compiler Relevant to the compiler team, which will review and decide on the PR/issue. T-libs Relevant to the library team, which will review and decide on the PR/issue. T-rustdoc Relevant to the rustdoc team, which will review and decide on the PR/issue. rollup A PR which is a rollup labels Jun 27, 2022
@matthiaskrgr

Copy link
Copy Markdown
MemberAuthor

@bors r+ rollup=never p=9

@bors

bors commented Jun 27, 2022

Copy link
Copy Markdown
Collaborator

📌 Commit f266821 has been approved by matthiaskrgr

@borsbors 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

bors commented Jun 27, 2022

Copy link
Copy Markdown
Collaborator

⌛ Testing commit f266821 with merge 7f08d04...

@bors

bors commented Jun 28, 2022

Copy link
Copy Markdown
Collaborator

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

@borsbors added the merged-by-bors This PR was explicitly merged by bors. label Jun 28, 2022
@bors
bors merged commit 7f08d04 into rust-lang:masterJun 28, 2022
@rustbotrustbot added this to the 1.64.0 milestone Jun 28, 2022
@rust-highfive

Copy link
Copy Markdown
Contributor

📣 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).

rust-highfive added a commit to rust-lang-nursery/rust-toolstate that referenced this pull request Jun 28, 2022
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).
@borsbors mentioned this pull request Jun 28, 2022
@rust-timer

Copy link
Copy Markdown
Collaborator

Finished benchmarking commit (7f08d04): comparison url.

Instruction count

  • Primary benchmarks: no relevant changes found
  • Secondary benchmarks: 😿 relevant regressions found
mean1maxcount2
Regressions 😿
(primary)
N/AN/A0
Regressions 😿
(secondary)
1.2%1.7%7
Improvements 🎉
(primary)
N/AN/A0
Improvements 🎉
(secondary)
N/AN/A0
All 😿🎉 (primary)N/AN/A0

Max RSS (memory usage)

Results
  • Primary benchmarks: no relevant changes found
  • Secondary benchmarks: mixed results
mean1maxcount2
Regressions 😿
(primary)
N/AN/A0
Regressions 😿
(secondary)
3.6%4.2%3
Improvements 🎉
(primary)
N/AN/A0
Improvements 🎉
(secondary)
-2.1%-2.1%2
All 😿🎉 (primary)N/AN/A0

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

Footnotes

  1. the arithmetic mean of the percent change2

  2. number of relevant changes2

@rustbotrustbot added the perf-regression Performance regression. label Jun 28, 2022
@rylev

Copy link
Copy Markdown
Member

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>

@matthiaskrgr
matthiaskrgr deleted the rollup-7dok1wq branch July 30, 2022 10:32
Sign up for freeto join this conversation on GitHub. Already have an account? Sign in to comment

Labels

merged-by-borsThis PR was explicitly merged by bors.perf-regressionPerformance regression.rollupA PR which is a rollupS-waiting-on-borsStatus: Waiting on bors to run and complete tests. Bors will change the label on completion.T-compilerRelevant to the compiler team, which will review and decide on the PR/issue.T-libsRelevant to the library team, which will review and decide on the PR/issue.T-rustdocRelevant to the rustdoc team, which will review and decide on the PR/issue.

Projects

None yet

Development

Successfully merging this pull request may close these issues.

13 participants

@matthiaskrgr@bors@rust-highfive@rust-timer@rylev@rustbot@compiler-errors@RalfJung@inashivb@GuillaumeGomez@lcnr@oli-obk@ehuss