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

Revert diagnostic duplication and accidental stabilization #96516

Merged

Conversation

oli-obk
Copy link
Contributor

@oli-obk oli-obk commented Apr 28, 2022

fixes #96460

this is an accidental stabilization that we should put into the beta. I believe it is low-risk, because it was literally what we had before #94081

The effect on tests is massive, but mostly deduplication of diagnostics and some minor span changes.

@oli-obk oli-obk added beta-nominated Nominated for backporting to the compiler in the beta channel. beta-accepted Accepted for backporting to the compiler in the beta channel. labels Apr 28, 2022
@rustbot rustbot added the T-compiler Relevant to the compiler team, which will review and decide on the PR/issue. label Apr 28, 2022
@rust-highfive
Copy link
Collaborator

r? @michaelwoerister

(rust-highfive has picked a reviewer for you, use r? to override)

@rust-highfive rust-highfive added the S-waiting-on-review Status: Awaiting review from the assignee but also interested parties. label Apr 28, 2022
@oli-obk
Copy link
Contributor Author

oli-obk commented Apr 28, 2022

r? @compiler-errors from the github reviewer suggestions

@oli-obk oli-obk removed the beta-accepted Accepted for backporting to the compiler in the beta channel. label Apr 28, 2022
@jackh726
Copy link
Member

@bors r+

@bors
Copy link
Contributor

bors commented Apr 28, 2022

📌 Commit d22c439 has been approved by jackh726

@bors 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 Apr 28, 2022
@apiraino
Copy link
Contributor

Beta backport accepted as per compiler team on Zulip, pending first this patch on nightly.

@rustbot label +beta-accepted

@rustbot rustbot added the beta-accepted Accepted for backporting to the compiler in the beta channel. label Apr 28, 2022
bors added a commit to rust-lang-ci/rust that referenced this pull request Apr 29, 2022
Rollup of 5 pull requests

Successful merges:

 - rust-lang#96477 (Update data layout string for wasm64-unknown-unknown)
 - rust-lang#96481 (HashMap doc: Don't use monospace font for 'Entry Api')
 - rust-lang#96492 (Revert "Re-export core::ffi types from std::ffi")
 - rust-lang#96516 (Revert diagnostic duplication and accidental stabilization)
 - rust-lang#96523 (Add ``@feat.00`` symbol to symbols.o for COFF)

Failed merges:

r? `@ghost`
`@rustbot` modify labels: rollup
@bors bors merged commit 109008a into rust-lang:master Apr 29, 2022
@rustbot rustbot added this to the 1.62.0 milestone Apr 29, 2022
ehuss pushed a commit to ehuss/rust that referenced this pull request May 4, 2022
…ntal_permitted, r=jackh726

Revert diagnostic duplication and accidental stabilization

fixes rust-lang#96460

this is an accidental stabilization that we should put into the beta. I believe it is low-risk, because it was literally what we had before rust-lang#94081

The effect on tests is massive, but mostly deduplication of diagnostics and some minor span changes.
@ehuss ehuss mentioned this pull request May 4, 2022
@ehuss ehuss modified the milestones: 1.62.0, 1.61.0 May 4, 2022
@ehuss ehuss removed the beta-nominated Nominated for backporting to the compiler in the beta channel. label May 4, 2022
bors added a commit to rust-lang-ci/rust that referenced this pull request May 4, 2022
[beta] Beta backports

* Revert diagnostic duplication and accidental stabilization rust-lang#96516
* Revert "Re-export core::ffi types from std::ffi" rust-lang#96492
* Make [e]println macros eagerly drop temporaries (for backport) rust-lang#96490
* Revert "impl From<&[T; N]> and From<&mut [T; N]> for Vec<T>" rust-lang#96489
* Cargo:
    * move workspace inheritance unstable docs to the correct place (rust-lang/cargo#10616)
MabezDev pushed a commit to esp-rs/rust that referenced this pull request May 17, 2022
…ntal_permitted, r=jackh726

Revert diagnostic duplication and accidental stabilization

fixes rust-lang#96460

this is an accidental stabilization that we should put into the beta. I believe it is low-risk, because it was literally what we had before rust-lang#94081

The effect on tests is massive, but mostly deduplication of diagnostics and some minor span changes.
compiler-errors added a commit to compiler-errors/rust that referenced this pull request May 30, 2022
don't do `Sized` and other return type checks on RPIT's real type

Fixes an ICE where we're doing `Sized` check against the RPIT's real type, instead of against the opaque type. This differs from what we're doing in MIR typeck, which causes ICE rust-lang#97226.

This regressed in rust-lang#96516 -- this adjusts that fix to be a bit more conservative. That PR was backported and thus the ICE is also present in stable. Not sure if it's worth to beta and/or stable backport, probably not the latter but I could believe the former.

r? `@oli-obk`

cc: another attempt to fix this ICE rust-lang#97413. I believe this PR addresses the root cause.
ehuss pushed a commit to ehuss/rust that referenced this pull request Jun 24, 2022
don't do `Sized` and other return type checks on RPIT's real type

Fixes an ICE where we're doing `Sized` check against the RPIT's real type, instead of against the opaque type. This differs from what we're doing in MIR typeck, which causes ICE rust-lang#97226.

This regressed in rust-lang#96516 -- this adjusts that fix to be a bit more conservative. That PR was backported and thus the ICE is also present in stable. Not sure if it's worth to beta and/or stable backport, probably not the latter but I could believe the former.

r? `@oli-obk`

cc: another attempt to fix this ICE rust-lang#97413. I believe this PR addresses the root cause.
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
beta-accepted Accepted for backporting to the compiler in the beta channel. 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.
Projects
None yet
Development

Successfully merging this pull request may close these issues.

impl trait: code that doesn't constrain a RPIT infers ()?
9 participants