diff options
Diffstat (limited to 'crates')
-rw-r--r-- | crates/ra_lsp_server/Cargo.toml | 4 | ||||
-rw-r--r-- | crates/ra_lsp_server/src/lib.rs | 1 | ||||
-rw-r--r-- | crates/ra_lsp_server/src/project_model.rs | 4 | ||||
-rw-r--r-- | crates/ra_lsp_server/src/thread_worker.rs (renamed from crates/thread_worker/src/lib.rs) | 0 | ||||
-rw-r--r-- | crates/thread_worker/Cargo.toml | 10 |
5 files changed, 3 insertions, 16 deletions
diff --git a/crates/ra_lsp_server/Cargo.toml b/crates/ra_lsp_server/Cargo.toml index 4f834519c..eb4812633 100644 --- a/crates/ra_lsp_server/Cargo.toml +++ b/crates/ra_lsp_server/Cargo.toml | |||
@@ -15,9 +15,8 @@ log = "0.4.3" | |||
15 | lsp-types = { version = "0.60.0", features = ["proposed"] } | 15 | lsp-types = { version = "0.60.0", features = ["proposed"] } |
16 | rustc-hash = "1.0" | 16 | rustc-hash = "1.0" |
17 | parking_lot = "0.9.0" | 17 | parking_lot = "0.9.0" |
18 | 18 | jod-thread = "0.1.0" | |
19 | ra_vfs = "0.3.0" | 19 | ra_vfs = "0.3.0" |
20 | thread_worker = { path = "../thread_worker" } | ||
21 | ra_syntax = { path = "../ra_syntax" } | 20 | ra_syntax = { path = "../ra_syntax" } |
22 | ra_text_edit = { path = "../ra_text_edit" } | 21 | ra_text_edit = { path = "../ra_text_edit" } |
23 | ra_ide_api = { path = "../ra_ide_api" } | 22 | ra_ide_api = { path = "../ra_ide_api" } |
@@ -27,7 +26,6 @@ ra_prof = { path = "../ra_prof" } | |||
27 | ra_vfs_glob = { path = "../ra_vfs_glob" } | 26 | ra_vfs_glob = { path = "../ra_vfs_glob" } |
28 | 27 | ||
29 | [dev-dependencies] | 28 | [dev-dependencies] |
30 | jod-thread = "0.1.0" | ||
31 | tempfile = "3" | 29 | tempfile = "3" |
32 | test_utils = { path = "../test_utils" } | 30 | test_utils = { path = "../test_utils" } |
33 | 31 | ||
diff --git a/crates/ra_lsp_server/src/lib.rs b/crates/ra_lsp_server/src/lib.rs index 2c5d7c72d..69a577b3e 100644 --- a/crates/ra_lsp_server/src/lib.rs +++ b/crates/ra_lsp_server/src/lib.rs | |||
@@ -8,6 +8,7 @@ mod project_model; | |||
8 | pub mod req; | 8 | pub mod req; |
9 | pub mod config; | 9 | pub mod config; |
10 | mod world; | 10 | mod world; |
11 | mod thread_worker; | ||
11 | 12 | ||
12 | pub type Result<T> = std::result::Result<T, Box<dyn std::error::Error + Send + Sync>>; | 13 | pub type Result<T> = std::result::Result<T, Box<dyn std::error::Error + Send + Sync>>; |
13 | pub use crate::{ | 14 | pub use crate::{ |
diff --git a/crates/ra_lsp_server/src/project_model.rs b/crates/ra_lsp_server/src/project_model.rs index ad59cde64..6234563f2 100644 --- a/crates/ra_lsp_server/src/project_model.rs +++ b/crates/ra_lsp_server/src/project_model.rs | |||
@@ -1,8 +1,6 @@ | |||
1 | use std::path::PathBuf; | 1 | use std::path::PathBuf; |
2 | 2 | ||
3 | use thread_worker::Worker; | 3 | use crate::{thread_worker::Worker, Result}; |
4 | |||
5 | use crate::Result; | ||
6 | 4 | ||
7 | pub use ra_project_model::{ | 5 | pub use ra_project_model::{ |
8 | CargoWorkspace, Package, ProjectWorkspace, Sysroot, Target, TargetKind, | 6 | CargoWorkspace, Package, ProjectWorkspace, Sysroot, Target, TargetKind, |
diff --git a/crates/thread_worker/src/lib.rs b/crates/ra_lsp_server/src/thread_worker.rs index 68e5c124d..68e5c124d 100644 --- a/crates/thread_worker/src/lib.rs +++ b/crates/ra_lsp_server/src/thread_worker.rs | |||
diff --git a/crates/thread_worker/Cargo.toml b/crates/thread_worker/Cargo.toml deleted file mode 100644 index e3babbf8d..000000000 --- a/crates/thread_worker/Cargo.toml +++ /dev/null | |||
@@ -1,10 +0,0 @@ | |||
1 | [package] | ||
2 | edition = "2018" | ||
3 | name = "thread_worker" | ||
4 | version = "0.1.0" | ||
5 | authors = ["rust-analyzer developers"] | ||
6 | |||
7 | [dependencies] | ||
8 | jod-thread = "0.1.0" | ||
9 | crossbeam-channel = "0.3.5" | ||
10 | log = "0.4.3" | ||