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

Remove commit_if_ok probe from NLL type relation #103601

Merged

Conversation

compiler-errors
Copy link
Member

@compiler-errors compiler-errors commented Oct 26, 2022

It was not really necessary to add the commit_if_ok in #100092 -- I added it to protect us against weird inference error messages due to recursive RPIT calls, but we are always on the error path when this happens anyways, and I can't come up with an example that makes this manifest.

Fixes #103599

r? @oli-obk since you reviewed #100092, feel free to re-roll.

🅱️ 📢 beta-nominating this since it's on beta (which forks in a week two days 😨) -- worst case we could revert the original PR on beta and land this on nightly, to give it some extra soak time...

@rustbot rustbot added the T-compiler Relevant to the compiler team, which will review and decide on the PR/issue. label Oct 26, 2022
@rust-highfive rust-highfive added the S-waiting-on-review Status: Awaiting review from the assignee but also interested parties. label Oct 26, 2022
@compiler-errors compiler-errors added the beta-nominated Nominated for backporting to the compiler in the beta channel. label Oct 26, 2022
@compiler-errors compiler-errors changed the title No need to probe when relating opaques in nll_relate Remove commit_if_ok probe from NLL type relation Oct 27, 2022
@oli-obk
Copy link
Contributor

oli-obk commented Oct 27, 2022

@bors r+ p=1

While it's low risk to backport, it's also just an ICE in a rare piece of nonsensical code that is unlikely to occur in practice. Still, it could happen while writing a useful piece of code. Since it's essentially a partial revert of the PR that caused it. I'll beta accept immediately so it can make the cut.

@bors
Copy link
Contributor

bors commented Oct 27, 2022

📌 Commit 901649e has been approved by oli-obk

It is now in the queue for this repository.

@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 Oct 27, 2022
@oli-obk oli-obk added the beta-accepted Accepted for backporting to the compiler in the beta channel. label Oct 27, 2022
@bors
Copy link
Contributor

bors commented Oct 27, 2022

⌛ Testing commit 901649e with merge 9dd3d29...

@bors
Copy link
Contributor

bors commented Oct 27, 2022

☀️ Test successful - checks-actions
Approved by: oli-obk
Pushing 9dd3d29 to master...

@bors bors added the merged-by-bors This PR was explicitly merged by bors. label Oct 27, 2022
@bors bors merged commit 9dd3d29 into rust-lang:master Oct 27, 2022
@rustbot rustbot added this to the 1.66.0 milestone Oct 27, 2022
@rust-timer
Copy link
Collaborator

Finished benchmarking commit (9dd3d29): comparison URL.

Overall result: no relevant changes - no action needed

@rustbot label: -perf-regression

Instruction count

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

Max RSS (memory usage)

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

Cycles

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

@Mark-Simulacrum Mark-Simulacrum removed the beta-nominated Nominated for backporting to the compiler in the beta channel. label Oct 29, 2022
@Mark-Simulacrum Mark-Simulacrum modified the milestones: 1.66.0, 1.65.0 Oct 29, 2022
bors added a commit to rust-lang-ci/rust that referenced this pull request Oct 29, 2022
…mulacrum

[beta] backport rollup

* poll_fn and Unpin: fix pinning rust-lang#102737
* Support raw-dylib functions being used inside inlined functions rust-lang#102988
* Fix line numbers for MIR inlined code rust-lang#103071
* Add architectures to fn create_object_file rust-lang#103240
* Add eval hack in super_relate_consts back rust-lang#103279
* Mark std::os::wasi::io::AsFd etc. as stable. rust-lang#103308
* Truncate thread names on Linux and Apple targets rust-lang#103379
* Do not consider repeated lifetime params for elision. rust-lang#103450
* rustdoc: add missing URL redirect rust-lang#103588
* Remove commit_if_ok probe from NLL type relation rust-lang#103601

Also includes a copy of the release notes.

r? `@ghost`
@compiler-errors compiler-errors deleted the no-opaque-probe-in-nll-relate branch November 2, 2022 02:52
Aaron1011 pushed a commit to Aaron1011/rust that referenced this pull request Jan 6, 2023
…ll-relate, r=oli-obk

Remove `commit_if_ok` probe from NLL type relation

It was not really necessary to add the `commit_if_ok` in rust-lang#100092 -- I added it to protect us against weird inference error messages due to recursive RPIT calls, but we are always on the error path when this happens anyways, and I can't come up with an example that makes this manifest.

Fixes rust-lang#103599

r? `@oli-obk` since you reviewed rust-lang#100092, feel free to re-roll.

:b: :loudspeaker:  beta-nominating this since it's on beta (which forks in ~a week~ two days :fearful:) -- worst case we could revert the original PR on beta and land this on nightly, to give it some extra soak time...
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. merged-by-bors This PR was explicitly merged by bors. 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.

ICE on recursive fn which returns impl T
7 participants