aboutsummaryrefslogtreecommitdiff
path: root/crates/ra_lsp_server/src/main.rs
diff options
context:
space:
mode:
authorbors[bot] <bors[bot]@users.noreply.github.com>2018-10-16 14:44:24 +0100
committerbors[bot] <bors[bot]@users.noreply.github.com>2018-10-16 14:44:24 +0100
commit1216878f7be20dd0e652fb8cdc395009fdcfae07 (patch)
tree6551967cc8c6e921b66071453ad7888a9121d326 /crates/ra_lsp_server/src/main.rs
parent39cb6c6d3f78b193f5873c3492e530bbd24d5dd2 (diff)
parent61f3a438d3a729a6be941bca1ff4c6a97a33f221 (diff)
Merge #134
134: Cargo Format run r=kjeremy a=kjeremy I'm not sure how appreciated this is but I figured I would run `cargo fmt` and see what came up. I made sure that `cargo test` still passes. Co-authored-by: Jeremy A. Kolb <[email protected]>
Diffstat (limited to 'crates/ra_lsp_server/src/main.rs')
-rw-r--r--crates/ra_lsp_server/src/main.rs6
1 files changed, 3 insertions, 3 deletions
diff --git a/crates/ra_lsp_server/src/main.rs b/crates/ra_lsp_server/src/main.rs
index e5d1792b7..9f62347f1 100644
--- a/crates/ra_lsp_server/src/main.rs
+++ b/crates/ra_lsp_server/src/main.rs
@@ -6,7 +6,7 @@ extern crate flexi_logger;
6extern crate gen_lsp_server; 6extern crate gen_lsp_server;
7extern crate ra_lsp_server; 7extern crate ra_lsp_server;
8 8
9use flexi_logger::{Logger, Duplicate}; 9use flexi_logger::{Duplicate, Logger};
10use gen_lsp_server::{run_server, stdio_transport}; 10use gen_lsp_server::{run_server, stdio_transport};
11use ra_lsp_server::Result; 11use ra_lsp_server::Result;
12 12
@@ -38,7 +38,8 @@ fn main_inner() -> Result<()> {
38 receiver, 38 receiver,
39 sender, 39 sender,
40 |params, r, s| { 40 |params, r, s| {
41 let root = params.root_uri 41 let root = params
42 .root_uri
42 .and_then(|it| it.to_file_path().ok()) 43 .and_then(|it| it.to_file_path().ok())
43 .unwrap_or(cwd); 44 .unwrap_or(cwd);
44 ra_lsp_server::main_loop(false, root, r, s) 45 ra_lsp_server::main_loop(false, root, r, s)
@@ -49,4 +50,3 @@ fn main_inner() -> Result<()> {
49 info!("... IO is down"); 50 info!("... IO is down");
50 Ok(()) 51 Ok(())
51} 52}
52