Implement partial support for non-lifetime binders #107489

compiler-errors · 2023-01-30T22:26:54Z

This implements support for non-lifetime binders. It's pretty useless currently, but I wanted to put this up so the implementation can be discussed.

Specifically, this piggybacks off of the late-bound lifetime collection code in rustc_hir_typeck::collect::lifetimes. This seems like a necessary step given the fact we don't resolve late-bound regions until this point, and binders are sometimes merged.

Q: I'm not sure if I should go along this route, or try to modify the earlier nameres code to compute the right bound var indices for type and const binders eagerly... If so, I'll need to rename all these queries to something more appropriate (I've done this for resolve_lifetime::Region -> resolve_lifetime::ResolvedArg)

cc rust-lang/types-team#81

r? @ghost

compiler/rustc_hir_analysis/src/collect/lifetimes.rs

compiler/rustc_ast_passes/src/feature_gate.rs

compiler/rustc_hir_analysis/src/collect/lifetimes.rs

compiler/rustc_middle/src/middle/resolve_lifetime.rs

compiler/rustc_hir_analysis/src/collect/lifetimes.rs

compiler/rustc_hir/src/def.rs

compiler-errors · 2023-02-07T00:13:53Z

I reworked this PR quite a lot -- specifically, to remove Res::Late, I had to move all ty/const parameter resolution logic through the old compiler/rustc_hir_analysis/src/collect/lifetimes.rs, which I've renamed to compiler/rustc_hir_analysis/src/collect/resolve_bound_vars.rs.

compiler-errors · 2023-02-07T00:19:24Z

I think this is worth a review at this point, though. Not sure if the strategy I took to get rid of needing to introduce a separate Res::Late is right, but seems like it works fine.

rustbot · 2023-02-07T00:19:30Z

Some changes occurred in src/tools/clippy

cc @rust-lang/clippy

Some changes occurred to MIR optimizations

cc @rust-lang/wg-mir-opt

compiler/rustc_middle/src/ty/consts.rs

compiler-errors · 2023-02-07T00:20:29Z

r? compiler

cjgillot

First pass. I'll do a more in-depth review a bit later.

compiler/rustc_hir_analysis/src/astconv/mod.rs

compiler/rustc_hir_analysis/src/collect/resolve_bound_vars.rs

compiler/rustc_middle/src/middle/resolve_bound_vars.rs

bors · 2023-02-08T23:22:01Z

☔ The latest upstream changes (presumably #107811) made this pull request unmergeable. Please resolve the merge conflicts.

compiler/rustc_middle/src/query/mod.rs

bors · 2023-02-13T21:05:01Z

☔ The latest upstream changes (presumably #107924) made this pull request unmergeable. Please resolve the merge conflicts.

cjgillot

Excited to see this working soon.
Last nits and then r=me.

compiler/rustc_hir_analysis/src/astconv/mod.rs

compiler-errors · 2023-02-13T22:57:36Z

@bors r=cjgillot

bors · 2023-02-13T22:57:38Z

📌 Commit 0162292 has been approved by cjgillot

It is now in the queue for this repository.

…rs, r=cjgillot Implement partial support for non-lifetime binders This implements support for non-lifetime binders. It's pretty useless currently, but I wanted to put this up so the implementation can be discussed. Specifically, this piggybacks off of the late-bound lifetime collection code in `rustc_hir_typeck::collect::lifetimes`. This seems like a necessary step given the fact we don't resolve late-bound regions until this point, and binders are sometimes merged. Q: I'm not sure if I should go along this route, or try to modify the earlier nameres code to compute the right bound var indices for type and const binders eagerly... If so, I'll need to rename all these queries to something more appropriate (I've done this for `resolve_lifetime::Region` -> `resolve_lifetime::ResolvedArg`) cc rust-lang/types-team#81 r? `@ghost`

matthiaskrgr · 2023-02-14T17:23:12Z

@bors r- needs rebase again 😿
https://github.com/rust-lang/rust/actions/runs/4176234801/jobs/7232253365#step:26:1191

bors · 2023-02-15T19:58:45Z

☔ The latest upstream changes (presumably #108006) made this pull request unmergeable. Please resolve the merge conflicts.

compiler-errors · 2023-02-16T03:44:09Z

Rebased.

@bors r=cjgillot

bors · 2023-02-16T03:44:10Z

📌 Commit 95f35fe has been approved by cjgillot

It is now in the queue for this repository.

…iaskrgr Rollup of 8 pull requests Successful merges: - rust-lang#104068 (rustdoc: Add PartialOrd trait to doc comment explanation) - rust-lang#107489 (Implement partial support for non-lifetime binders) - rust-lang#107905 (Pass arguments to `x` subcommands with `--`) - rust-lang#108009 (Move some tests) - rust-lang#108086 (wasm: Register the `relaxed-simd` target feature) - rust-lang#108104 (don't into self) - rust-lang#108133 (Small cleanups around `EarlyBinder`) - rust-lang#108136 (Do not ICE on unmet trait alias impl bounds) Failed merges: r? `@ghost` `@rustbot` modify labels: rollup

…rs, r=cjgillot Implement partial support for non-lifetime binders This implements support for non-lifetime binders. It's pretty useless currently, but I wanted to put this up so the implementation can be discussed. Specifically, this piggybacks off of the late-bound lifetime collection code in `rustc_hir_typeck::collect::lifetimes`. This seems like a necessary step given the fact we don't resolve late-bound regions until this point, and binders are sometimes merged. Q: I'm not sure if I should go along this route, or try to modify the earlier nameres code to compute the right bound var indices for type and const binders eagerly... If so, I'll need to rename all these queries to something more appropriate (I've done this for `resolve_lifetime::Region` -> `resolve_lifetime::ResolvedArg`) cc rust-lang/types-team#81 r? `@ghost`

compiler-errors added the T-types Relevant to the types team, which will review and decide on the PR/issue. label Jan 30, 2023

rustbot added the S-waiting-on-review Status: Awaiting review from the assignee but also interested parties. label Jan 30, 2023

compiler-errors commented Jan 30, 2023

View reviewed changes

compiler/rustc_hir_analysis/src/collect/lifetimes.rs Show resolved Hide resolved

compiler-errors added the T-compiler Relevant to the compiler team, which will review and decide on the PR/issue. label Jan 30, 2023

cjgillot reviewed Jan 31, 2023

View reviewed changes

compiler-errors force-pushed the non_lifetime_binders branch from b24f6e6 to c285ae8 Compare February 7, 2023 00:10

compiler-errors marked this pull request as ready for review February 7, 2023 00:19

compiler-errors commented Feb 7, 2023

View reviewed changes

compiler/rustc_middle/src/ty/consts.rs Show resolved Hide resolved

rustbot assigned TaKO8Ki Feb 7, 2023

cjgillot self-assigned this Feb 7, 2023

cjgillot reviewed Feb 7, 2023

View reviewed changes

compiler-errors force-pushed the non_lifetime_binders branch from c285ae8 to 4df983a Compare February 9, 2023 04:28

cjgillot reviewed Feb 11, 2023

View reviewed changes

compiler/rustc_middle/src/query/mod.rs Outdated Show resolved Hide resolved

cjgillot reviewed Feb 13, 2023

View reviewed changes

compiler/rustc_hir_analysis/src/astconv/mod.rs Outdated Show resolved Hide resolved

compiler/rustc_hir_analysis/src/astconv/mod.rs Outdated Show resolved Hide resolved

compiler/rustc_hir_analysis/src/astconv/mod.rs Outdated Show resolved Hide resolved

compiler-errors force-pushed the non_lifetime_binders branch from 4df983a to 0162292 Compare February 13, 2023 22:24

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 Feb 13, 2023

matthiaskrgr mentioned this pull request Feb 14, 2023

Rollup of 10 pull requests #108053

Closed

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 Feb 14, 2023

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-author Status: This is awaiting some action (such as code changes or more information) from the author. labels Feb 14, 2023

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 Feb 15, 2023

compiler-errors added 6 commits February 16, 2023 03:39

Add feature gate for non_lifetime_binders

262a344

Rename some region-specific stuff

eff2cb7

Make things actually work

52f8235

Be better about bound vars

3f521b3

A bit more work on late-bound consts

915703c

Deny some late-bound ty/ct in some positions, add tests

95f35fe

compiler-errors force-pushed the non_lifetime_binders branch from 8c9b0c4 to 95f35fe Compare February 16, 2023 03:44

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-author Status: This is awaiting some action (such as code changes or more information) from the author. labels Feb 16, 2023

matthiaskrgr mentioned this pull request Feb 16, 2023

Rollup of 8 pull requests #108145

Merged

bors merged commit 089e8c0 into rust-lang:master Feb 17, 2023

rustbot added this to the 1.69.0 milestone Feb 17, 2023

compiler-errors mentioned this pull request Feb 17, 2023

Tracking Issue for non-lifetime binders #108185

Open

4 tasks

compiler-errors added the F-non_lifetime_binders `#![feature(non_lifetime_binders)]` label Mar 10, 2023

compiler-errors unassigned TaKO8Ki Mar 10, 2023

matthiaskrgr mentioned this pull request Jun 25, 2023

ICE: unexpected bound var resolution for HirId(DefId( #113016

Closed

compiler-errors mentioned this pull request Jun 29, 2023

Account for late-bound vars from parent arg-position impl trait #113071

Merged

compiler-errors deleted the non_lifetime_binders branch August 11, 2023 20:11

compiler-errors mentioned this pull request Aug 16, 2023

ICE: 'is_trivially_sized' applied to unexpected type #114872

Closed

compiler-errors mentioned this pull request Nov 18, 2023

ice: non_lifetime_binders: bound types encountered in structurally_relate_tys #118038

Open

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

Implement partial support for non-lifetime binders #107489

Implement partial support for non-lifetime binders #107489

compiler-errors commented Jan 30, 2023

compiler-errors commented Feb 7, 2023

compiler-errors commented Feb 7, 2023

rustbot commented Feb 7, 2023

compiler-errors commented Feb 7, 2023

cjgillot left a comment

bors commented Feb 8, 2023

bors commented Feb 13, 2023

cjgillot left a comment

compiler-errors commented Feb 13, 2023

bors commented Feb 13, 2023

matthiaskrgr commented Feb 14, 2023

bors commented Feb 15, 2023

compiler-errors commented Feb 16, 2023

bors commented Feb 16, 2023

Implement partial support for non-lifetime binders #107489

Implement partial support for non-lifetime binders #107489

Conversation

compiler-errors commented Jan 30, 2023

compiler-errors commented Feb 7, 2023

compiler-errors commented Feb 7, 2023

rustbot commented Feb 7, 2023

compiler-errors commented Feb 7, 2023

cjgillot left a comment

Choose a reason for hiding this comment

bors commented Feb 8, 2023

bors commented Feb 13, 2023

cjgillot left a comment

Choose a reason for hiding this comment

compiler-errors commented Feb 13, 2023

bors commented Feb 13, 2023

matthiaskrgr commented Feb 14, 2023

bors commented Feb 15, 2023

compiler-errors commented Feb 16, 2023

bors commented Feb 16, 2023