diff options
| author | yukang <moorekang@gmail.com> | 2023-05-13 18:06:58 +0800 |
|---|---|---|
| committer | yukang <moorekang@gmail.com> | 2023-05-13 19:40:17 +0800 |
| commit | 83789b8b068ad38c6a3c937d0a2c6ca64e588c85 (patch) | |
| tree | 6004b2e73324c5415bff6a8bfea50a116aed3fa0 | |
| parent | ce6cfc37d033eb1fb1f2e3af1c17c218917b54ec (diff) | |
| download | rust-83789b8b068ad38c6a3c937d0a2c6ca64e588c85.tar.gz rust-83789b8b068ad38c6a3c937d0a2c6ca64e588c85.zip | |
fmt
| -rw-r--r-- | compiler/rustc_parse/src/parser/expr.rs | 9 | ||||
| -rw-r--r-- | tests/ui/parser/issues/issue-111416.rs | 1 | ||||
| -rw-r--r-- | tests/ui/parser/issues/issue-111416.stderr | 2 |
3 files changed, 4 insertions, 8 deletions
diff --git a/compiler/rustc_parse/src/parser/expr.rs b/compiler/rustc_parse/src/parser/expr.rs index 808bbbdada6..ee712a8e1b5 100644 --- a/compiler/rustc_parse/src/parser/expr.rs +++ b/compiler/rustc_parse/src/parser/expr.rs @@ -1181,12 +1181,9 @@ impl<'a> Parser<'a> { let close_paren = self.prev_token.span; let span = lo.to(close_paren); // filter shorthand fields - let fields: Vec<_> = fields - .into_iter() - .filter_map( - |field| if !field.is_shorthand { Some(field) } else { None }, - ) - .collect(); + let fields: Vec<_> = + fields.into_iter().filter(|field| !field.is_shorthand).collect(); + if !fields.is_empty() && // `token.kind` should not be compared here. // This is because the `snapshot.token.kind` is treated as the same as diff --git a/tests/ui/parser/issues/issue-111416.rs b/tests/ui/parser/issues/issue-111416.rs index deba8679b1a..cfd1b6b99ba 100644 --- a/tests/ui/parser/issues/issue-111416.rs +++ b/tests/ui/parser/issues/issue-111416.rs @@ -1,4 +1,3 @@ - fn main() { let my = monad_bind(mx, T: Try); //~ ERROR invalid `struct` delimiters or `fn` call arguments } diff --git a/tests/ui/parser/issues/issue-111416.stderr b/tests/ui/parser/issues/issue-111416.stderr index b9e61d70e81..ddacf4d6dfc 100644 --- a/tests/ui/parser/issues/issue-111416.stderr +++ b/tests/ui/parser/issues/issue-111416.stderr @@ -1,5 +1,5 @@ error: invalid `struct` delimiters or `fn` call arguments - --> $DIR/issue-111416.rs:3:14 + --> $DIR/issue-111416.rs:2:14 | LL | let my = monad_bind(mx, T: Try); | ^^^^^^^^^^^^^^^^^^^^^^ |