Mirrors/rust-analyzer
2
0
Fork 0
mirror of https://github.com/rust-lang/rust-analyzer synced 2024-12-27 05:23:24 +00:00
Code Issues Projects Releases Packages Wiki Activity

Merge #7735

Browse source 
7735: Stop mixing Result and Option with ? in inline_local_variable r=Veykril a=scottmcm

Depending on the discussion in https://github.com/rust-lang/rfcs/pull/3058 this might not end up being necessary, but I think it's a reasonable change regardless.

Co-authored-by: Scott McMurray <scottmcm@users.noreply.github.com>
This commit is contained in:
bors[bot] 2021-02-21 00:18:49 +00:00 committed by GitHub
commit 238f3a5173
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
1 changed files with 4 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

8
crates/assists/src/handlers/inline_local_variable.rs
View file

@ -78,10 +78,10 @@ pub(crate) fn inline_local_variable(acc: &mut Assists, ctx: &AssistContext) -> O
usage_node.syntax().parent().and_then(ast::Expr::cast); usage_node.syntax().parent().and_then(ast::Expr::cast);
let usage_parent = match usage_parent_option { let usage_parent = match usage_parent_option {
Some(u) => u, Some(u) => u,
None => return Ok(false), None => return Some(false),
}; };
Ok(!matches!( Some(!matches!(
(&initializer_expr, usage_parent), (&initializer_expr, usage_parent),
(ast::Expr::CallExpr(_), _) (ast::Expr::CallExpr(_), _)
| (ast::Expr::IndexExpr(_), _) | (ast::Expr::IndexExpr(_), _)
@ -107,10 +107,10 @@ pub(crate) fn inline_local_variable(acc: &mut Assists, ctx: &AssistContext) -> O
| (_, ast::Expr::MatchExpr(_)) | (_, ast::Expr::MatchExpr(_))
)) ))
}) })
.collect::<Result<_, _>>() .collect::<Option<_>>()
.map(|b| (file_id, b)) .map(|b| (file_id, b))
}) })
.collect::<Result<FxHashMap<_, Vec<_>>, _>>()?; .collect::<Option<FxHashMap<_, Vec<_>>>>()?;
let init_str = initializer_expr.syntax().text().to_string(); let init_str = initializer_expr.syntax().text().to_string();
let init_in_paren = format!("({})", &init_str); let init_in_paren = format!("({})", &init_str);