diff options
author | bors[bot] <bors[bot]@users.noreply.github.com> | 2018-12-06 18:17:09 +0000 |
---|---|---|
committer | bors[bot] <bors[bot]@users.noreply.github.com> | 2018-12-06 18:17:09 +0000 |
commit | 8e60e751cbcfa47c7bed788dfe2ab5cebfcb78b3 (patch) | |
tree | 58f01a945f7c27d6baaecf38e84617ca46782073 /crates/ra_lsp_server/src/project_model.rs | |
parent | 5ad84f0ca5fe9bb250cd4026e5dcb5478d932666 (diff) | |
parent | 28ddecf6c99ef23bc96b9eb7bc8ee049f1732e76 (diff) |
Merge #260
260: Modernize r=matklad a=matklad
Co-authored-by: Aleksey Kladov <[email protected]>
Diffstat (limited to 'crates/ra_lsp_server/src/project_model.rs')
-rw-r--r-- | crates/ra_lsp_server/src/project_model.rs | 4 |
1 files changed, 3 insertions, 1 deletions
diff --git a/crates/ra_lsp_server/src/project_model.rs b/crates/ra_lsp_server/src/project_model.rs index cabb336a3..3305d468a 100644 --- a/crates/ra_lsp_server/src/project_model.rs +++ b/crates/ra_lsp_server/src/project_model.rs | |||
@@ -1,12 +1,14 @@ | |||
1 | use std::path::{Path, PathBuf}; | 1 | use std::path::{Path, PathBuf}; |
2 | 2 | ||
3 | use serde_derive::Serialize; | ||
3 | use cargo_metadata::{metadata_run, CargoOpt}; | 4 | use cargo_metadata::{metadata_run, CargoOpt}; |
4 | use ra_syntax::SmolStr; | 5 | use ra_syntax::SmolStr; |
5 | use rustc_hash::{FxHashMap, FxHashSet}; | 6 | use rustc_hash::{FxHashMap, FxHashSet}; |
7 | use failure::{format_err, bail}; | ||
6 | 8 | ||
7 | use crate::{ | 9 | use crate::{ |
8 | thread_watcher::{ThreadWatcher, Worker}, | ||
9 | Result, | 10 | Result, |
11 | thread_watcher::{ThreadWatcher, Worker}, | ||
10 | }; | 12 | }; |
11 | 13 | ||
12 | #[derive(Debug, Clone)] | 14 | #[derive(Debug, Clone)] |