From c89abd42621daff2d652566be4e9e4789599268c Mon Sep 17 00:00:00 2001 From: Aleksey Kladov Date: Mon, 2 Sep 2019 18:51:03 +0300 Subject: simplify --- crates/ra_mbe/src/subtree_parser.rs | 40 +++++-------------------------------- 1 file changed, 5 insertions(+), 35 deletions(-) (limited to 'crates/ra_mbe/src/subtree_parser.rs') diff --git a/crates/ra_mbe/src/subtree_parser.rs b/crates/ra_mbe/src/subtree_parser.rs index 5688e7f7f..4440c69ff 100644 --- a/crates/ra_mbe/src/subtree_parser.rs +++ b/crates/ra_mbe/src/subtree_parser.rs @@ -1,6 +1,6 @@ use crate::subtree_source::SubtreeTokenSource; -use ra_parser::{TokenSource, TreeSink}; +use ra_parser::{FragmentKind, TokenSource, TreeSink}; use ra_syntax::SyntaxKind; use tt::buffer::{Cursor, TokenBuffer}; @@ -52,40 +52,10 @@ impl<'a> Parser<'a> { Parser { cur_pos, subtree } } - pub fn parse_path(self) -> Option { - self.parse(ra_parser::parse_path) - } - - pub fn parse_expr(self) -> Option { - self.parse(ra_parser::parse_expr) - } - - pub fn parse_ty(self) -> Option { - self.parse(ra_parser::parse_ty) - } - - pub fn parse_pat(self) -> Option { - self.parse(ra_parser::parse_pat) - } - - pub fn parse_stmt(self) -> Option { - self.parse(|src, sink| ra_parser::parse_stmt(src, sink, false)) - } - - pub fn parse_block(self) -> Option { - self.parse(ra_parser::parse_block) - } - - pub fn parse_meta(self) -> Option { - self.parse(ra_parser::parse_meta) - } - - pub fn parse_item(self) -> Option { - self.parse(ra_parser::parse_item) - } - - pub fn parse_vis(self) -> Option { - self.parse(ra_parser::parse_vis) + pub fn parse_fragment(self, fragment_kind: FragmentKind) -> Option { + self.parse(|token_source, tree_skink| { + ra_parser::parse_fragment(token_source, tree_skink, fragment_kind) + }) } fn parse(self, f: F) -> Option -- cgit v1.2.3