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.

Sign up for GitHub

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

Jump to bottom

Lazy TAIT preparation cleanups #89024

Merged
merged 1 commit into from Sep 23, 2021
Merged

Lazy TAIT preparation cleanups #89024

merged 1 commit into from Sep 23, 2021

Conversation

oli-obk
Copy link
Contributor

@oli-obk oli-obk commented Sep 16, 2021

Check that TAIT generics are fully generic in mir typeck instead of wf-check, as wf-check can by definition only check TAIT in return position and not account for TAITs defined in the body of the function

r? @spastorino @nikomatsakis

@rust-highfive rust-highfive added the S-waiting-on-review Status: Awaiting review from the assignee but also interested parties. label Sep 16, 2021
oli-obk
oli-obk commented Sep 17, 2021
View reviewed changes
compiler/rustc_typeck/src/collect/type_of.rs
@@ -584,50 +602,8 @@ fn find_opaque_ty_constraints(tcx: TyCtxt<'_>, def_id: LocalDefId) -> Ty<'_> {
// FIXME(oli-obk): trace the actual span from inference to improve errors.
let span = self.tcx.def_span(def_id);

// HACK(eddyb) this check shouldn't be needed, as `wfcheck`
Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Since the mir_borrowck call above will invoke the checking logic, duplicating it here with delay_span_bug adds no additional safety net

@nikomatsakis
Copy link
Contributor

(lgtm)

@oli-obk
Copy link
Contributor Author

oli-obk commented Sep 18, 2021

@bors r=nikomatsakis

@bors
Copy link
Contributor

bors commented Sep 18, 2021

📌 Commit fed385b38b69f879cdade3de43b72b16df63cb29 has been approved by nikomatsakis

@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 Sep 18, 2021
@oli-obk
Copy link
Contributor Author

oli-obk commented Sep 20, 2021

@bors r-

@bors bors added S-waiting-on-author Status: This is awaiting some action (such as code changes or more information) from the author. and removed S-waiting-on-bors Status: Waiting on bors to run and complete tests. Bors will change the label on completion. labels Sep 20, 2021
@oli-obk
Copy link
Contributor Author

oli-obk commented Sep 20, 2021

@bors try @rust-timer queue

@rust-timer
Copy link
Collaborator

Awaiting bors try build completion.

@rustbot label: +S-waiting-on-perf

@rustbot rustbot added the S-waiting-on-perf Status: Waiting on a perf run to be completed. label Sep 20, 2021
@bors
Copy link
Contributor

bors commented Sep 20, 2021

⌛ Trying commit fed385b38b69f879cdade3de43b72b16df63cb29 with merge be8d9ae4358f73fdda58b9349a86260cfa25c94e...

@bors
Copy link
Contributor

bors commented Sep 20, 2021

☀️ Try build successful - checks-actions
Build commit: be8d9ae4358f73fdda58b9349a86260cfa25c94e (be8d9ae4358f73fdda58b9349a86260cfa25c94e)

@rust-timer
Copy link
Collaborator

Queued be8d9ae4358f73fdda58b9349a86260cfa25c94e with parent db1fb85, future comparison URL.

@rust-timer
Copy link
Collaborator

Finished benchmarking commit (be8d9ae4358f73fdda58b9349a86260cfa25c94e): comparison url.

Summary: This benchmark run did not return any relevant changes.

If you disagree with this performance assessment, please file an issue in rust-lang/rustc-perf.

Benchmarking this pull request likely means that it is perf-sensitive, so we're automatically marking it as not fit for rolling up. While you can manually mark this PR as fit for rollup, we strongly recommend not doing so since this PR led to changes in compiler perf.

@bors rollup=never
@rustbot label: +S-waiting-on-review -S-waiting-on-perf -perf-regression

@rustbot rustbot added S-waiting-on-review Status: Awaiting review from the assignee but also interested parties. and removed S-waiting-on-perf Status: Waiting on a perf run to be completed. labels Sep 20, 2021
@oli-obk
Copy link
Contributor Author

oli-obk commented Sep 20, 2021

@bors r=nikomatsakis

@bors
Copy link
Contributor

bors commented Sep 20, 2021

📌 Commit fed385b38b69f879cdade3de43b72b16df63cb29 has been approved by nikomatsakis

@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. S-waiting-on-author Status: This is awaiting some action (such as code changes or more information) from the author. labels Sep 20, 2021
@bors
Copy link
Contributor

bors commented Sep 21, 2021

⌛ Testing commit fed385b38b69f879cdade3de43b72b16df63cb29 with merge 833b4b869a15d7f533a04954f4b79a698d6878b7...

@bors
Copy link
Contributor

bors commented Sep 21, 2021

💥 Test timed out

@bors bors added the S-waiting-on-review Status: Awaiting review from the assignee but also interested parties. label Sep 21, 2021
@rust-log-analyzer

This comment has been minimized.

Sign in to view
@oli-obk
Copy link
Contributor Author

oli-obk commented Sep 21, 2021

@bors retry

@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 Sep 21, 2021
@bors
Copy link
Contributor

bors commented Sep 21, 2021

⌛ Testing commit fed385b38b69f879cdade3de43b72b16df63cb29 with merge 71dc5a38fe6b245c7acb00b6eb73e0a9af08a076...

@rust-log-analyzer

This comment has been minimized.

Sign in to view
@bors
Copy link
Contributor

bors commented Sep 21, 2021

💔 Test failed - checks-actions

@bors bors added S-waiting-on-review Status: Awaiting review from the assignee but also interested parties. and removed S-waiting-on-bors Status: Waiting on bors to run and complete tests. Bors will change the label on completion. labels Sep 21, 2021
@oli-obk
Check that TAIT generics are fully generic in mir typeck instead of w…
6067ead 
…f-check, as wf-check can by definition only check TAIT in return position and not account for TAITs defined in the body of the function
@oli-obk oli-obk force-pushed the lazy_tait_is_not_limited_to_being_used_in_return_position branch from fed385b to 6067ead Compare September 23, 2021 13:35
@oli-obk
Copy link
Contributor Author

oli-obk commented Sep 23, 2021

@bors r=nikomatsakis

@bors
Copy link
Contributor

bors commented Sep 23, 2021

📌 Commit 6067ead has been approved by nikomatsakis

@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 Sep 23, 2021
@bors
Copy link
Contributor

bors commented Sep 23, 2021

⌛ Testing commit 6067ead with merge 2b862be...

@bors
Copy link
Contributor

bors commented Sep 23, 2021

☀️ Test successful - checks-actions
Approved by: nikomatsakis
Pushing 2b862be to master...

@bors bors added the merged-by-bors This PR was explicitly merged by bors. label Sep 23, 2021
@bors bors merged commit 2b862be into rust-lang:master Sep 23, 2021
@rustbot rustbot added this to the 1.57.0 milestone Sep 23, 2021
This was referenced Sep 23, 2021
Merged
Closed
@rust-timer
Copy link
Collaborator

Finished benchmarking commit (2b862be): comparison url.

Summary: This benchmark run did not return any relevant changes.

If you disagree with this performance assessment, please file an issue in rust-lang/rustc-perf.

@rustbot label: -perf-regression

@oli-obk oli-obk deleted the lazy_tait_is_not_limited_to_being_used_in_return_position branch September 24, 2021 08:11
lcnr added a commit to lcnr/rust that referenced this pull request Jul 15, 2022
@lcnr
remove unnecessary select_obligations_where_possible
29d0390 
this was previously used for opaque types but became unnecessary
after rust-lang#89024
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@nikomatsakis nikomatsakis nikomatsakis approved these changes

Assignees

@spastorino spastorino

Labels
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.
Projects
None yet
Milestone
1.57.0
Development

Successfully merging this pull request may close these issues.

None yet
8 participants
@oli-obk @nikomatsakis @bors @rust-timer @rust-log-analyzer @spastorino @rust-highfive @rustbot