diff options
author | bors[bot] <26634292+bors[bot]@users.noreply.github.com> | 2019-07-04 21:09:32 +0100 |
---|---|---|
committer | bors[bot] <26634292+bors[bot]@users.noreply.github.com> | 2019-07-04 21:09:32 +0100 |
commit | cacdb0eab8131bfb945eb7ed0150c92ec56eefe2 (patch) | |
tree | f762de90ce813591bc640ae0bce36493a3dcafa9 /crates/ra_batch/src/lib.rs | |
parent | 4e8664d9d37021e85d72b6228fa45e7edf4a1a74 (diff) | |
parent | 1834bae5b86c54ed9dece26e82436919d59e6cb7 (diff) |
Merge #1486
1486: allow rustfmt to reorder imports r=matklad a=matklad
Co-authored-by: Aleksey Kladov <[email protected]>
Diffstat (limited to 'crates/ra_batch/src/lib.rs')
-rw-r--r-- | crates/ra_batch/src/lib.rs | 12 |
1 files changed, 5 insertions, 7 deletions
diff --git a/crates/ra_batch/src/lib.rs b/crates/ra_batch/src/lib.rs index 43d3fb7e3..c25737aaa 100644 --- a/crates/ra_batch/src/lib.rs +++ b/crates/ra_batch/src/lib.rs | |||
@@ -1,14 +1,12 @@ | |||
1 | mod vfs_filter; | 1 | mod vfs_filter; |
2 | 2 | ||
3 | use std::{path::Path, collections::HashSet, error::Error}; | 3 | use std::{collections::HashSet, error::Error, path::Path}; |
4 | 4 | ||
5 | use rustc_hash::FxHashMap; | 5 | use rustc_hash::FxHashMap; |
6 | 6 | ||
7 | use ra_db::{ | 7 | use ra_db::{CrateGraph, FileId, SourceRootId}; |
8 | CrateGraph, FileId, SourceRootId, | 8 | use ra_ide_api::{AnalysisChange, AnalysisHost}; |
9 | }; | 9 | use ra_project_model::{ProjectRoot, ProjectWorkspace}; |
10 | use ra_ide_api::{AnalysisHost, AnalysisChange}; | ||
11 | use ra_project_model::{ProjectWorkspace, ProjectRoot}; | ||
12 | use ra_vfs::{Vfs, VfsChange}; | 10 | use ra_vfs::{Vfs, VfsChange}; |
13 | use vfs_filter::IncludeRustFiles; | 11 | use vfs_filter::IncludeRustFiles; |
14 | 12 | ||
@@ -106,8 +104,8 @@ pub fn load( | |||
106 | 104 | ||
107 | #[cfg(test)] | 105 | #[cfg(test)] |
108 | mod tests { | 106 | mod tests { |
109 | use ra_hir::Crate; | ||
110 | use super::*; | 107 | use super::*; |
108 | use ra_hir::Crate; | ||
111 | 109 | ||
112 | #[test] | 110 | #[test] |
113 | fn test_loading_rust_analyzer() { | 111 | fn test_loading_rust_analyzer() { |