Skip to content

Commit

Permalink
Rollup merge of #52954 - cramertj:async-parse, r=petrochenkov
Browse files Browse the repository at this point in the history
async can begin expressions

Fix #52951

r? @petrochenkov
  • Loading branch information
pietroalbini committed Aug 1, 2018
2 parents b2392fa + f685142 commit 3e7897f
Show file tree
Hide file tree
Showing 2 changed files with 24 additions and 0 deletions.
1 change: 1 addition & 0 deletions src/libsyntax/parse/token.rs
Original file line number Diff line number Diff line change
Expand Up @@ -104,6 +104,7 @@ pub(crate) fn ident_can_begin_expr(ident: ast::Ident, is_raw: bool) -> bool {
!ident_token.is_reserved_ident() ||
ident_token.is_path_segment_keyword() ||
[
keywords::Async.name(),
keywords::Do.name(),
keywords::Box.name(),
keywords::Break.name(),
Expand Down
23 changes: 23 additions & 0 deletions src/test/ui/async-matches-expr.rs
Original file line number Diff line number Diff line change
@@ -0,0 +1,23 @@
// Copyright 2018 The Rust Project Developers. See the COPYRIGHT
// file at the top-level directory of this distribution and at
// http://rust-lang.org/COPYRIGHT.
//
// Licensed under the Apache License, Version 2.0 <LICENSE-APACHE or
// http://www.apache.org/licenses/LICENSE-2.0> or the MIT license
// <LICENSE-MIT or http://opensource.org/licenses/MIT>, at your
// option. This file may not be copied, modified, or distributed
// except according to those terms.

// compile-pass
// edition:2018

#![feature(async_await, await_macro)]

macro_rules! match_expr {
($x:expr) => {}
}

fn main() {
match_expr!(async {});
match_expr!(async || {});
}

0 comments on commit 3e7897f

Please sign in to comment.