Merge #1486

1486: allow rustfmt to reorder imports r=matklad a=matklad



Co-authored-by: Aleksey Kladov <[email protected]>

2 files changed, 7 insertions, 9 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 @@
 mod vfs_filter;
 
-use std::{path::Path, collections::HashSet, error::Error};
+use std::{collections::HashSet, error::Error, path::Path};
 
 use rustc_hash::FxHashMap;
 
-use ra_db::{
-    CrateGraph, FileId, SourceRootId,
-};
-use ra_ide_api::{AnalysisHost, AnalysisChange};
-use ra_project_model::{ProjectWorkspace, ProjectRoot};
+use ra_db::{CrateGraph, FileId, SourceRootId};
+use ra_ide_api::{AnalysisChange, AnalysisHost};
+use ra_project_model::{ProjectRoot, ProjectWorkspace};
 use ra_vfs::{Vfs, VfsChange};
 use vfs_filter::IncludeRustFiles;
 
@@ -106,8 +104,8 @@ pub fn load(
 
 #[cfg(test)]
 mod tests {
-    use ra_hir::Crate;
     use super::*;
+    use ra_hir::Crate;
 
     #[test]
     fn test_loading_rust_analyzer() {
diff --git a/crates/ra_batch/src/vfs_filter.rs b/crates/ra_batch/src/vfs_filter.rs
index 8552ac999..2f0d8cb8b 100644
--- a/crates/ra_batch/src/vfs_filter.rs
+++ b/crates/ra_batch/src/vfs_filter.rs
@@ -1,6 +1,6 @@
-use std::path::PathBuf;
 use ra_project_model::ProjectRoot;
-use ra_vfs::{RootEntry, Filter, RelativePath};
+use ra_vfs::{Filter, RelativePath, RootEntry};
+use std::path::PathBuf;
 
 /// `IncludeRustFiles` is used to convert
 /// from `ProjectRoot` to `RootEntry` for VFS