aboutsummaryrefslogtreecommitdiff
path: root/crates/ra_cli/src/load_cargo.rs
diff options
context:
space:
mode:
authorbors[bot] <26634292+bors[bot]@users.noreply.github.com>2020-02-17 17:19:55 +0000
committerGitHub <[email protected]>2020-02-17 17:19:55 +0000
commit64755b5e1f68290a2518b0bbc2f0007f95cd2632 (patch)
tree8bb0a64574c42deb666494e7f1c158b9cae9e8b3 /crates/ra_cli/src/load_cargo.rs
parent0abb7c27acfe3d8491736e09f5e48c6f755c772a (diff)
parent2d1b3da5fb69d932c65884a361ec10d81e8a51d8 (diff)
Merge #3199
3199: Use anyhow r=matklad a=matklad Co-authored-by: Aleksey Kladov <[email protected]>
Diffstat (limited to 'crates/ra_cli/src/load_cargo.rs')
-rw-r--r--crates/ra_cli/src/load_cargo.rs7
1 files changed, 3 insertions, 4 deletions
diff --git a/crates/ra_cli/src/load_cargo.rs b/crates/ra_cli/src/load_cargo.rs
index 2d6433f18..b9a4e6aba 100644
--- a/crates/ra_cli/src/load_cargo.rs
+++ b/crates/ra_cli/src/load_cargo.rs
@@ -1,8 +1,6 @@
1//! FIXME: write short doc here 1//! FIXME: write short doc here
2 2
3use std::{collections::HashSet, error::Error, path::Path}; 3use std::{collections::HashSet, path::Path};
4
5use rustc_hash::FxHashMap;
6 4
7use crossbeam_channel::{unbounded, Receiver}; 5use crossbeam_channel::{unbounded, Receiver};
8use ra_db::{CrateGraph, FileId, SourceRootId}; 6use ra_db::{CrateGraph, FileId, SourceRootId};
@@ -10,8 +8,9 @@ use ra_ide::{AnalysisChange, AnalysisHost, FeatureFlags};
10use ra_project_model::{get_rustc_cfg_options, PackageRoot, ProjectWorkspace}; 8use ra_project_model::{get_rustc_cfg_options, PackageRoot, ProjectWorkspace};
11use ra_vfs::{RootEntry, Vfs, VfsChange, VfsTask, Watch}; 9use ra_vfs::{RootEntry, Vfs, VfsChange, VfsTask, Watch};
12use ra_vfs_glob::RustPackageFilterBuilder; 10use ra_vfs_glob::RustPackageFilterBuilder;
11use rustc_hash::FxHashMap;
13 12
14type Result<T> = std::result::Result<T, Box<dyn Error + Send + Sync>>; 13use anyhow::Result;
15 14
16fn vfs_file_to_id(f: ra_vfs::VfsFile) -> FileId { 15fn vfs_file_to_id(f: ra_vfs::VfsFile) -> FileId {
17 FileId(f.0) 16 FileId(f.0)