Mirrors/rust-analyzer
2
0
Fork 0
mirror of https://github.com/rust-lang/rust-analyzer synced 2025-01-15 14:43:58 +00:00
Code Issues Projects Releases Packages Wiki Activity

Merge #1781

Browse source 
1781: don't deadlock on shutdown r=matklad a=matklad



Co-authored-by: Aleksey Kladov <aleksey.kladov@gmail.com>
This commit is contained in:
bors[bot] 2019-09-06 17:59:52 +00:00 committed by GitHub
commit 3bd99af197
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
3 changed files with 4 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
crates/ra_lsp_server/src/main.rs
View file

@ -66,7 +66,7 @@ fn run_server() -> Result<()> {
workspace_roots,
initialize_params.capabilities,
server_config,
&connection,
connection,
)?;
log::info!("shutting down IO...");

4
crates/ra_lsp_server/src/main_loop.rs
View file

@ -52,7 +52,7 @@ pub fn main_loop(
ws_roots: Vec<PathBuf>,
client_caps: ClientCapabilities,
config: ServerConfig,
connection: &Connection,
connection: Connection,
) -> Result<()> {
log::info!("server_config: {:#?}", config);
@ -174,7 +174,7 @@ pub fn main_loop(
&pool,
&task_sender,
&libdata_sender,
connection,
&connection,
&mut world_state,
&mut loop_state,
event,

2
crates/ra_lsp_server/tests/heavy_tests/support.rs
View file

@ -118,7 +118,7 @@ impl Server {
experimental: None,
},
ServerConfig { with_sysroot, ..ServerConfig::default() },
&connection,
connection,
)
.unwrap()
})