rust-lang/rust
1
0
Fork 0
Code Issues Pull Requests Actions 1 Packages Projects Releases Wiki Activity

A tiny bit more consistent API

Browse Source
This commit is contained in:
Aleksey Kladov
2020-02-06 23:59:27 +01:00
parent a4431e8302
commit 56e3fbe588
2 changed files with 2 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
crates/ra_assists/src/assists/early_return.rs
View File

@@ -101,7 +101,7 @@ pub(crate) fn convert_to_guarded_return(ctx: AssistCtx) -> Option<Assist> {
// If. // If.
let early_expression = &(early_expression.syntax().to_string() + ";"); let early_expression = &(early_expression.syntax().to_string() + ";");
let new_expr = if_indent_level let new_expr = if_indent_level
.increase_indent(make::if_expression(&cond_expr, early_expression)); .increase_indent(make::if_expression(cond_expr, early_expression));
replace(new_expr.syntax(), &then_block, &parent_block, &if_expr) replace(new_expr.syntax(), &then_block, &parent_block, &if_expr)
} }
Some((path, bound_ident)) => { Some((path, bound_ident)) => {

2
crates/ra_syntax/src/ast/make.rs
View File

@@ -158,7 +158,7 @@ pub fn where_clause(preds: impl IntoIterator<Item = ast::WherePred>) -> ast::Whe
} }
} }
pub fn if_expression(condition: &ast::Expr, statement: &str) -> ast::IfExpr { pub fn if_expression(condition: ast::Expr, statement: &str) -> ast::IfExpr {
ast_from_text(&format!( ast_from_text(&format!(
"fn f() {{ if !{} {{\n {}\n}}\n}}", "fn f() {{ if !{} {{\n {}\n}}\n}}",
condition.syntax().text(), condition.syntax().text(),