From c47f9e2d37d4797550638e2a7a4fd3538e9edae9 Mon Sep 17 00:00:00 2001 From: Aleksey Kladov Date: Thu, 21 Feb 2019 13:37:32 +0300 Subject: fix compilation --- crates/ra_syntax/src/parsing/builder.rs | 15 ++++++++------- 1 file changed, 8 insertions(+), 7 deletions(-) (limited to 'crates/ra_syntax/src/parsing/builder.rs') diff --git a/crates/ra_syntax/src/parsing/builder.rs b/crates/ra_syntax/src/parsing/builder.rs index 1041c6a7b..0775b0900 100644 --- a/crates/ra_syntax/src/parsing/builder.rs +++ b/crates/ra_syntax/src/parsing/builder.rs @@ -1,7 +1,9 @@ +use ra_parser::{TreeSink, ParseError}; + use crate::{ SmolStr, SyntaxError, SyntaxErrorKind, TextUnit, TextRange, SyntaxKind::{self, *}, - parsing::{TreeSink, ParseError, Token}, + parsing::Token, syntax_node::{GreenNode, RaTypes}, }; @@ -17,8 +19,6 @@ pub(crate) struct TreeBuilder<'a> { } impl<'a> TreeSink for TreeBuilder<'a> { - type Tree = (GreenNode, Vec); - fn leaf(&mut self, kind: SyntaxKind, n_tokens: u8) { self.eat_trivias(); let n_tokens = n_tokens as usize; @@ -65,10 +65,6 @@ impl<'a> TreeSink for TreeBuilder<'a> { let error = SyntaxError::new(SyntaxErrorKind::ParseError(error), self.text_pos); self.errors.push(error) } - - fn finish(self) -> (GreenNode, Vec) { - (self.inner.finish(), self.errors) - } } impl<'a> TreeBuilder<'a> { @@ -82,6 +78,11 @@ impl<'a> TreeBuilder<'a> { inner: GreenNodeBuilder::new(), } } + + pub(super) fn finish(self) -> (GreenNode, Vec) { + (self.inner.finish(), self.errors) + } + fn eat_trivias(&mut self) { while let Some(&token) = self.tokens.get(self.token_pos) { if !token.kind.is_trivia() { -- cgit v1.2.3