aboutsummaryrefslogtreecommitdiff
path: root/crates/ra_lsp_server
diff options
context:
space:
mode:
authorbors[bot] <bors[bot]@users.noreply.github.com>2019-05-29 20:18:57 +0100
committerbors[bot] <bors[bot]@users.noreply.github.com>2019-05-29 20:18:57 +0100
commit8c3cd8f121d4306732423d1c8804d54e36bd706a (patch)
treefa887bc9a274813869d41f36cb5e48a4c1bd3ef9 /crates/ra_lsp_server
parent7e9c5e32e5f7819b340fc2adb63b2ffeeb2627cf (diff)
parent9304cb026309d68f2b5a6326e74f836bc79f88f5 (diff)
Merge #1346
1346: bump timeout for CI r=matklad a=matklad Co-authored-by: Aleksey Kladov <[email protected]>
Diffstat (limited to 'crates/ra_lsp_server')
-rw-r--r--crates/ra_lsp_server/src/main_loop/handlers.rs2
-rw-r--r--crates/ra_lsp_server/tests/heavy_tests/support.rs2
2 files changed, 2 insertions, 2 deletions
diff --git a/crates/ra_lsp_server/src/main_loop/handlers.rs b/crates/ra_lsp_server/src/main_loop/handlers.rs
index dc817f2d9..0ebfd641d 100644
--- a/crates/ra_lsp_server/src/main_loop/handlers.rs
+++ b/crates/ra_lsp_server/src/main_loop/handlers.rs
@@ -34,7 +34,7 @@ pub fn handle_analyzer_status(world: ServerWorld, _: ()) -> Result<String> {
34 let requests = world.latest_completed_requests.read(); 34 let requests = world.latest_completed_requests.read();
35 for (idx, r) in requests.iter().enumerate() { 35 for (idx, r) in requests.iter().enumerate() {
36 let current = if idx == world.request_idx { "*" } else { " " }; 36 let current = if idx == world.request_idx { "*" } else { " " };
37 writeln!(buf, "{:4}{}{:<36}: {:?}", r.id, current, r.method, r.duration).unwrap(); 37 writeln!(buf, "{:4}{}{:<36}{}ms", r.id, current, r.method, r.duration.as_millis()).unwrap();
38 } 38 }
39 Ok(buf) 39 Ok(buf)
40} 40}
diff --git a/crates/ra_lsp_server/tests/heavy_tests/support.rs b/crates/ra_lsp_server/tests/heavy_tests/support.rs
index 729067395..f952a03a3 100644
--- a/crates/ra_lsp_server/tests/heavy_tests/support.rs
+++ b/crates/ra_lsp_server/tests/heavy_tests/support.rs
@@ -227,7 +227,7 @@ impl Drop for Server {
227} 227}
228 228
229fn recv_timeout(receiver: &Receiver<RawMessage>) -> Option<RawMessage> { 229fn recv_timeout(receiver: &Receiver<RawMessage>) -> Option<RawMessage> {
230 let timeout = Duration::from_secs(50); 230 let timeout = Duration::from_secs(120);
231 select! { 231 select! {
232 recv(receiver) -> msg => msg.ok(), 232 recv(receiver) -> msg => msg.ok(),
233 recv(after(timeout)) -> _ => panic!("timed out"), 233 recv(after(timeout)) -> _ => panic!("timed out"),