correctly deal with late-bound lifetimes in anon consts #79298
Conversation
rust-highfive
added
the
S-waiting-on-review
lcnr
added
A-const-generics
crlf0710
added
S-blocked
|
☔ The latest upstream changes (presumably #80163) made this pull request unmergeable. Please resolve the merge conflicts. Note that reviewers usually do not review pull requests until merge conflicts are resolved! Once you resolve the conflicts, you should change the labels applied by bors to indicate that your PR is ready for review. Post this as a comment to change the labels: |
matthewjasper
added
S-waiting-on-review
| // | ||
| // Note that for `AnonConst` we still just recurse until we | ||
| // find a function body, but who cares :shrug: | ||
| while tcx.is_closure(def_id) { |
There was a problem hiding this comment.
Does this also need to check if the parent is another anon const for something like [1; [2; inner::<'a>].len()]?
There was a problem hiding this comment.
// Note that for `AnonConst` we still just recurse until we
// find a function body, but who cares :shrug:we could only call this query recursively when we find the containing function, but considering that after #79313 anon const can have additional early bound lifetimes i think this approach might be a bit cleaner 🤔 don't really care either way here
There was a problem hiding this comment.
So, now I'm confused as to why this PR is correct or needed at all after #79313.
There was a problem hiding this comment.
#79313 only deals with lifetimes introduced by explicit binders, while this PR deals with late bound lifetimes.
Updated the PR description, does this explanation help here?
There was a problem hiding this comment.
OK, I've gone through this and it looks fine. r=me with a rebase
|
☔ The latest upstream changes (presumably #81035) made this pull request unmergeable. Please resolve the merge conflicts. |
|
@bors r=matthewjasper |
|
📌 Commit 15f0921 has been approved by |
bors
added
S-waiting-on-bors
correctly deal with late-bound lifetimes in anon consts
adds support for using late bound lifetimes of the parent context in anon consts.
```rust
#![feature(const_generics)]
const fn inner<'a>() -> usize where &'a (): Sized { 3 }
fn test<'a>() {
let _: [u8; inner::<'a>()];
}
```
The lifetime `'a` is late bound in `test` so it's not included in its generics but is instead dealt with separately in borrowck.
This didn't previously work for anon consts as they have to use the late bound lifetimes of their parent which has
to be explicitly handled.
r? `@matthewjasper` cc `@varkor` `@eddyb`
correctly deal with late-bound lifetimes in anon consts
adds support for using late bound lifetimes of the parent context in anon consts.
```rust
#![feature(const_generics)]
const fn inner<'a>() -> usize where &'a (): Sized { 3 }
fn test<'a>() {
let _: [u8; inner::<'a>()];
}
```
The lifetime `'a` is late bound in `test` so it's not included in its generics but is instead dealt with separately in borrowck.
This didn't previously work for anon consts as they have to use the late bound lifetimes of their parent which has
to be explicitly handled.
r? ``@matthewjasper`` cc ``@varkor`` ``@eddyb``
Rollup of 13 pull requests Successful merges: - rust-lang#79298 (correctly deal with late-bound lifetimes in anon consts) - rust-lang#80031 (resolve: Reject ambiguity built-in attr vs different built-in attr) - rust-lang#80201 (Add benchmark and fast path for BufReader::read_exact) - rust-lang#80635 (Improve diagnostics when closure doesn't meet trait bound) - rust-lang#80765 (resolve: Simplify collection of traits in scope) - rust-lang#80932 (Allow downloading LLVM on Windows and MacOS) - rust-lang#80983 (Remove is_dllimport_foreign_item definition from cg_ssa) - rust-lang#81064 (Support non-stage0 check) - rust-lang#81080 (Force vec![] to expression position only) - rust-lang#81082 (BTreeMap: clean up a few more comments) - rust-lang#81084 (Use Option::map instead of open-coding it) - rust-lang#81095 (Use Option::unwrap_or instead of open-coding it) - rust-lang#81107 (Add NonZeroUn::is_power_of_two) Failed merges: r? `@ghost` `@rustbot` modify labels: rollup
adds support for using late bound lifetimes of the parent context in anon consts.
The lifetime
'ais late bound intestso it's not included in its generics but is instead dealt with separately in borrowck.This didn't previously work for anon consts as they have to use the late bound lifetimes of their parent which has
to be explicitly handled.
r? @matthewjasper cc @varkor @eddyb