aboutsummaryrefslogtreecommitdiff
path: root/crates/ra_lsp_server/src/cli
diff options
context:
space:
mode:
authorAleksey Kladov <[email protected]>2020-02-17 18:07:30 +0000
committerAleksey Kladov <[email protected]>2020-02-17 18:07:30 +0000
commit2c9b91ad326c387190bedab9dae9d08d3eb0705a (patch)
tree33542cd2b44bd5290f18baebee460b487008035a /crates/ra_lsp_server/src/cli
parent659b0e73cfd9ef7755d032f90622a08576f1d86d (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.rs3
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};
7use ra_ide::{AnalysisChange, AnalysisHost, FeatureFlags}; 7use ra_ide::{AnalysisChange, AnalysisHost, FeatureFlags};
8use ra_project_model::{get_rustc_cfg_options, PackageRoot, ProjectWorkspace}; 8use ra_project_model::{get_rustc_cfg_options, PackageRoot, ProjectWorkspace};
9use ra_vfs::{RootEntry, Vfs, VfsChange, VfsTask, Watch}; 9use ra_vfs::{RootEntry, Vfs, VfsChange, VfsTask, Watch};
10use ra_vfs_glob::RustPackageFilterBuilder;
11use rustc_hash::FxHashMap; 10use rustc_hash::FxHashMap;
12 11
12use crate::vfs_glob::RustPackageFilterBuilder;
13
13use anyhow::Result; 14use anyhow::Result;
14 15
15fn vfs_file_to_id(f: ra_vfs::VfsFile) -> FileId { 16fn vfs_file_to_id(f: ra_vfs::VfsFile) -> FileId {