From 6be50f7d5de3737464853a589673375fc0cafa97 Mon Sep 17 00:00:00 2001 From: Aleksey Kladov Date: Wed, 31 Oct 2018 23:41:43 +0300 Subject: Reformat all --- crates/ra_syntax/src/algo/mod.rs | 5 +---- crates/ra_syntax/src/ast/mod.rs | 16 +++++++++++----- crates/ra_syntax/src/lib.rs | 4 +++- crates/ra_syntax/src/utils.rs | 4 +--- 4 files changed, 16 insertions(+), 13 deletions(-) (limited to 'crates/ra_syntax') diff --git a/crates/ra_syntax/src/algo/mod.rs b/crates/ra_syntax/src/algo/mod.rs index f92529d3e..faf5a6211 100644 --- a/crates/ra_syntax/src/algo/mod.rs +++ b/crates/ra_syntax/src/algo/mod.rs @@ -1,10 +1,7 @@ pub mod visit; // pub mod walk; -use crate::{ - text_utils::{contains_offset_nonstrict}, - SyntaxNodeRef, TextRange, TextUnit, -}; +use crate::{text_utils::contains_offset_nonstrict, SyntaxNodeRef, TextRange, TextUnit}; pub fn find_leaf_at_offset(node: SyntaxNodeRef, offset: TextUnit) -> LeafAtOffset { let range = node.range(); diff --git a/crates/ra_syntax/src/ast/mod.rs b/crates/ra_syntax/src/ast/mod.rs index 3aa11b9dd..688ffff47 100644 --- a/crates/ra_syntax/src/ast/mod.rs +++ b/crates/ra_syntax/src/ast/mod.rs @@ -66,7 +66,9 @@ pub trait AttrsOwner<'a>: AstNode<'a> { } pub trait DocCommentsOwner<'a>: AstNode<'a> { - fn doc_comments(self) -> AstChildren<'a, Comment<'a>> { children(self) } + fn doc_comments(self) -> AstChildren<'a, Comment<'a>> { + children(self) + } /// Returns the textual content of a doc comment block as a single string. /// That is, strips leading `///` and joins lines @@ -74,12 +76,15 @@ pub trait DocCommentsOwner<'a>: AstNode<'a> { self.doc_comments() .map(|comment| { let prefix = comment.prefix(); - let trimmed = comment.text().as_str() + let trimmed = comment + .text() + .as_str() .trim() .trim_start_matches(prefix) .trim_start(); trimmed.to_owned() - }).join("\n") + }) + .join("\n") } } @@ -250,7 +255,6 @@ impl<'a> IfExpr<'a> { } } - #[derive(Debug, Clone, Copy)] pub enum PathSegmentKind<'a> { Name(NameRef<'a>), @@ -261,7 +265,9 @@ pub enum PathSegmentKind<'a> { impl<'a> PathSegment<'a> { pub fn parent_path(self) -> Path<'a> { - self.syntax().parent().and_then(Path::cast) + self.syntax() + .parent() + .and_then(Path::cast) .expect("segments are always nested in paths") } diff --git a/crates/ra_syntax/src/lib.rs b/crates/ra_syntax/src/lib.rs index 3698eccd7..79394fd53 100644 --- a/crates/ra_syntax/src/lib.rs +++ b/crates/ra_syntax/src/lib.rs @@ -52,7 +52,9 @@ pub use crate::{ reparsing::AtomEdit, rowan::{SmolStr, TextRange, TextUnit}, syntax_kinds::SyntaxKind, - yellow::{Direction, OwnedRoot, RefRoot, SyntaxError, SyntaxNode, SyntaxNodeRef, TreeRoot, WalkEvent}, + yellow::{ + Direction, OwnedRoot, RefRoot, SyntaxError, SyntaxNode, SyntaxNodeRef, TreeRoot, WalkEvent, + }, }; use crate::yellow::GreenNode; diff --git a/crates/ra_syntax/src/utils.rs b/crates/ra_syntax/src/utils.rs index 8ee02724d..00f00139a 100644 --- a/crates/ra_syntax/src/utils.rs +++ b/crates/ra_syntax/src/utils.rs @@ -1,6 +1,4 @@ -use crate::{ - File, SyntaxKind, SyntaxNodeRef, WalkEvent -}; +use crate::{File, SyntaxKind, SyntaxNodeRef, WalkEvent}; use std::fmt::Write; /// Parse a file and create a string representation of the resulting parse tree. -- cgit v1.2.3