diff options
author | bors[bot] <bors[bot]@users.noreply.github.com> | 2019-02-26 18:04:24 +0000 |
---|---|---|
committer | bors[bot] <bors[bot]@users.noreply.github.com> | 2019-02-26 18:04:24 +0000 |
commit | 4248b39993e2446c66f732ae9e45fb2f564099f5 (patch) | |
tree | 9d663ec20699f529adafcc42395bce71eeb0a01f | |
parent | 5e00a398f77247814a90a68ca351304381b8e82f (diff) | |
parent | ffca2c1fe439da9a810c92f80cf1b57a2f0611d1 (diff) |
Merge #902
902: Fix a typo r=matklad a=dwijnand
Co-authored-by: Dale Wijnand <[email protected]>
-rw-r--r-- | crates/ra_mbe/src/syntax_bridge.rs | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/crates/ra_mbe/src/syntax_bridge.rs b/crates/ra_mbe/src/syntax_bridge.rs index c1472bbe5..4b1d1d3ca 100644 --- a/crates/ra_mbe/src/syntax_bridge.rs +++ b/crates/ra_mbe/src/syntax_bridge.rs | |||
@@ -8,7 +8,7 @@ use ra_syntax::{ | |||
8 | #[derive(Default)] | 8 | #[derive(Default)] |
9 | pub struct TokenMap { | 9 | pub struct TokenMap { |
10 | /// Maps `tt::TokenId` to the *relative* source range. | 10 | /// Maps `tt::TokenId` to the *relative* source range. |
11 | toknes: Vec<TextRange>, | 11 | tokens: Vec<TextRange>, |
12 | } | 12 | } |
13 | 13 | ||
14 | /// Convert the syntax tree (what user has written) to a `TokenTree` (what macro | 14 | /// Convert the syntax tree (what user has written) to a `TokenTree` (what macro |
@@ -32,12 +32,12 @@ pub fn token_tree_to_ast_item_list(tt: &tt::Subtree) -> TreeArc<ast::SourceFile> | |||
32 | impl TokenMap { | 32 | impl TokenMap { |
33 | pub fn relative_range_of(&self, tt: tt::TokenId) -> Option<TextRange> { | 33 | pub fn relative_range_of(&self, tt: tt::TokenId) -> Option<TextRange> { |
34 | let idx = tt.0 as usize; | 34 | let idx = tt.0 as usize; |
35 | self.toknes.get(idx).map(|&it| it) | 35 | self.tokens.get(idx).map(|&it| it) |
36 | } | 36 | } |
37 | 37 | ||
38 | fn alloc(&mut self, relative_range: TextRange) -> tt::TokenId { | 38 | fn alloc(&mut self, relative_range: TextRange) -> tt::TokenId { |
39 | let id = self.toknes.len(); | 39 | let id = self.tokens.len(); |
40 | self.toknes.push(relative_range); | 40 | self.tokens.push(relative_range); |
41 | tt::TokenId(id as u32) | 41 | tt::TokenId(id as u32) |
42 | } | 42 | } |
43 | } | 43 | } |