aboutsummaryrefslogtreecommitdiff
path: root/crates/ra_analysis/src
diff options
context:
space:
mode:
authorAleksey Kladov <[email protected]>2018-10-20 20:38:47 +0100
committerAleksey Kladov <[email protected]>2018-10-20 20:38:52 +0100
commit6e88aaef5d49c8ec7b6ffe6b41457c3a028b4eb0 (patch)
tree6ae9f95315451a9e722dcffa0c1e1283d276d312 /crates/ra_analysis/src
parent8eea10e3ab25111375a95990b93d1170d5fe8a9f (diff)
use pythonic import order
use std // blank line use extern crates // blank line use crate::{}
Diffstat (limited to 'crates/ra_analysis/src')
-rw-r--r--crates/ra_analysis/src/descriptors.rs5
-rw-r--r--crates/ra_analysis/src/lib.rs3
-rw-r--r--crates/ra_analysis/src/symbol_index.rs11
3 files changed, 11 insertions, 8 deletions
diff --git a/crates/ra_analysis/src/descriptors.rs b/crates/ra_analysis/src/descriptors.rs
index 6f26f9935..310bf1585 100644
--- a/crates/ra_analysis/src/descriptors.rs
+++ b/crates/ra_analysis/src/descriptors.rs
@@ -1,4 +1,5 @@
1use crate::{imp::FileResolverImp, FileId}; 1use std::collections::BTreeMap;
2
2use ra_syntax::{ 3use ra_syntax::{
3 ast::{self, AstNode, NameOwner}, 4 ast::{self, AstNode, NameOwner},
4 text_utils::is_subrange, 5 text_utils::is_subrange,
@@ -6,7 +7,7 @@ use ra_syntax::{
6}; 7};
7use relative_path::RelativePathBuf; 8use relative_path::RelativePathBuf;
8 9
9use std::collections::BTreeMap; 10use crate::{imp::FileResolverImp, FileId};
10 11
11#[derive(Debug, PartialEq, Eq, Hash)] 12#[derive(Debug, PartialEq, Eq, Hash)]
12pub struct ModuleDescriptor { 13pub struct ModuleDescriptor {
diff --git a/crates/ra_analysis/src/lib.rs b/crates/ra_analysis/src/lib.rs
index 03708d450..750031093 100644
--- a/crates/ra_analysis/src/lib.rs
+++ b/crates/ra_analysis/src/lib.rs
@@ -23,11 +23,12 @@ mod symbol_index;
23 23
24use std::{fmt::Debug, sync::Arc}; 24use std::{fmt::Debug, sync::Arc};
25 25
26use crate::imp::{AnalysisHostImpl, AnalysisImpl, FileResolverImp};
27use ra_syntax::{AtomEdit, File, TextRange, TextUnit}; 26use ra_syntax::{AtomEdit, File, TextRange, TextUnit};
28use relative_path::{RelativePath, RelativePathBuf}; 27use relative_path::{RelativePath, RelativePathBuf};
29use rustc_hash::FxHashMap; 28use rustc_hash::FxHashMap;
30 29
30use crate::imp::{AnalysisHostImpl, AnalysisImpl, FileResolverImp};
31
31pub use crate::{ 32pub use crate::{
32 descriptors::FnDescriptor, 33 descriptors::FnDescriptor,
33 job::{JobHandle, JobToken}, 34 job::{JobHandle, JobToken},
diff --git a/crates/ra_analysis/src/symbol_index.rs b/crates/ra_analysis/src/symbol_index.rs
index 19f9ea47d..a0f3c0437 100644
--- a/crates/ra_analysis/src/symbol_index.rs
+++ b/crates/ra_analysis/src/symbol_index.rs
@@ -1,4 +1,8 @@
1use crate::{FileId, Query}; 1use std::{
2 hash::{Hash, Hasher},
3 sync::Arc,
4};
5
2use fst::{self, Streamer}; 6use fst::{self, Streamer};
3use ra_editor::{file_symbols, FileSymbol}; 7use ra_editor::{file_symbols, FileSymbol};
4use ra_syntax::{ 8use ra_syntax::{
@@ -7,10 +11,7 @@ use ra_syntax::{
7}; 11};
8use rayon::prelude::*; 12use rayon::prelude::*;
9 13
10use std::{ 14use crate::{FileId, Query};
11 hash::{Hash, Hasher},
12 sync::Arc,
13};
14 15
15#[derive(Debug)] 16#[derive(Debug)]
16pub(crate) struct SymbolIndex { 17pub(crate) struct SymbolIndex {