in which we decline to suggest the anonymous lifetime in declarations#61679

zackmdavis · 2019-06-09T04:52:45Z

The elided-lifetimes-in-path lint (part of our suite of Rust 2018 idiom lints which we are hoping to promote to Warn status) was firing with an illegal suggestion to write an anonymous lifetime in a
struct/item declaration (where we don't allow it). The linting code was already deciding whether to act on the basis of a ParamMode enum, indicating whether the present path-segment was part of an
expression, or anywhere else. The present case seemed to be part of the "anywhere else", and yet meriting different rules as far as the lint was concerned, so it seemed expedient to introduce a new enum member. We yank out TyKind::Path arm into its own method so that we can call it with our new ParamMode specifically when lowering struct fields—one would have hoped to think of something more elegant than this, but it definitely beats changing the signature of lower_ty to take a ParamMode!

Resolves #61124.

cc @memoryruins
r? @oli-obk

src/librustc/hir/lowering.rs

oli-obk · 2019-06-09T07:05:53Z

src/librustc/hir/lowering.rs

nit: directly return here instead of using an intermediate variable

oli-obk · 2019-06-09T07:06:35Z

src/librustc/hir/lowering.rs

alternatively you could add a ParamMode argument to lower_ty, not sure if that is better though

That was my first idea, but I decided against it, because it seemed inelegant to change the signature when most of the TyKind match arm bodies don't concern themselves with ParamMode.

oli-obk · 2019-06-09T07:06:49Z

r=me with nits addressed

The elided-lifetimes-in-path lint (part of our suite of Rust 2018 idiom lints which we are hoping to promote to Warn status) was firing with an illegal suggestion to write an anonymous lifetime in a struct/item declaration (where we don't allow it). The linting code was already deciding whether to act on the basis of a `ParamMode` enum, indicating whether the present path-segment was part of an expression, or anywhere else. The present case seemed to be part of the "anywhere else", and yet meriting different rules as far as the lint was concerned, so it seemed expedient to introduce a new enum member. We yank out a `TyKind::Path` arm into its own method so that we can call it with our new `ParamMode` specifically when lowering struct fields. (The alternative strategy of changing the signature of `lower_ty` to take a `ParamMode` would be inelegant given that most of the `TyKind` match arm bodies therein don't concern themselves with `ParamMode`.) Resolves rust-lang#61124.

zackmdavis · 2019-06-14T07:05:16Z

@bors r=oli-obk

bors · 2019-06-14T07:05:18Z

📌 Commit 7a3184a has been approved by oli-obk

bors · 2019-06-14T09:39:23Z

⌛ Testing commit 7a3184a with merge e699ea0...

@memoryruins

…ifetime, r=oli-obk in which we decline to suggest the anonymous lifetime in declarations The elided-lifetimes-in-path lint (part of our suite of Rust 2018 idiom lints which we are hoping to promote to Warn status) was firing with an illegal suggestion to write an anonymous lifetime in a struct/item declaration (where we don't allow it). The linting code was already deciding whether to act on the basis of a `ParamMode` enum, indicating whether the present path-segment was part of an expression, or anywhere else. The present case seemed to be part of the "anywhere else", and yet meriting different rules as far as the lint was concerned, so it seemed expedient to introduce a new enum member. We yank out `TyKind::Path` arm into its own method so that we can call it with our new `ParamMode` specifically when lowering struct fields—one would have hoped to think of something more elegant than this, but it definitely beats changing the signature of `lower_ty` to take a `ParamMode`! Resolves #61124. cc @memoryruins r? @oli-obk

bors · 2019-06-14T12:37:21Z

☀️ Test successful - checks-travis, status-appveyor
Approved by: oli-obk
Pushing e699ea0 to master...

…fmease Remove `ParamMode::ExplicitNamed` This was introduced as a hack to improve a diagnostics suggestion in rust-lang#61679. It was subsequently broken, but also it was an incomplete hack that I don't believe we need to support, so let's just remove it.

Rollup merge of rust-lang#129626 - compiler-errors:explicit-named, r=fmease Remove `ParamMode::ExplicitNamed` This was introduced as a hack to improve a diagnostics suggestion in rust-lang#61679. It was subsequently broken, but also it was an incomplete hack that I don't believe we need to support, so let's just remove it.

rust-highfive assigned oli-obk Jun 9, 2019

rust-highfive added the S-waiting-on-review Status: Awaiting review from the assignee but also interested parties. label Jun 9, 2019

Centril suggested changes Jun 9, 2019

View reviewed changes

src/librustc/hir/lowering.rs Outdated Show resolved Hide resolved

oli-obk reviewed Jun 9, 2019

View reviewed changes

src/librustc/hir/lowering.rs Outdated

Copy link
Copy Markdown

Contributor

oli-obk Jun 9, 2019

Choose a reason for hiding this comment

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

nit: directly return here instead of using an intermediate variable

oli-obk reviewed Jun 9, 2019

View reviewed changes

zackmdavis 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 Jun 9, 2019

zackmdavis force-pushed the maybe_dont_indicate_the_anonymous_lifetime branch from 9c55aa0 to 7a3184a Compare June 14, 2019 07:03

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 Jun 14, 2019

bors added the merged-by-bors This PR was explicitly merged by bors. label Jun 14, 2019

bors merged commit 7a3184a into rust-lang:master Jun 14, 2019

zackmdavis deleted the maybe_dont_indicate_the_anonymous_lifetime branch June 20, 2019 17:46

compiler-errors mentioned this pull request Aug 26, 2024

Remove ParamMode::ExplicitNamed #129626

Merged

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

Uh oh!

in which we decline to suggest the anonymous lifetime in declarations#61679