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_analysis/src/lib.rs | 47 ++++++++++++++++++++++++------------------- 1 file changed, 26 insertions(+), 21 deletions(-) (limited to 'crates/ra_analysis/src/lib.rs') diff --git a/crates/ra_analysis/src/lib.rs b/crates/ra_analysis/src/lib.rs index e75411ec9..32aa7a1fd 100644 --- a/crates/ra_analysis/src/lib.rs +++ b/crates/ra_analysis/src/lib.rs @@ -6,23 +6,20 @@ extern crate relative_path; extern crate rustc_hash; extern crate salsa; -mod input; +mod completion; mod db; mod descriptors; mod imp; +mod input; +pub mod mock_analysis; mod symbol_index; -mod completion; mod syntax_ptr; -pub mod mock_analysis; -use std::{ - fmt, - sync::Arc, -}; +use std::{fmt, sync::Arc}; use ra_syntax::{AtomEdit, File, TextRange, TextUnit}; -use relative_path::RelativePathBuf; use rayon::prelude::*; +use relative_path::RelativePathBuf; use crate::{ imp::{AnalysisHostImpl, AnalysisImpl, FileResolverImp}, @@ -30,13 +27,12 @@ use crate::{ }; pub use crate::{ - descriptors::function::FnDescriptor, completion::CompletionItem, - input::{FileId, FileResolver, CrateGraph, CrateId}, + descriptors::function::FnDescriptor, + input::{CrateGraph, CrateId, FileId, FileResolver}, }; pub use ra_editor::{ - FileSymbol, Fold, FoldKind, HighlightedRange, LineIndex, Runnable, - RunnableKind, StructureNode, + FileSymbol, Fold, FoldKind, HighlightedRange, LineIndex, Runnable, RunnableKind, StructureNode, }; #[derive(Clone, Copy, Debug, PartialEq, Eq, Hash, PartialOrd, Ord)] @@ -50,8 +46,7 @@ impl std::fmt::Display for Canceled { } } -impl std::error::Error for Canceled { -} +impl std::error::Error for Canceled {} #[derive(Default)] pub struct AnalysisChange { @@ -76,7 +71,6 @@ impl fmt::Debug for AnalysisChange { } } - impl AnalysisChange { pub fn new() -> AnalysisChange { AnalysisChange::default() @@ -251,12 +245,15 @@ impl Analysis { pub fn approximately_resolve_symbol( &self, file_id: FileId, - offset: TextUnit + offset: TextUnit, ) -> Cancelable> { - self.imp - .approximately_resolve_symbol(file_id, offset) + self.imp.approximately_resolve_symbol(file_id, offset) } - pub fn find_all_refs(&self, file_id: FileId, offset: TextUnit, ) -> Cancelable> { + pub fn find_all_refs( + &self, + file_id: FileId, + offset: TextUnit, + ) -> Cancelable> { Ok(self.imp.find_all_refs(file_id, offset)) } pub fn parent_module(&self, file_id: FileId) -> Cancelable> { @@ -276,7 +273,11 @@ impl Analysis { let file = self.imp.file_syntax(file_id); Ok(ra_editor::highlight(&file)) } - pub fn completions(&self, file_id: FileId, offset: TextUnit) -> Cancelable>> { + pub fn completions( + &self, + file_id: FileId, + offset: TextUnit, + ) -> Cancelable>> { self.imp.completions(file_id, offset) } pub fn assists(&self, file_id: FileId, range: TextRange) -> Cancelable> { @@ -307,7 +308,11 @@ impl LibraryData { let file = File::parse(text); (*file_id, file) })); - LibraryData { files, file_resolver: FileResolverImp::new(file_resolver), symbol_index } + LibraryData { + files, + file_resolver: FileResolverImp::new(file_resolver), + symbol_index, + } } } -- cgit v1.2.3