Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Rollup of 5 pull requests #95250

Merged
merged 12 commits into from
Mar 24, 2022
Merged

Rollup of 5 pull requests #95250

merged 12 commits into from
Mar 24, 2022

Conversation

matthiaskrgr
Copy link
Member

Successful merges:

Failed merges:

r? @ghost
@rustbot modify labels: rollup

Create a similar rollup

GuillaumeGomez and others added 12 commits March 18, 2022 11:24
… 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

Fixes rust-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`
@rustbot 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
@matthiaskrgr
Copy link
Member Author

@bors r+ rollup=never p=5

@bors
Copy link
Contributor

bors commented Mar 23, 2022

📌 Commit fab7a6a has been approved by matthiaskrgr

@bors 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
Copy link
Contributor

bors commented Mar 23, 2022

⌛ Testing commit fab7a6a with merge 37b55c8...

@bors
Copy link
Contributor

bors commented Mar 24, 2022

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

@bors bors added the merged-by-bors This PR was explicitly merged by bors. label Mar 24, 2022
@bors bors merged commit 37b55c8 into rust-lang:master Mar 24, 2022
@rustbot rustbot added this to the 1.61.0 milestone Mar 24, 2022
@rust-highfive
Copy link
Collaborator

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

rust-highfive added a commit to rust-lang-nursery/rust-toolstate that referenced this pull request Mar 24, 2022
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).
@bors bors mentioned this pull request Mar 24, 2022
@rust-timer
Copy link
Collaborator

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

@rustbot rustbot added the perf-regression Performance regression. label Mar 24, 2022
@matthiaskrgr
Copy link
Member Author

Confirmed that this is caused by #95069 in #95264

@oli-obk
Copy link
Contributor

oli-obk commented Mar 24, 2022

@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

@matthiaskrgr matthiaskrgr deleted the rollup-ma4zl69 branch July 30, 2022 10:32
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
merged-by-bors This PR was explicitly merged by bors. perf-regression Performance regression. rollup A PR which is a rollup S-waiting-on-bors Status: Waiting on bors to run and complete tests. Bors will change the label on completion. 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.
Projects
None yet
Development

Successfully merging this pull request may close these issues.

10 participants