bjoernager/rust
bjoernager/rust
1
Fork 0
Code Issues Pull requests Activity

Treat dyn as a keyword in the 2018 edition

Browse source
This commit is contained in:
varkor 2018-09-15 18:18:49 +01:00
parent 90d36fb590
commit cb594cf373
9 changed files with 72 additions and 14 deletions
Download patch file Download diff file Expand all files Collapse all files

5
src/libsyntax/parse/parser.rs
View file

@ -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()?;