diff options
| author | bors <bors@rust-lang.org> | 2018-08-01 19:54:06 +0000 |
|---|---|---|
| committer | bors <bors@rust-lang.org> | 2018-08-01 19:54:06 +0000 |
| commit | 97085f9fb0736b322dc216db3655da780b4d8041 (patch) | |
| tree | 51ff3c45c1fdf154e186cb1c494a7ac93b94b5bf /src/libsyntax/parse | |
| parent | c4156768aa1f23117903e6954f3e9ba946f49295 (diff) | |
| parent | 3e7897f773f48ce982cbee6fbfd3118e5648e352 (diff) | |
| download | rust-97085f9fb0736b322dc216db3655da780b4d8041.tar.gz rust-97085f9fb0736b322dc216db3655da780b4d8041.zip | |
Auto merge of #52958 - pietroalbini:rollup, r=pietroalbini
Rollup of 15 pull requests
Successful merges:
- #52793 (Add test for NLL: unexpected "free region `` does not outlive" error )
- #52799 (Use BitVector for global sets of AttrId)
- #52809 (Add test for unexpected region for local data ReStatic)
- #52834 ([NLL] Allow conflicting borrows of promoted length zero arrays)
- #52835 (Fix Alias intra doc ICE)
- #52854 (fix memrchr in miri)
- #52899 (tests/ui: Add missing mips{64} ignores)
- #52908 (Use SetLenOnDrop in Vec::truncate())
- #52915 (Don't count MIR locals as borrowed after StorageDead when finding locals live across a yield terminator)
- #52926 (rustc: Trim down the `rust_2018_idioms` lint group)
- #52930 (rustc_resolve: record single-segment extern crate import resolutions.)
- #52939 (Make io::Read::read_to_end consider io::Take::limit)
- #52942 (Another SmallVec.extend optimization)
- #52947 (1.27 actually added the `armv5te-unknown-linux-musleabi` target)
- #52954 (async can begin expressions)
Failed merges:
r? @ghost
Diffstat (limited to 'src/libsyntax/parse')
| -rw-r--r-- | src/libsyntax/parse/token.rs | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/src/libsyntax/parse/token.rs b/src/libsyntax/parse/token.rs index fd8f394a600..c449cc0a652 100644 --- a/src/libsyntax/parse/token.rs +++ b/src/libsyntax/parse/token.rs @@ -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(), |