diff options
| author | Christian Poveda <cpovedar@fnal.gov> | 2019-06-20 17:01:48 -0500 |
|---|---|---|
| committer | Christian Poveda <cpovedar@fnal.gov> | 2019-06-20 17:01:48 -0500 |
| commit | e152c38f65ae1aa69630b0b82e571e52b05e3302 (patch) | |
| tree | a717ab627647fe0e4a11057a58277db860a4c1b4 /src/libsyntax/parse | |
| parent | 752a1a46685412202153c53ae320957cb48c751b (diff) | |
| parent | f693d339f175b3aa23a91c62632c5f0c86886059 (diff) | |
| download | rust-e152c38f65ae1aa69630b0b82e571e52b05e3302.tar.gz rust-e152c38f65ae1aa69630b0b82e571e52b05e3302.zip | |
Fix merge issues
Diffstat (limited to 'src/libsyntax/parse')
| -rw-r--r-- | src/libsyntax/parse/parser.rs | 2 |
1 files changed, 0 insertions, 2 deletions
diff --git a/src/libsyntax/parse/parser.rs b/src/libsyntax/parse/parser.rs index 78eeb512206..fa697e06d26 100644 --- a/src/libsyntax/parse/parser.rs +++ b/src/libsyntax/parse/parser.rs @@ -5075,7 +5075,6 @@ impl<'a> Parser<'a> { Ok(ast::Generics { params, where_clause: WhereClause { - id: ast::DUMMY_NODE_ID, predicates: Vec::new(), span: DUMMY_SP, }, @@ -5334,7 +5333,6 @@ impl<'a> Parser<'a> { /// ``` fn parse_where_clause(&mut self) -> PResult<'a, WhereClause> { let mut where_clause = WhereClause { - id: ast::DUMMY_NODE_ID, predicates: Vec::new(), span: self.prev_span.to(self.prev_span), }; |