rust-lang/rust
1
0
Fork 0
Code Issues Pull Requests Actions 1 Packages Projects Releases Wiki Activity

Rollup merge of #54261 - varkor:dyn-keyword-2018, r=petrochenkov

Browse Source 
Make `dyn` a keyword in the 2018 edition

Proposed in https://github.com/rust-lang/rust/issues/44662#issuecomment-421596088.
This commit is contained in:
Pietro Albini
2018-09-22 09:56:27 +02:00
committed by GitHub
parent e6ee4e056d cb594cf373
commit 822c51121e
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

@@ -1578,8 +1578,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()?;