language-servers/rust-analyzer
1
0
Fork 0
mirror of https://github.com/rust-lang/rust-analyzer.git synced 2025-09-29 13:25:09 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions 4

refactor: remove unnecessary stuff

Browse source
This commit is contained in:
Ryo Yoshida 2022-11-26 23:51:57 +09:00
parent d2281f0367
commit 822c61f559
No known key found for this signature in database
GPG key ID: E25698A930586171
1 changed files with 3 additions and 3 deletions
Download patch file Download diff file Expand all files Collapse all files

6
crates/ide-assists/src/handlers/extract_function.rs
View file

@ -265,7 +265,7 @@ enum ParamKind {
MutRef, MutRef,
} }
#[derive(Debug, Eq, PartialEq)] #[derive(Debug)]
enum FunType { enum FunType {
Unit, Unit,
Single(hir::Type), Single(hir::Type),
@ -1368,7 +1368,7 @@ impl FlowHandler {
None => FlowHandler::None, None => FlowHandler::None,
Some(flow_kind) => { Some(flow_kind) => {
let action = flow_kind.clone(); let action = flow_kind.clone();
if *ret_ty == FunType::Unit { if let FunType::Unit = ret_ty {
match flow_kind { match flow_kind {
FlowKind::Return(None) FlowKind::Return(None)
| FlowKind::Break(_, None) | FlowKind::Break(_, None)
@ -1946,7 +1946,7 @@ fn update_external_control_flow(handler: &FlowHandler, syntax: &SyntaxNode) {
if nested_scope.is_none() { if nested_scope.is_none() {
if let Some(expr) = ast::Expr::cast(e.clone()) { if let Some(expr) = ast::Expr::cast(e.clone()) {
match expr { match expr {
ast::Expr::ReturnExpr(return_expr) if nested_scope.is_none() => { ast::Expr::ReturnExpr(return_expr) => {
let expr = return_expr.expr(); let expr = return_expr.expr();
if let Some(replacement) = make_rewritten_flow(handler, expr) { if let Some(replacement) = make_rewritten_flow(handler, expr) {
ted::replace(return_expr.syntax(), replacement.syntax()) ted::replace(return_expr.syntax(), replacement.syntax())