diff options
| author | bors <bors@rust-lang.org> | 2017-07-30 01:40:11 +0000 |
|---|---|---|
| committer | bors <bors@rust-lang.org> | 2017-07-30 01:40:11 +0000 |
| commit | 5c71e4ef90ef79c1ac79c4132333cbc80f5b85b9 (patch) | |
| tree | 1efdfb555e8266e747a7e2c453d0ff84d5613c90 /src/libsyntax/parse | |
| parent | 53bf7903fa7ebabca85f5937667956177989e345 (diff) | |
| parent | 16c3fd9f3d3dd6667c1966d6a62e56bf9deed0fd (diff) | |
| download | rust-5c71e4ef90ef79c1ac79c4132333cbc80f5b85b9.tar.gz rust-5c71e4ef90ef79c1ac79c4132333cbc80f5b85b9.zip | |
Auto merge of #43551 - Mark-Simulacrum:rollup, r=Mark-Simulacrum
Rollup of 8 pull requests - Successful merges: #43409, #43501, #43509, #43512, #43513, #43536, #43544, #43549 - Failed merges:
Diffstat (limited to 'src/libsyntax/parse')
| -rw-r--r-- | src/libsyntax/parse/mod.rs | 1 | ||||
| -rw-r--r-- | src/libsyntax/parse/parser.rs | 4 |
2 files changed, 5 insertions, 0 deletions
diff --git a/src/libsyntax/parse/mod.rs b/src/libsyntax/parse/mod.rs index 45e0b8404cc..7b105a8fa14 100644 --- a/src/libsyntax/parse/mod.rs +++ b/src/libsyntax/parse/mod.rs @@ -892,6 +892,7 @@ mod tests { where_clause: ast::WhereClause { id: ast::DUMMY_NODE_ID, predicates: Vec::new(), + span: syntax_pos::DUMMY_SP, }, span: syntax_pos::DUMMY_SP, }, diff --git a/src/libsyntax/parse/parser.rs b/src/libsyntax/parse/parser.rs index 1cb5a8111dc..ca362ec9368 100644 --- a/src/libsyntax/parse/parser.rs +++ b/src/libsyntax/parse/parser.rs @@ -4301,6 +4301,7 @@ impl<'a> Parser<'a> { where_clause: WhereClause { id: ast::DUMMY_NODE_ID, predicates: Vec::new(), + span: syntax_pos::DUMMY_SP, }, span: span_lo.to(self.prev_span), }) @@ -4368,11 +4369,13 @@ impl<'a> Parser<'a> { let mut where_clause = WhereClause { id: ast::DUMMY_NODE_ID, predicates: Vec::new(), + span: syntax_pos::DUMMY_SP, }; if !self.eat_keyword(keywords::Where) { return Ok(where_clause); } + let lo = self.prev_span; // This is a temporary future proofing. // @@ -4450,6 +4453,7 @@ impl<'a> Parser<'a> { } } + where_clause.span = lo.to(self.prev_span); Ok(where_clause) } |
