language-servers/rust-analyzer
1
0
Fork 0
mirror of https://github.com/rust-lang/rust-analyzer.git synced 2025-09-27 12:29:21 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions 3

Get rid of failure: ra_lsp_server & ra_project_model

Browse source
This commit is contained in:
Muhammad Mominul Huque 2019-06-15 02:42:56 +06:00
parent a931fb1ef6
commit 9709bd39ca
No known key found for this signature in database
GPG key ID: 37AF141540DE557D
10 changed files with 32 additions and 36 deletions
Download patch file Download diff file Expand all files Collapse all files

6
crates/ra_project_model/src/lib.rs
View file

@ -6,9 +6,9 @@ use std::{
fs::File,
io::BufReader,
path::{Path, PathBuf},
error::Error
};
use failure::bail;
use rustc_hash::FxHashMap;
use ra_db::{CrateGraph, FileId, Edition};
@ -24,7 +24,7 @@ pub use crate::{
};
// FIXME use proper error enum
pub type Result<T> = ::std::result::Result<T, ::failure::Error>;
pub type Result<T> = ::std::result::Result<T, Box<dyn Error + Send + Sync>>;
#[derive(Debug, Clone)]
pub enum ProjectWorkspace {
@ -298,5 +298,5 @@ fn find_cargo_toml(path: &Path) -> Result<PathBuf> {
}
curr = path.parent();
}
bail!("can't find Cargo.toml at {}", path.display())
Err(format!("can't find Cargo.toml at {}", path.display()))?
}