Remove in band lifetimes #93845

compiler-errors · 2022-02-10T03:37:26Z

As discussed in t-lang backlog bonanza, the in_band_lifetimes FCP closed in favor for the feature not being stabilized. This PR removes #![feature(in_band_lifetimes)] in its entirety.

Let me know if this PR is too hasty, and if we should instead do something intermediate for deprecate the feature first.

r? @scottmcm (or feel free to reassign, just saw your last comment on #44524)
Closes #44524

rust-highfive · 2022-02-10T03:37:29Z

Some changes occurred in diagnostic error codes

cc @GuillaumeGomez

compiler-errors · 2022-02-10T03:47:31Z

compiler/rustc_ast_lowering/src/lib.rs

@@ -684,7 +680,7 @@ impl<'a, 'hir> LoweringContext<'a, 'hir> {
        // that collisions are ok here and this shouldn't
        // really show up for end-user.
        let (str_name, kind) = match hir_name {
-            ParamName::Plain(ident) => (ident.name, hir::LifetimeParamKind::InBand),
+            ParamName::Plain(ident) => (ident.name, hir::LifetimeParamKind::Explicit),


This is the only suspicious change.

Async blocks, for example, declare named elided lifetimes (idk if that's the only one, perhaps closures?). We should give them a category here -- not sure if it's correct to use LifetimeParamKind::Explicit though. Maybe I can add a new LifetimeParamKind like Implicit.

It all funnels into hir::LifetimeDefOrigin::ExplicitOrElided though, so I don't think the distinction matters?

This case should only happen when synthetizing lifetimes for an async fn return impl Future type. There should not be a difference, but we got bit before.

Once LifetimeDefOrigin is removed, LifetimeParamKind is only used in lifetime resolution diagnostics and rustdoc to filter elided lifetimes. Therefore LifetimeParamKind::Explicit is fine.

compiler-errors · 2022-02-10T03:53:11Z

Thank you CI -- I'll add those error codes back then!

@rustbot author

compiler-errors · 2022-02-10T03:56:21Z

compiler/rustc_ast_lowering/src/lib.rs

@@ -141,13 +141,9 @@ struct LoweringContext<'a, 'hir: 'a> {
    /// indicate whether or not we're in a place where new lifetimes will result
    /// in in-band lifetime definitions, such a function or an impl header,
    /// including implicit lifetimes from `impl_header_lifetime_elision`.
-    is_collecting_in_band_lifetimes: bool,
+    is_collecting_anonymous_lifetimes: bool,


I renamed this to anonymous, since this handles both elided and in-band lifetimes, but we now only have the former. Open to calling this something like is_collecting_elided_lifetimes tho!

compiler-errors · 2022-02-10T04:15:03Z

I think this is ready for.. at least an initial review

@rustbot ready

scottmcm · 2022-02-10T07:00:29Z

Thanks for making the PR so quickly! ❤️

I'm not a compiler reviewer, though, so since you mention there are few nuanced bits here, it's probably better than someone who knows it better takes a look.

r? rust-lang/compiler

I could probably review some pieces, if you felt like splitting it up. (It seems like there are some easy bits, like updating tests that aren't about in-band to stop using it. Or maybe removing the special "do you want to try in-band?" hint would be a pure removal.) But since this is almost entirely red, it's not clear to me that it would be worth the effort of splitting. Hopefully the compiler reviewer will just be able to skim it and go "yup, seems fine".

compiler/rustc_feature/src/active.rs

compiler/rustc_error_codes/src/error_codes.rs

GuillaumeGomez · 2022-02-10T19:13:13Z

Take a look at some other error explanations not emitted by the compiler anymore to see how they handle the code examples (spoiler alert: use ignore 😉 ).

bors · 2022-02-24T17:03:51Z

📌 Commit 43dbd83 has been approved by cjgillot

…r=cjgillot Remove in band lifetimes As discussed in t-lang backlog bonanza, the `in_band_lifetimes` FCP closed in favor for the feature not being stabilized. This PR removes `#![feature(in_band_lifetimes)]` in its entirety. Let me know if this PR is too hasty, and if we should instead do something intermediate for deprecate the feature first. r? `@scottmcm` (or feel free to reassign, just saw your last comment on rust-lang#44524) Closes rust-lang#44524

…r=cjgillot Remove in band lifetimes As discussed in t-lang backlog bonanza, the `in_band_lifetimes` FCP closed in favor for the feature not being stabilized. This PR removes `#![feature(in_band_lifetimes)]` in its entirety. Let me know if this PR is too hasty, and if we should instead do something intermediate for deprecate the feature first. r? ``@scottmcm`` (or feel free to reassign, just saw your last comment on rust-lang#44524) Closes rust-lang#44524

…r=cjgillot Remove in band lifetimes As discussed in t-lang backlog bonanza, the `in_band_lifetimes` FCP closed in favor for the feature not being stabilized. This PR removes `#![feature(in_band_lifetimes)]` in its entirety. Let me know if this PR is too hasty, and if we should instead do something intermediate for deprecate the feature first. r? ```@scottmcm``` (or feel free to reassign, just saw your last comment on rust-lang#44524) Closes rust-lang#44524

Dylan-DPC · 2022-02-24T20:40:40Z

failed in #94328

@bors r-

compiler-errors · 2022-02-24T20:43:55Z

@Dylan-DPC wrong PR referenced?

Dylan-DPC · 2022-02-24T20:59:03Z

ye fixed now :P

compiler-errors · 2022-02-24T20:59:52Z

I'll re-bless when I get back to my computer.

compiler-errors · 2022-02-25T02:52:59Z

Had to bless tests with --compare-mode=nll. That did the trick.

when you have the free time, @cjgillot can you r+ again? thank you!

Mark-Simulacrum · 2022-02-25T03:06:39Z

@bors r=cjgillot

bors · 2022-02-25T03:06:40Z

📌 Commit 9386ea9 has been approved by cjgillot

…askrgr Rollup of 7 pull requests Successful merges: - rust-lang#93845 (Remove in band lifetimes) - rust-lang#94155 (Extend toggle GUI test a bit) - rust-lang#94252 (don't special case `DefKind::Ctor` in encoding) - rust-lang#94305 (Remove an unnecessary restriction in `dest_prop`) - rust-lang#94343 (Miri fn ptr check: don't use conservative null check) - rust-lang#94344 (diagnostic: suggest parens when users want logical ops, but get closures) - rust-lang#94352 (Fix SGX docs build) Failed merges: r? `@ghost` `@rustbot` modify labels: rollup

rust-highfive assigned scottmcm Feb 10, 2022

rustbot added the T-compiler Relevant to the compiler team, which will review and decide on the PR/issue. label Feb 10, 2022

rust-highfive added the S-waiting-on-review Status: Awaiting review from the assignee but also interested parties. label Feb 10, 2022

compiler-errors changed the title ~~In band lifetimes~~ Remove in band lifetimes Feb 10, 2022

compiler-errors commented Feb 10, 2022

View reviewed changes

This comment has been minimized.

Sign in to view

rustbot 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-review Status: Awaiting review from the assignee but also interested parties. labels Feb 10, 2022

compiler-errors commented Feb 10, 2022

View reviewed changes

compiler-errors force-pushed the in-band-lifetimes branch 2 times, most recently from b6dc969 to 7b9d78a Compare February 10, 2022 04:10

rustbot added S-waiting-on-review Status: Awaiting review from the assignee but also interested parties. and removed S-waiting-on-author Status: This is awaiting some action (such as code changes or more information) from the author. labels Feb 10, 2022

This comment has been minimized.

Sign in to view

compiler-errors force-pushed the in-band-lifetimes branch from 52cdc39 to c068a70 Compare February 10, 2022 04:29

rust-highfive assigned matthewjasper and unassigned scottmcm Feb 10, 2022

petrochenkov reviewed Feb 10, 2022

View reviewed changes

compiler/rustc_feature/src/active.rs Show resolved Hide resolved

cjgillot self-assigned this Feb 10, 2022

GuillaumeGomez requested changes Feb 10, 2022

View reviewed changes

compiler/rustc_error_codes/src/error_codes.rs Outdated Show resolved Hide resolved

This comment has been minimized.

Sign in to view

compiler-errors force-pushed the in-band-lifetimes branch 2 times, most recently from e4c51b8 to 9e53b97 Compare February 10, 2022 16:24

This comment has been minimized.

Sign in to view

compiler-errors force-pushed the in-band-lifetimes branch from 9e53b97 to 9a99cb3 Compare February 11, 2022 03:02

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 24, 2022

Manishearth mentioned this pull request Feb 24, 2022

Rollup of 5 pull requests #94328

Closed

Dylan-DPC mentioned this pull request Feb 24, 2022

Rollup of 9 pull requests #94331

Closed

Dylan-DPC mentioned this pull request Feb 24, 2022

Rollup of 9 pull requests #94332

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 24, 2022

compiler-errors added 2 commits February 24, 2022 18:50

Remove in-band lifetimes

bb548a9

Remove LifetimeDefOrigin

9386ea9

compiler-errors force-pushed the in-band-lifetimes branch from 43dbd83 to 9386ea9 Compare February 25, 2022 02:52

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 25, 2022

matthiaskrgr mentioned this pull request Feb 25, 2022

Rollup of 7 pull requests #94357

Merged

bors merged commit ec4fc72 into rust-lang:master Feb 25, 2022

rustbot added this to the 1.61.0 milestone Feb 25, 2022

compiler-errors deleted the in-band-lifetimes branch April 7, 2022 04:32

cdmistman mentioned this pull request Dec 6, 2022

missing lifetime specifier in pointer zshipko/ocaml-rs#82

Open

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

Remove in band lifetimes #93845

Remove in band lifetimes #93845

compiler-errors commented Feb 10, 2022 •

edited

Loading

rust-highfive commented Feb 10, 2022

compiler-errors Feb 10, 2022

compiler-errors Feb 10, 2022 •

edited

Loading

cjgillot Feb 19, 2022

cjgillot Feb 20, 2022

This comment has been minimized.

compiler-errors commented Feb 10, 2022

compiler-errors Feb 10, 2022

compiler-errors commented Feb 10, 2022

This comment has been minimized.

scottmcm commented Feb 10, 2022 •

edited

Loading

This comment has been minimized.

This comment has been minimized.

GuillaumeGomez commented Feb 10, 2022

bors commented Feb 24, 2022

Dylan-DPC commented Feb 24, 2022 •

edited

Loading

compiler-errors commented Feb 24, 2022

Dylan-DPC commented Feb 24, 2022

compiler-errors commented Feb 24, 2022

compiler-errors commented Feb 25, 2022

Mark-Simulacrum commented Feb 25, 2022

bors commented Feb 25, 2022

Remove in band lifetimes #93845

Remove in band lifetimes #93845

Conversation

compiler-errors commented Feb 10, 2022 • edited Loading

rust-highfive commented Feb 10, 2022

compiler-errors Feb 10, 2022

Choose a reason for hiding this comment

compiler-errors Feb 10, 2022 • edited Loading

Choose a reason for hiding this comment

cjgillot Feb 19, 2022

Choose a reason for hiding this comment

cjgillot Feb 20, 2022

Choose a reason for hiding this comment

This comment has been minimized.

compiler-errors commented Feb 10, 2022

compiler-errors Feb 10, 2022

Choose a reason for hiding this comment

compiler-errors commented Feb 10, 2022

This comment has been minimized.

scottmcm commented Feb 10, 2022 • edited Loading

This comment has been minimized.

This comment has been minimized.

GuillaumeGomez commented Feb 10, 2022

bors commented Feb 24, 2022

Dylan-DPC commented Feb 24, 2022 • edited Loading

compiler-errors commented Feb 24, 2022

Dylan-DPC commented Feb 24, 2022

compiler-errors commented Feb 24, 2022

compiler-errors commented Feb 25, 2022

Mark-Simulacrum commented Feb 25, 2022

bors commented Feb 25, 2022

compiler-errors commented Feb 10, 2022 •

edited

Loading

compiler-errors Feb 10, 2022 •

edited

Loading

scottmcm commented Feb 10, 2022 •

edited

Loading

Dylan-DPC commented Feb 24, 2022 •

edited

Loading