language-servers/rust-analyzer
1
0
Fork 0
mirror of https://github.com/rust-lang/rust-analyzer.git synced 2025-10-03 15:15:24 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions 3

more idiomatic code

Browse source
This commit is contained in:
gfreezy 2019-01-18 16:32:36 +08:00 • committed by Aleksey Kladov
parent 360167db16
commit 99e8499957
1 changed files with 6 additions and 5 deletions
Download patch file Download diff file Expand all files Collapse all files

11
crates/ra_lsp_server/src/main_loop/handlers.rs
View file

@ -465,14 +465,15 @@ pub fn handle_rename(world: ServerWorld, params: RenameParams) -> Result<Option<
.into()); .into());
} }
let change = world let optional_change = world
.analysis() .analysis()
.rename(FilePosition { file_id, offset }, &*params.new_name)?; .rename(FilePosition { file_id, offset }, &*params.new_name)?;
if change.is_none() { let change = match optional_change {
return Ok(None); None => return Ok(None),
} Some(it) => it,
};
let source_change_req = change.unwrap().try_conv_with(&world)?; let source_change_req = change.try_conv_with(&world)?;
Ok(Some(source_change_req.workspace_edit)) Ok(Some(source_change_req.workspace_edit))
} }