Rollup of 5 pull requests by matthiaskrgr · Pull Request #95250 · rust-lang/rust

matthiaskrgr · 2022-03-23T21:13:28Z

Successful merges:

Better errors when a Copy impl on a Struct is not self-consistent #94249 (Better errors when a Copy impl on a Struct is not self-consistent)
Fix auto traits in rustdoc #95069 (Fix auto traits in rustdoc)
interpret/memory: simplify check_and_deref_ptr #95221 (interpret/memory: simplify check_and_deref_ptr)
remove [async output] from impl Future pretty-printing #95225 (remove [async output] from impl Future pretty-printing)
Stop emitting E0026 for struct enums with underscores #95238 (Stop emitting E0026 for struct enums with underscores)

Failed merges:

r? @ghost
@rustbot modify labels: rollup

… r=davidtwco Better errors when a Copy impl on a Struct is not self-consistent As discovered in a Zulip thread with `@nnethercote` and `@Mark-Simulacrum,` it's not immediately obvious why a field on an ADT doesn't implement `Copy`. This PR attempts to give slightly more detailed information by spinning up a fulfillment context to try to dig down and discover transitive fulfillment errors that cause `is_copy_modulo_regions` to fail on a ADT field. The error message still kinda sucks, but should only show up in the case that an existing error message was totally missing... so I think it's a good compromise for now?

… r=oli-obk Fix auto traits in rustdoc Fixesrust-lang#90324. cc `@matthewjasper` r? `@Aaron1011`

…-obk interpret/memory: simplify check_and_deref_ptr *Finally* I saw a way to make this code simpler. The odd preprocessing in `let ptr_or_addr =` has bothered me since forever, but it actually became unnecessary in the last provenance refactoring. :) This also leads to slightly more explicit error messages as a nice side-effect. 🎉 r? `@oli-obk`

…or-ty, r=oli-obk remove `[async output]` from `impl Future` pretty-printing self-explanatory, guess it's not as helpful as I thought when I added it 4 months ago re rust-lang#95089 (comment)

…uct-enum-with-underscore, r=estebank Stop emitting E0026 for struct enums with underscores This patch resolves a part of rust-lang#83263; r? `@estebank`

matthiaskrgr · 2022-03-23T21:13:41Z

@bors r+ rollup=never p=5

bors · 2022-03-23T21:13:43Z

📌 Commit fab7a6a has been approved by matthiaskrgr

bors · 2022-03-23T23:02:25Z

⌛ Testing commit fab7a6a with merge 37b55c8...

bors · 2022-03-24T01:43:15Z

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

rust-highfive · 2022-03-24T01:43:41Z

📣 Toolstate changed by #95250!

Tested on commit 37b55c8.
Direct link to PR: #95250

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

@RalfJung

Tested on commit rust-lang/rust@37b55c8. Direct link to PR: <rust-lang/rust#95250> 💔 miri on windows: test-pass → test-fail (cc @RalfJung @oli-obk @eddyb). 💔 miri on linux: test-pass → test-fail (cc @RalfJung @oli-obk @eddyb).

rust-timer · 2022-03-24T05:57:27Z

Finished benchmarking commit (37b55c8): comparison url.

Summary: This benchmark run shows 30 relevant regressions 😿 to instruction counts.

Arithmetic mean of relevant regressions: 2.2%
Largest regression in instruction counts: 11.1% on full builds of cargo-0.60.0 doc

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

matthiaskrgr · 2022-03-24T14:45:22Z

Confirmed that this is caused by #95069 in #95264

oli-obk · 2022-03-24T16:39:50Z

@rustbot label: +perf-regression-triaged

The regression is only in rustdoc, and @GuillaumeGomez is alright with permitting this regression in order to fix a bug for now. I believe I know how to get rid of the perf regression while keeping the bug fixed, but it is a larger refactoring that I am coordinating with @GuillaumeGomez on

GuillaumeGomezand others added 12 commits March 18, 2022 11:24

Fix incorrect auto trait displayed in rustdoc
28b6d2c

Add test to ensure auto-traits are respecting constraints
7c53ae0

interpret/memory: simplify check_and_deref_ptr
f93a146

better errors when a Copy impl is not coherent
c8cbd3d

bless 32bit
a76e5b1

remove [async output] from impl Future
bdb4b1e

stop emitting E0026 for struct enums with underscores
925857d

Rollup merge ofrust-lang#95069- GuillaumeGomez:auto-traits-rustdoc,…
0c79c86
… r=oli-obk Fix auto traits in rustdoc Fixesrust-lang#90324. cc `@matthewjasper` r? `@Aaron1011`

Rollup merge ofrust-lang#95225- compiler-errors:impl-future-generat…
1f346bd
…or-ty, r=oli-obk remove `[async output]` from `impl Future` pretty-printing self-explanatory, guess it's not as helpful as I thought when I added it 4 months ago re rust-lang#95089 (comment)

Rollup merge ofrust-lang#95238- TaKO8Ki:stop-emitting-E0026-for-str…
fab7a6a
…uct-enum-with-underscore, r=estebank Stop emitting E0026 for struct enums with underscores This patch resolves a part of rust-lang#83263; r? `@estebank`

rustbot added T-compiler Relevant to the compiler 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 Mar 23, 2022

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

bors added the merged-by-bors This PR was explicitly merged by bors. label Mar 24, 2022

bors merged commit 37b55c8 into rust-lang:masterMar 24, 2022

rustbot added this to the 1.61.0 milestone Mar 24, 2022

rust-highfive mentioned this pull request Mar 24, 2022
miri no longer builds after rust-lang/rust#95250 #95258
Closed

bors mentioned this pull request Mar 24, 2022
Stabilize let else#93628
Merged

rustbot added the perf-regression Performance regression. label Mar 24, 2022

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

Navigation Menu

Uh oh!

Uh oh!

Rollup of 5 pull requests - #95250

Rollup of 5 pull requests#95250
bors merged 12 commits into
rust-lang:masterfrom
matthiaskrgr:rollup-ma4zl69

matthiaskrgr commented Mar 23, 2022

Uh oh!

matthiaskrgr commented Mar 23, 2022

Uh oh!

bors commented Mar 23, 2022

Uh oh!

bors commented Mar 23, 2022

Uh oh!

bors commented Mar 24, 2022

Uh oh!

rust-highfive commented Mar 24, 2022

Uh oh!

rust-timer commented Mar 24, 2022

Uh oh!

matthiaskrgr commented Mar 24, 2022

Uh oh!

oli-obk commented Mar 24, 2022

Uh oh!

Reviewers

Assignees

Labels

Projects

Milestone

Development

Uh oh!

10 participants

Uh oh!

Uh oh!

Conversation

matthiaskrgr commented Mar 23, 2022

Uh oh!

matthiaskrgr commented Mar 23, 2022

Uh oh!

bors commented Mar 23, 2022

Uh oh!

bors commented Mar 23, 2022

Uh oh!

bors commented Mar 24, 2022

Uh oh!

rust-highfive commented Mar 24, 2022

Uh oh!

rust-timer commented Mar 24, 2022

Uh oh!

matthiaskrgr commented Mar 24, 2022

Uh oh!

oli-obk commented Mar 24, 2022

Uh oh!

Reviewers

Assignees

Labels

Projects

Milestone

Development

Uh oh!

10 participants