diff options
| author | bors[bot] <26634292+bors[bot]@users.noreply.github.com> | 2020-02-19 10:38:27 +0000 |
|---|---|---|
| committer | GitHub <[email protected]> | 2020-02-19 10:38:27 +0000 |
| commit | d07f043ef1c99491cb172f3c3474b31c97501d7a (patch) | |
| tree | 41099b8ebd3f8ca0aea64ac8623e8ac1140ca572 /crates/ra_mbe | |
| parent | 20252efb32bfdfe7392934a95a6c6d6b583d10e7 (diff) | |
| parent | d06733efebc5d8b378398f1cbb4bbd9f3deb8270 (diff) | |
Merge #3229
3229: Fix a crash with non-ascii whitespace in doc-comments r=matklad a=sinkuu
2nd commit is a random drive-by cleanup.
Co-authored-by: Shotaro Yamada <[email protected]>
Diffstat (limited to 'crates/ra_mbe')
| -rw-r--r-- | crates/ra_mbe/src/subtree_source.rs | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/crates/ra_mbe/src/subtree_source.rs b/crates/ra_mbe/src/subtree_source.rs index eb8b79e9a..dacca8279 100644 --- a/crates/ra_mbe/src/subtree_source.rs +++ b/crates/ra_mbe/src/subtree_source.rs | |||
| @@ -141,7 +141,7 @@ fn convert_literal(l: &tt::Literal) -> TtToken { | |||
| 141 | } | 141 | } |
| 142 | 142 | ||
| 143 | fn convert_ident(ident: &tt::Ident) -> TtToken { | 143 | fn convert_ident(ident: &tt::Ident) -> TtToken { |
| 144 | let kind = if let Some('\'') = ident.text.chars().next() { | 144 | let kind = if ident.text.starts_with('\'') { |
| 145 | LIFETIME | 145 | LIFETIME |
| 146 | } else { | 146 | } else { |
| 147 | SyntaxKind::from_keyword(ident.text.as_str()).unwrap_or(IDENT) | 147 | SyntaxKind::from_keyword(ident.text.as_str()).unwrap_or(IDENT) |