diff options
| author | bors[bot] <26634292+bors[bot]@users.noreply.github.com> | 2021-05-15 16:32:54 +0100 |
|---|---|---|
| committer | GitHub <[email protected]> | 2021-05-15 16:32:54 +0100 |
| commit | 92abc56bc928fb2a11b8f5b2a37e3c9ee31102d7 (patch) | |
| tree | f3244e2c4816abe349c0fbbf66ca469a03532a3a /crates/syntax | |
| parent | 87ef340c19ae5ac73fc9b1cd37909d9d8ad53d09 (diff) | |
| parent | 4b5b54279ad74316837bcdc7daa195d82bd13d3a (diff) | |
Merge #8848
8848: Attach comments to ast::Impl r=Veykril a=Veykril
bors r+
Fixes #8847
Co-authored-by: Lukas Wirth <[email protected]>
Diffstat (limited to 'crates/syntax')
| -rw-r--r-- | crates/syntax/src/parsing/text_tree_sink.rs | 4 | ||||
| -rw-r--r-- | crates/syntax/test_data/parser/ok/0045_block_attrs.rast | 6 |
2 files changed, 5 insertions, 5 deletions
diff --git a/crates/syntax/src/parsing/text_tree_sink.rs b/crates/syntax/src/parsing/text_tree_sink.rs index 1934204ea..d63ec080b 100644 --- a/crates/syntax/src/parsing/text_tree_sink.rs +++ b/crates/syntax/src/parsing/text_tree_sink.rs | |||
| @@ -147,8 +147,8 @@ fn n_attached_trivias<'a>( | |||
| 147 | trivias: impl Iterator<Item = (SyntaxKind, &'a str)>, | 147 | trivias: impl Iterator<Item = (SyntaxKind, &'a str)>, |
| 148 | ) -> usize { | 148 | ) -> usize { |
| 149 | match kind { | 149 | match kind { |
| 150 | MACRO_CALL | MACRO_RULES | MACRO_DEF | CONST | TYPE_ALIAS | STRUCT | UNION | ENUM | 150 | CONST | ENUM | FN | IMPL | MACRO_CALL | MACRO_DEF | MACRO_RULES | MODULE | RECORD_FIELD |
| 151 | | VARIANT | FN | TRAIT | MODULE | RECORD_FIELD | STATIC | USE => { | 151 | | STATIC | STRUCT | TRAIT | TUPLE_FIELD | TYPE_ALIAS | UNION | USE | VARIANT => { |
| 152 | let mut res = 0; | 152 | let mut res = 0; |
| 153 | let mut trivias = trivias.enumerate().peekable(); | 153 | let mut trivias = trivias.enumerate().peekable(); |
| 154 | 154 | ||
diff --git a/crates/syntax/test_data/parser/ok/0045_block_attrs.rast b/crates/syntax/test_data/parser/ok/0045_block_attrs.rast index 50ab52d32..5e50b4e0b 100644 --- a/crates/syntax/test_data/parser/ok/0045_block_attrs.rast +++ b/crates/syntax/test_data/parser/ok/0045_block_attrs.rast | |||
| @@ -127,9 +127,9 @@ [email protected] | |||
| 127 | [email protected] "\n" | 127 | [email protected] "\n" |
| 128 | [email protected] "}" | 128 | [email protected] "}" |
| 129 | [email protected] "\n\n" | 129 | [email protected] "\n\n" |
| 130 | COMMENT@541..601 "// https://github.com ..." | 130 | IMPL@541..763 |
| 131 | WHITESPACE@601..602 "\n" | 131 | COMMENT@541..601 "// https://github.com ..." |
| 132 | IMPL@602..763 | 132 | WHITESPACE@601..602 "\n" |
| 133 | [email protected] "impl" | 133 | [email protected] "impl" |
| 134 | [email protected] " " | 134 | [email protected] " " |
| 135 | [email protected] | 135 | [email protected] |