diff options
| author | varkor <github@varkor.com> | 2018-09-15 18:18:49 +0100 |
|---|---|---|
| committer | varkor <github@varkor.com> | 2018-09-16 23:34:42 +0100 |
| commit | cb594cf3730c35fd6c514e98d9c7a0d78a00a02d (patch) | |
| tree | 4db20dec82d35c17b79cd49ef599cea3b42ac9f5 /src/libsyntax/parse/parser.rs | |
| parent | 90d36fb5905bbe5004f5b465ea14b53d10dae260 (diff) | |
| download | rust-cb594cf3730c35fd6c514e98d9c7a0d78a00a02d.tar.gz rust-cb594cf3730c35fd6c514e98d9c7a0d78a00a02d.zip | |
Treat `dyn` as a keyword in the 2018 edition
Diffstat (limited to 'src/libsyntax/parse/parser.rs')
| -rw-r--r-- | src/libsyntax/parse/parser.rs | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/src/libsyntax/parse/parser.rs b/src/libsyntax/parse/parser.rs index f57fca2cfcf..ab1f46c4bb9 100644 --- a/src/libsyntax/parse/parser.rs +++ b/src/libsyntax/parse/parser.rs @@ -1562,8 +1562,9 @@ impl<'a> Parser<'a> { impl_dyn_multi = bounds.len() > 1 || self.prev_token_kind == PrevTokenKind::Plus; TyKind::ImplTrait(ast::DUMMY_NODE_ID, bounds) } else if self.check_keyword(keywords::Dyn) && - self.look_ahead(1, |t| t.can_begin_bound() && - !can_continue_type_after_non_fn_ident(t)) { + (self.span.edition() == Edition::Edition2018 || + self.look_ahead(1, |t| t.can_begin_bound() && + !can_continue_type_after_non_fn_ident(t))) { self.bump(); // `dyn` // Always parse bounds greedily for better error recovery. let bounds = self.parse_generic_bounds()?; |