diff options
author | bors[bot] <26634292+bors[bot]@users.noreply.github.com> | 2021-05-24 20:52:01 +0100 |
---|---|---|
committer | GitHub <[email protected]> | 2021-05-24 20:52:01 +0100 |
commit | f5f24a9a2c2e9d5d5ff155e700b2bf647f926d47 (patch) | |
tree | 273c8086766a31f0ff5df2a89cbe670828e887db /crates/hir_expand/src/db.rs | |
parent | 1ebb53e5db32e32c00e4ce0ceba4277b53967056 (diff) | |
parent | c8f40b1503cb461b935f5fb0a44fa8e26976c363 (diff) |
Merge #8977
8977: internal: minor `TokenMap` cleanups r=jonas-schievink a=jonas-schievink
bors r+
Co-authored-by: Jonas Schievink <[email protected]>
Diffstat (limited to 'crates/hir_expand/src/db.rs')
-rw-r--r-- | crates/hir_expand/src/db.rs | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/crates/hir_expand/src/db.rs b/crates/hir_expand/src/db.rs index db9d19b0c..625c26f0a 100644 --- a/crates/hir_expand/src/db.rs +++ b/crates/hir_expand/src/db.rs | |||
@@ -155,7 +155,7 @@ pub fn expand_speculative( | |||
155 | mbe::token_tree_to_syntax_node(&speculative_expansion.value, fragment_kind).ok()?; | 155 | mbe::token_tree_to_syntax_node(&speculative_expansion.value, fragment_kind).ok()?; |
156 | 156 | ||
157 | let token_id = macro_def.map_id_down(token_id); | 157 | let token_id = macro_def.map_id_down(token_id); |
158 | let range = tmap_2.range_by_token(token_id)?.by_kind(token_to_map.kind())?; | 158 | let range = tmap_2.range_by_token(token_id, token_to_map.kind())?; |
159 | let token = node.syntax_node().covering_element(range).into_token()?; | 159 | let token = node.syntax_node().covering_element(range).into_token()?; |
160 | Some((node.syntax_node(), token)) | 160 | Some((node.syntax_node(), token)) |
161 | } | 161 | } |