Parser: Suggest Placing the Return Type After Function Parameters #127350
Conversation
rustbot
added
S-waiting-on-review
veera-sivarajan
changed the title
|
r? compiler |
| generics.where_clause = self.parse_where_clause()?; // `where T: Ord` | ||
|
|
||
| // `fn_params_end` is needed only when it's followed by a where clause. | ||
| let fn_params_end = | ||
| if generics.where_clause.has_where_token { Some(fn_params_end) } else { None }; |
There was a problem hiding this comment.
what's the harm of always passing in that span?
There was a problem hiding this comment.
Checking if a where clause exists makes sure we don't incorrectly suggest to place the second return type after function parameters for code like fn fun<T>() -> u8 -> u8 {}.
I've added that as a test in https://github.com/rust-lang/rust/blob/d14e2818e8d5e9d65f464517d1a88272b626629e/tests/ui/parser/issues/misplaced-return-type-without-where-issue-126311.stderr.
veera-sivarajan
force-pushed
the
bugfix-126311
branch
from
86d6f13
to
d14e281
Compare
veera-sivarajan
force-pushed
the
bugfix-126311
branch
from
d14e281
to
7ca42a2
Compare
|
Sure, thank you for the suggestion. I moved the error handling to a separate function. But, it's not possible to return an |
| Err(err) | ||
| } | ||
| } else { | ||
| Ok(()) |
There was a problem hiding this comment.
that Ok(()) is very questionable 🤔 I would expect that this is unreachable?
There was a problem hiding this comment.
Replacing the Ok(()) with unreachable!() fails on this UI test:
extern "C" {
fn foo() //~ERROR expected `;`
}It's because expected_one_of_not_found() returns an Ok() when it's able to recover from an error.
There was a problem hiding this comment.
👍 two more requests then. expected_one_of_not_found currently always returns Recovered::Yes(ErrorGuaranteed) in that case afaict. Please change its return type to PResult<'a, ErrorGuaranteed> and do the same for error_fn_body_not_found to just propagate the error upwards
There was a problem hiding this comment.
Sure, changed the return type of those two functions to PResult<'a, ErrorGuaranteed>. Also, made some small changes to expect_one_of to map ErrorGuaranteed to Recovered::Yes(ErrorGuaranteed).
Thank you for the suggestions.
veera-sivarajan
force-pushed
the
bugfix-126311
branch
from
7ca42a2
to
4cad705
Compare
|
@bors r+ rollup |
bors
added
S-waiting-on-bors
Parser: Suggest Placing the Return Type After Function Parameters Fixes rust-lang#126311 This PR suggests placing the return type after the function parameters when it's misplaced after a `where` clause. This also tangentially improves diagnostics for cases like [this](https://github.com/veera-sivarajan/rust/blob/86d6f1312a77997ef994240e716288d61a343a6d/tests/ui/parser/issues/misplaced-return-type-without-where-issue-126311.rs#L1C1-L1C28) and adds doc comments for `parser::AllowPlus`.
Parser: Suggest Placing the Return Type After Function Parameters Fixes rust-lang#126311 This PR suggests placing the return type after the function parameters when it's misplaced after a `where` clause. This also tangentially improves diagnostics for cases like [this](https://github.com/veera-sivarajan/rust/blob/86d6f1312a77997ef994240e716288d61a343a6d/tests/ui/parser/issues/misplaced-return-type-without-where-issue-126311.rs#L1C1-L1C28) and adds doc comments for `parser::AllowPlus`.
Rollup of 7 pull requests Successful merges: - rust-lang#123196 (Add Process support for UEFI) - rust-lang#127350 (Parser: Suggest Placing the Return Type After Function Parameters) - rust-lang#127523 (Migrate `dump-ice-to-disk` and `panic-abort-eh_frame` `run-make` tests to rmake) - rust-lang#127662 (When finding item gated behind a `cfg` flag, point at it) - rust-lang#127903 (`force_collect` improvements) - rust-lang#127932 (rustdoc: fix `current` class on sidebar modnav) - rust-lang#127943 (Don't allow unsafe statics outside of extern blocks) r? `@ghost` `@rustbot` modify labels: rollup
…iaskrgr Rollup of 6 pull requests Successful merges: - rust-lang#127350 (Parser: Suggest Placing the Return Type After Function Parameters) - rust-lang#127621 (Rewrite and rename `issue-22131` and `issue-26006` `run-make` tests to rmake) - rust-lang#127662 (When finding item gated behind a `cfg` flag, point at it) - rust-lang#127903 (`force_collect` improvements) - rust-lang#127932 (rustdoc: fix `current` class on sidebar modnav) - rust-lang#127943 (Don't allow unsafe statics outside of extern blocks) r? `@ghost` `@rustbot` modify labels: rollup
Rollup merge of rust-lang#127350 - veera-sivarajan:bugfix-126311, r=lcnr Parser: Suggest Placing the Return Type After Function Parameters Fixes rust-lang#126311 This PR suggests placing the return type after the function parameters when it's misplaced after a `where` clause. This also tangentially improves diagnostics for cases like [this](https://github.com/veera-sivarajan/rust/blob/86d6f1312a77997ef994240e716288d61a343a6d/tests/ui/parser/issues/misplaced-return-type-without-where-issue-126311.rs#L1C1-L1C28) and adds doc comments for `parser::AllowPlus`.
Fixes #126311
This PR suggests placing the return type after the function parameters when it's misplaced after a
whereclause.This also tangentially improves diagnostics for cases like this and adds doc comments for
parser::AllowPlus.