diff options
author | Edwin Cheng <[email protected]> | 2019-04-07 17:12:07 +0100 |
---|---|---|
committer | Edwin Cheng <[email protected]> | 2019-04-07 17:12:07 +0100 |
commit | a7254201df07fb929ca689857d7472564d484c3e (patch) | |
tree | bb32649bf733ed892971ff5ada4fabbe58acc77c /crates/ra_mbe/src/syntax_bridge.rs | |
parent | 7f1e93a3c934342a9b9c418865ff395b8ad245ce (diff) |
Combine all tokensource to one and refactoring
Diffstat (limited to 'crates/ra_mbe/src/syntax_bridge.rs')
-rw-r--r-- | crates/ra_mbe/src/syntax_bridge.rs | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/crates/ra_mbe/src/syntax_bridge.rs b/crates/ra_mbe/src/syntax_bridge.rs index 102bba341..b0fb91a63 100644 --- a/crates/ra_mbe/src/syntax_bridge.rs +++ b/crates/ra_mbe/src/syntax_bridge.rs | |||
@@ -4,7 +4,7 @@ use ra_syntax::{ | |||
4 | ast, SyntaxKind::*, TextUnit | 4 | ast, SyntaxKind::*, TextUnit |
5 | }; | 5 | }; |
6 | 6 | ||
7 | use crate::subtree_source::{SubtreeTokenSource, SubtreeSourceQuerier}; | 7 | use crate::subtree_source::{SubtreeTokenSource, Querier}; |
8 | 8 | ||
9 | /// Maps `tt::TokenId` to the relative range of the original token. | 9 | /// Maps `tt::TokenId` to the relative range of the original token. |
10 | #[derive(Default)] | 10 | #[derive(Default)] |
@@ -107,14 +107,14 @@ fn convert_tt( | |||
107 | 107 | ||
108 | struct TtTreeSink<'a> { | 108 | struct TtTreeSink<'a> { |
109 | buf: String, | 109 | buf: String, |
110 | src_querier: SubtreeSourceQuerier<'a>, | 110 | src_querier: Querier<'a>, |
111 | text_pos: TextUnit, | 111 | text_pos: TextUnit, |
112 | token_pos: usize, | 112 | token_pos: usize, |
113 | inner: SyntaxTreeBuilder, | 113 | inner: SyntaxTreeBuilder, |
114 | } | 114 | } |
115 | 115 | ||
116 | impl<'a> TtTreeSink<'a> { | 116 | impl<'a> TtTreeSink<'a> { |
117 | fn new(src_querier: SubtreeSourceQuerier<'a>) -> TtTreeSink { | 117 | fn new(src_querier: Querier<'a>) -> TtTreeSink { |
118 | TtTreeSink { | 118 | TtTreeSink { |
119 | buf: String::new(), | 119 | buf: String::new(), |
120 | src_querier, | 120 | src_querier, |