diff options
| author | bors <bors@rust-lang.org> | 2018-07-25 00:31:58 +0000 |
|---|---|---|
| committer | bors <bors@rust-lang.org> | 2018-07-25 00:31:58 +0000 |
| commit | 13985724033467ab86da9136c43fe242092b294e (patch) | |
| tree | b0f41cba1aee734fa57945896cb6044fc962a046 /src/libsyntax/parse | |
| parent | 46804ef0cee4b55ed9922719da243b6edd9101b2 (diff) | |
| parent | 1deaed9e5e5c3d0676183e5dd250574e240b5138 (diff) | |
| download | rust-13985724033467ab86da9136c43fe242092b294e.tar.gz rust-13985724033467ab86da9136c43fe242092b294e.zip | |
Auto merge of #52680 - Mark-Simulacrum:rollup, r=Mark-Simulacrum
Rollup of 7 pull requests Successful merges: - #52391 (Add unaligned volatile intrinsics) - #52402 (impl PartialEq+Eq for BuildHasherDefault) - #52645 (Allow declaring existential types inside blocks) - #52656 (Stablize Redox Unix Sockets) - #52658 (Prefer `Option::map`/etc over `match` wherever it improves clarity) - #52668 (clarify pointer offset function safety concerns) - #52677 (Release notes: add some missing 1.28 libs stabilization) Failed merges: r? @ghost
Diffstat (limited to 'src/libsyntax/parse')
| -rw-r--r-- | src/libsyntax/parse/parser.rs | 6 |
1 files changed, 6 insertions, 0 deletions
diff --git a/src/libsyntax/parse/parser.rs b/src/libsyntax/parse/parser.rs index 54376797dea..64309dd9b8b 100644 --- a/src/libsyntax/parse/parser.rs +++ b/src/libsyntax/parse/parser.rs @@ -4391,6 +4391,11 @@ impl<'a> Parser<'a> { self.token.is_keyword(keywords::Extern) && self.look_ahead(1, |t| t != &token::ModSep) } + fn is_existential_type_decl(&self) -> bool { + self.token.is_keyword(keywords::Existential) && + self.look_ahead(1, |t| t.is_keyword(keywords::Type)) + } + fn is_auto_trait_item(&mut self) -> bool { // auto trait (self.token.is_keyword(keywords::Auto) @@ -4495,6 +4500,7 @@ impl<'a> Parser<'a> { !self.is_union_item() && !self.is_crate_vis() && !self.is_extern_non_path() && + !self.is_existential_type_decl() && !self.is_auto_trait_item() { let pth = self.parse_path(PathStyle::Expr)?; |
