From c4bbe9cbbe9921646cdedb856e34dc951641ed96 Mon Sep 17 00:00:00 2001
From: Mazdak Farrokhzad <twingoow@gmail.com>
Date: Sat, 30 Nov 2019 18:25:44 +0100
Subject: Alias `TraitItem` & `ImplItem`. Allow defaultness on trait items
 syntactically.

---
 src/librustc_parse/parser/item.rs | 6 ++++--
 1 file changed, 4 insertions(+), 2 deletions(-)

(limited to 'src/librustc_parse/parser')

diff --git a/src/librustc_parse/parser/item.rs b/src/librustc_parse/parser/item.rs
index 34ef12e818c..c159fb66d50 100644
--- a/src/librustc_parse/parser/item.rs
+++ b/src/librustc_parse/parser/item.rs
@@ -714,9 +714,9 @@ impl<'a> Parser<'a> {
             id: DUMMY_NODE_ID,
             span: lo.to(self.prev_span),
             ident: name,
+            attrs,
             vis,
             defaultness,
-            attrs,
             generics,
             kind,
             tokens: None,
@@ -882,6 +882,7 @@ impl<'a> Parser<'a> {
     ) -> PResult<'a, TraitItem> {
         let lo = self.token.span;
         let vis = self.parse_visibility(FollowedByType::No)?;
+        let defaultness = self.parse_defaultness();
         let (name, kind, generics) = if self.eat_keyword(kw::Type) {
             self.parse_trait_item_assoc_ty()?
         } else if self.is_const_item() {
@@ -895,12 +896,13 @@ impl<'a> Parser<'a> {
 
         Ok(TraitItem {
             id: DUMMY_NODE_ID,
+            span: lo.to(self.prev_span),
             ident: name,
             attrs,
             vis,
+            defaultness,
             generics,
             kind,
-            span: lo.to(self.prev_span),
             tokens: None,
         })
     }
-- 
cgit 1.4.1-3-g733a5