diff options
| author | Mark Simulacrum <mark.simulacrum@gmail.com> | 2017-07-29 18:03:52 -0600 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2017-07-29 18:03:52 -0600 |
| commit | e61e73fcc41a09d1d955169fa7ea5b0be65c1fcb (patch) | |
| tree | 3e77da27cf8b181fc2fae87a5ca7afe49254c069 /src/libsyntax/parse | |
| parent | f205f48a00fc710bac8b181ee720f2807314d7e3 (diff) | |
| parent | 6375b77ebb640001e9d076eec8601d926d2543f7 (diff) | |
| download | rust-e61e73fcc41a09d1d955169fa7ea5b0be65c1fcb.tar.gz rust-e61e73fcc41a09d1d955169fa7ea5b0be65c1fcb.zip | |
Rollup merge of #43501 - topecongiro:span-to-whereclause, r=nrc
Add Span to ast::WhereClause This PR adds `Span` field to `ast::WhereClause`. The motivation here is to make rustfmt's life easier when recovering comments before and after where clause. r? @nrc
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 1a10aa9d621..70d4031625c 100644 --- a/src/libsyntax/parse/parser.rs +++ b/src/libsyntax/parse/parser.rs @@ -4302,6 +4302,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), }) @@ -4369,11 +4370,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. // @@ -4451,6 +4454,7 @@ impl<'a> Parser<'a> { } } + where_clause.span = lo.to(self.prev_span); Ok(where_clause) } |