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/tree/file_builder.rs | 32 ++++++++++++++++++++------------ 1 file changed, 20 insertions(+), 12 deletions(-) (limited to 'src/tree/file_builder.rs') diff --git a/src/tree/file_builder.rs b/src/tree/file_builder.rs index 35702ddd7..939922cb2 100644 --- a/src/tree/file_builder.rs +++ b/src/tree/file_builder.rs @@ -1,5 +1,5 @@ -use {SyntaxKind, TextUnit, TextRange}; -use super::{NodeData, SyntaxErrorData, NodeIdx, File}; +use {SyntaxKind, TextRange, TextUnit}; +use super::{File, NodeData, NodeIdx, SyntaxErrorData}; pub trait Sink { fn leaf(&mut self, kind: SyntaxKind, len: TextUnit); @@ -8,7 +8,6 @@ pub trait Sink { fn error(&mut self) -> ErrorBuilder; } - pub struct FileBuilder { text: String, nodes: Vec, @@ -48,9 +47,9 @@ impl Sink for FileBuilder { } fn finish_internal(&mut self) { - let (id, _) = self.in_progress.pop().expect( - "trying to complete a node, but there are no in-progress nodes" - ); + let (id, _) = self.in_progress + .pop() + .expect("trying to complete a node, but there are no in-progress nodes"); if !self.in_progress.is_empty() { self.add_len(id); } @@ -76,11 +75,14 @@ impl FileBuilder { assert!( self.in_progress.is_empty(), "some nodes in FileBuilder are unfinished: {:?}", - self.in_progress.iter().map(|&(idx, _)| self.nodes[idx].kind) + self.in_progress + .iter() + .map(|&(idx, _)| self.nodes[idx].kind) .collect::>() ); assert_eq!( - self.pos, (self.text.len() as u32).into(), + self.pos, + (self.text.len() as u32).into(), "nodes in FileBuilder do not cover the whole file" ); File { @@ -100,7 +102,6 @@ impl FileBuilder { child.parent = Some(self.current_id()); let id = self.new_node(child); { - let (parent, sibling) = *self.in_progress.last().unwrap(); let slot = if let Some(idx) = sibling { &mut self.nodes[idx].next_sibling @@ -140,12 +141,15 @@ fn grow(left: &mut TextRange, right: TextRange) { pub struct ErrorBuilder<'f> { message: Option, - builder: &'f mut FileBuilder + builder: &'f mut FileBuilder, } impl<'f> ErrorBuilder<'f> { fn new(builder: &'f mut FileBuilder) -> Self { - ErrorBuilder { message: None, builder } + ErrorBuilder { + message: None, + builder, + } } pub fn message>(mut self, m: M) -> Self { @@ -156,6 +160,10 @@ impl<'f> ErrorBuilder<'f> { pub fn emit(self) { let message = self.message.expect("Error message not set"); let &(node, after_child) = self.builder.in_progress.last().unwrap(); - self.builder.errors.push(SyntaxErrorData { node, message, after_child }) + self.builder.errors.push(SyntaxErrorData { + node, + message, + after_child, + }) } } -- cgit v1.2.3