Skip to content

Only suggest turbofish in patterns if we may recover #115785

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 1 commit into from
Sep 13, 2023
Merged

Only suggest turbofish in patterns if we may recover #115785

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
3 changes: 2 additions & 1 deletion compiler/rustc_parse/src/parser/pat.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -830,7 +830,8 @@ impl<'a> Parser<'a> {
) -> PResult<'a, PatKind> {
let ident = self.parse_ident()?;

if !matches!(syntax_loc, Some(PatternLocation::FunctionParameter))
if self.may_recover()
&& !matches!(syntax_loc, Some(PatternLocation::FunctionParameter))
&& self.check_noexpect(&token::Lt)
&& self.look_ahead(1, |t| t.can_begin_type())
{
Expand Down
21 changes: 21 additions & 0 deletions tests/ui/parser/issues/issue-115780-pat-lt-bracket-in-macro-call.rs
View file
Open in desktop
Copy link
Member Author

@fmease fmease Sep 12, 2023

Choose a reason for hiding this comment

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

Originally I wanted to place this file into parser/ directly but its file entry limit of 900 has been reached

Copy link
Member Author

@fmease fmease Sep 12, 2023

Choose a reason for hiding this comment

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

Naming of this file mirrors naming in #114300.

Original file line number Diff line number Diff line change
@@ -0,0 +1,21 @@
// Regression test for issue #115780.
// Ensure that we don't emit a parse error for the token sequence `Ident "<" Ty` in pattern position
// if we are inside a macro call since it can be valid input for a subsequent macro rule.
// See also #103534.

// check-pass

macro_rules! mdo {
($p: pat =<< $e: expr ; $( $t: tt )*) => {
$e.and_then(|$p| mdo! { $( $t )* })
};
(ret<$ty: ty> $e: expr;) => { Some::<$ty>($e) };
}

fn main() {
mdo! {
x_val =<< Some(0);
y_val =<< Some(1);
ret<(i32, i32)> (x_val, y_val);
};
}