diff options
author | bors[bot] <26634292+bors[bot]@users.noreply.github.com> | 2019-07-04 21:09:32 +0100 |
---|---|---|
committer | bors[bot] <26634292+bors[bot]@users.noreply.github.com> | 2019-07-04 21:09:32 +0100 |
commit | cacdb0eab8131bfb945eb7ed0150c92ec56eefe2 (patch) | |
tree | f762de90ce813591bc640ae0bce36493a3dcafa9 /crates/ra_lsp_server/src/world.rs | |
parent | 4e8664d9d37021e85d72b6228fa45e7edf4a1a74 (diff) | |
parent | 1834bae5b86c54ed9dece26e82436919d59e6cb7 (diff) |
Merge #1486
1486: allow rustfmt to reorder imports r=matklad a=matklad
Co-authored-by: Aleksey Kladov <[email protected]>
Diffstat (limited to 'crates/ra_lsp_server/src/world.rs')
-rw-r--r-- | crates/ra_lsp_server/src/world.rs | 10 |
1 files changed, 4 insertions, 6 deletions
diff --git a/crates/ra_lsp_server/src/world.rs b/crates/ra_lsp_server/src/world.rs index 7822e1c1c..fdc577622 100644 --- a/crates/ra_lsp_server/src/world.rs +++ b/crates/ra_lsp_server/src/world.rs | |||
@@ -3,22 +3,20 @@ use std::{ | |||
3 | sync::Arc, | 3 | sync::Arc, |
4 | }; | 4 | }; |
5 | 5 | ||
6 | use gen_lsp_server::ErrorCode; | ||
6 | use lsp_types::Url; | 7 | use lsp_types::Url; |
8 | use parking_lot::RwLock; | ||
7 | use ra_ide_api::{ | 9 | use ra_ide_api::{ |
8 | Analysis, AnalysisChange, AnalysisHost, CrateGraph, FileId, LibraryData, | 10 | Analysis, AnalysisChange, AnalysisHost, CrateGraph, FileId, LibraryData, SourceRootId, |
9 | SourceRootId | ||
10 | }; | 11 | }; |
11 | use ra_vfs::{Vfs, VfsChange, VfsFile, VfsRoot}; | 12 | use ra_vfs::{Vfs, VfsChange, VfsFile, VfsRoot}; |
12 | use relative_path::RelativePathBuf; | 13 | use relative_path::RelativePathBuf; |
13 | use parking_lot::RwLock; | ||
14 | use gen_lsp_server::ErrorCode; | ||
15 | 14 | ||
16 | use crate::{ | 15 | use crate::{ |
17 | main_loop::pending_requests::{CompletedRequest, LatestRequests}, | 16 | main_loop::pending_requests::{CompletedRequest, LatestRequests}, |
18 | project_model::ProjectWorkspace, | 17 | project_model::ProjectWorkspace, |
19 | vfs_filter::IncludeRustFiles, | 18 | vfs_filter::IncludeRustFiles, |
20 | Result, | 19 | LspError, Result, |
21 | LspError, | ||
22 | }; | 20 | }; |
23 | 21 | ||
24 | /// `WorldState` is the primary mutable state of the language server | 22 | /// `WorldState` is the primary mutable state of the language server |