aboutsummaryrefslogtreecommitdiff
path: root/crates/ra_project_model/src/lib.rs
diff options
context:
space:
mode:
Diffstat (limited to 'crates/ra_project_model/src/lib.rs')
-rw-r--r--crates/ra_project_model/src/lib.rs6
1 files changed, 3 insertions, 3 deletions
diff --git a/crates/ra_project_model/src/lib.rs b/crates/ra_project_model/src/lib.rs
index 4ae7f685c..a3af153f1 100644
--- a/crates/ra_project_model/src/lib.rs
+++ b/crates/ra_project_model/src/lib.rs
@@ -6,9 +6,9 @@ use std::{
6 fs::File, 6 fs::File,
7 io::BufReader, 7 io::BufReader,
8 path::{Path, PathBuf}, 8 path::{Path, PathBuf},
9 error::Error
9}; 10};
10 11
11use failure::bail;
12use rustc_hash::FxHashMap; 12use rustc_hash::FxHashMap;
13 13
14use ra_db::{CrateGraph, FileId, Edition}; 14use ra_db::{CrateGraph, FileId, Edition};
@@ -24,7 +24,7 @@ pub use crate::{
24}; 24};
25 25
26// FIXME use proper error enum 26// FIXME use proper error enum
27pub type Result<T> = ::std::result::Result<T, ::failure::Error>; 27pub type Result<T> = ::std::result::Result<T, Box<dyn Error + Send + Sync>>;
28 28
29#[derive(Debug, Clone)] 29#[derive(Debug, Clone)]
30pub enum ProjectWorkspace { 30pub enum ProjectWorkspace {
@@ -298,5 +298,5 @@ fn find_cargo_toml(path: &Path) -> Result<PathBuf> {
298 } 298 }
299 curr = path.parent(); 299 curr = path.parent();
300 } 300 }
301 bail!("can't find Cargo.toml at {}", path.display()) 301 Err(format!("can't find Cargo.toml at {}", path.display()))?
302} 302}