aboutsummaryrefslogtreecommitdiff
path: root/crates/ra_batch
diff options
context:
space:
mode:
authorAleksey Kladov <[email protected]>2019-07-04 21:05:17 +0100
committerAleksey Kladov <[email protected]>2019-07-04 21:09:09 +0100
commit1834bae5b86c54ed9dece26e82436919d59e6cb7 (patch)
tree92c8b984e874b67fa1831613464bbe356c1af3dd /crates/ra_batch
parent2b2cd829b0f95aef338227deb05ec7503dae9b6c (diff)
allow rustfmt to reorder imports
This wasn't a right decision in the first place, the feature flag was broken in the last rustfmt release, and syntax highlighting of imports is more important anyway
Diffstat (limited to 'crates/ra_batch')
-rw-r--r--crates/ra_batch/src/lib.rs12
-rw-r--r--crates/ra_batch/src/vfs_filter.rs4
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 @@
1mod vfs_filter; 1mod vfs_filter;
2 2
3use std::{path::Path, collections::HashSet, error::Error}; 3use std::{collections::HashSet, error::Error, path::Path};
4 4
5use rustc_hash::FxHashMap; 5use rustc_hash::FxHashMap;
6 6
7use ra_db::{ 7use ra_db::{CrateGraph, FileId, SourceRootId};
8 CrateGraph, FileId, SourceRootId, 8use ra_ide_api::{AnalysisChange, AnalysisHost};
9}; 9use ra_project_model::{ProjectRoot, ProjectWorkspace};
10use ra_ide_api::{AnalysisHost, AnalysisChange};
11use ra_project_model::{ProjectWorkspace, ProjectRoot};
12use ra_vfs::{Vfs, VfsChange}; 10use ra_vfs::{Vfs, VfsChange};
13use vfs_filter::IncludeRustFiles; 11use vfs_filter::IncludeRustFiles;
14 12
@@ -106,8 +104,8 @@ pub fn load(
106 104
107#[cfg(test)] 105#[cfg(test)]
108mod tests { 106mod 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() {
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 @@
1use std::path::PathBuf;
2use ra_project_model::ProjectRoot; 1use ra_project_model::ProjectRoot;
3use ra_vfs::{RootEntry, Filter, RelativePath}; 2use ra_vfs::{Filter, RelativePath, RootEntry};
3use std::path::PathBuf;
4 4
5/// `IncludeRustFiles` is used to convert 5/// `IncludeRustFiles` is used to convert
6/// from `ProjectRoot` to `RootEntry` for VFS 6/// from `ProjectRoot` to `RootEntry` for VFS