mikros/rust
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Auto merge of #15180 - alibektas:15176, r=Veykril

Browse Source 
Purge of unwraps

Removes unnecessary unwraps that I have overlooked in #15101 ( fixes #15176 )
This commit is contained in:
bors 2023-06-30 14:46:49 +00:00
commit 7a3991a544
1 changed files with 12 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

25
crates/rust-analyzer/src/handlers/request.rs
View File

@ -2039,20 +2039,19 @@ fn to_url(path: VfsPath) -> Option<Url> {
}
fn resource_ops_supported(config: &Config, kind: ResourceOperationKind) -> anyhow::Result<()> {
let ctn = config
.caps()
.workspace
.as_ref()
.unwrap()
.workspace_edit
.as_ref()
.unwrap()
.resource_operations
.as_ref()
.unwrap()
.contains(&kind);
#[rustfmt::skip]
let resops = (|| {
config
.caps()
.workspace
.as_ref()?
.workspace_edit
.as_ref()?
.resource_operations
.as_ref()
})();
if !ctn {
if !matches!(resops, Some(resops) if resops.contains(&kind)) {
return Err(LspError::new(
ErrorCode::RequestFailed as i32,
format!(