diff options
author | Aleksey Kladov <[email protected]> | 2020-02-17 18:07:30 +0000 |
---|---|---|
committer | Aleksey Kladov <[email protected]> | 2020-02-17 18:07:30 +0000 |
commit | 2c9b91ad326c387190bedab9dae9d08d3eb0705a (patch) | |
tree | 33542cd2b44bd5290f18baebee460b487008035a /crates/ra_lsp_server/src/cli | |
parent | 659b0e73cfd9ef7755d032f90622a08576f1d86d (diff) |
Merge ra_vfs_glob and ra_lsp_server
Diffstat (limited to 'crates/ra_lsp_server/src/cli')
-rw-r--r-- | crates/ra_lsp_server/src/cli/load_cargo.rs | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/crates/ra_lsp_server/src/cli/load_cargo.rs b/crates/ra_lsp_server/src/cli/load_cargo.rs index b9a4e6aba..bb3e1513b 100644 --- a/crates/ra_lsp_server/src/cli/load_cargo.rs +++ b/crates/ra_lsp_server/src/cli/load_cargo.rs | |||
@@ -7,9 +7,10 @@ use ra_db::{CrateGraph, FileId, SourceRootId}; | |||
7 | use ra_ide::{AnalysisChange, AnalysisHost, FeatureFlags}; | 7 | use ra_ide::{AnalysisChange, AnalysisHost, FeatureFlags}; |
8 | use ra_project_model::{get_rustc_cfg_options, PackageRoot, ProjectWorkspace}; | 8 | use ra_project_model::{get_rustc_cfg_options, PackageRoot, ProjectWorkspace}; |
9 | use ra_vfs::{RootEntry, Vfs, VfsChange, VfsTask, Watch}; | 9 | use ra_vfs::{RootEntry, Vfs, VfsChange, VfsTask, Watch}; |
10 | use ra_vfs_glob::RustPackageFilterBuilder; | ||
11 | use rustc_hash::FxHashMap; | 10 | use rustc_hash::FxHashMap; |
12 | 11 | ||
12 | use crate::vfs_glob::RustPackageFilterBuilder; | ||
13 | |||
13 | use anyhow::Result; | 14 | use anyhow::Result; |
14 | 15 | ||
15 | fn vfs_file_to_id(f: ra_vfs::VfsFile) -> FileId { | 16 | fn vfs_file_to_id(f: ra_vfs::VfsFile) -> FileId { |