Skip to content

Commit

Permalink
Only suggest turbofish in patterns if we may recover
Browse files Browse the repository at this point in the history
  • Loading branch information
fmease committed Sep 12, 2023
1 parent 3cd97ed commit 3ed77e9
Show file tree
Hide file tree
Showing 2 changed files with 23 additions and 1 deletion.
3 changes: 2 additions & 1 deletion compiler/rustc_parse/src/parser/pat.rs
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
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);
};
}

0 comments on commit 3ed77e9

Please sign in to comment.