From 4de3c97b2afea55834cd16368f950133459d8c73 Mon Sep 17 00:00:00 2001 From: Christopher Durham Date: Sat, 27 Jan 2018 18:31:23 -0500 Subject: Enforce rustfmt format --- src/parser/mod.rs | 30 ++++++++++++++++-------------- 1 file changed, 16 insertions(+), 14 deletions(-) (limited to 'src/parser/mod.rs') diff --git a/src/parser/mod.rs b/src/parser/mod.rs index 5ec4b8e93..d04ed1e75 100644 --- a/src/parser/mod.rs +++ b/src/parser/mod.rs @@ -1,4 +1,4 @@ -use {Token, File, FileBuilder, Sink, SyntaxKind}; +use {File, FileBuilder, Sink, SyntaxKind, Token}; use syntax_kinds::*; use tree::TOMBSTONE; @@ -6,17 +6,12 @@ use tree::TOMBSTONE; mod event_parser; use self::event_parser::Event; - pub fn parse(text: String, tokens: &[Token]) -> File { let events = event_parser::parse(&text, tokens); from_events_to_file(text, tokens, events) } -fn from_events_to_file( - text: String, - tokens: &[Token], - events: Vec, -) -> File { +fn from_events_to_file(text: String, tokens: &[Token], events: Vec) -> File { let mut builder = FileBuilder::new(text); let mut idx = 0; @@ -26,18 +21,23 @@ fn from_events_to_file( for (i, event) in events.iter().enumerate() { if holes.last() == Some(&i) { holes.pop(); - continue + continue; } match event { - &Event::Start { kind: TOMBSTONE, .. } => (), + &Event::Start { + kind: TOMBSTONE, .. + } => (), &Event::Start { .. } => { forward_parents.clear(); let mut idx = i; loop { let (kind, fwd) = match events[idx] { - Event::Start { kind, forward_parent } => (kind, forward_parent), + Event::Start { + kind, + forward_parent, + } => (kind, forward_parent), _ => unreachable!(), }; forward_parents.push((idx, kind)); @@ -64,8 +64,11 @@ fn from_events_to_file( } } builder.finish_internal() - }, - &Event::Token { kind: _, mut n_raw_tokens } => loop { + } + &Event::Token { + kind: _, + mut n_raw_tokens, + } => loop { let token = tokens[idx]; if !is_insignificant(token.kind) { n_raw_tokens -= 1; @@ -76,8 +79,7 @@ fn from_events_to_file( break; } }, - &Event::Error { ref message } => - builder.error().message(message.clone()).emit(), + &Event::Error { ref message } => builder.error().message(message.clone()).emit(), } } builder.finish() -- cgit v1.2.3