From 1ed1e3d4a757b8f57cb7c727d66703713cdc0bdf Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?L=C3=BAc=C3=A1s=20Meier?= Date: Fri, 4 Oct 2019 08:21:24 +0200 Subject: Fix formatting --- crates/ra_assists/src/assists/apply_demorgan.rs | 31 +++++++------------------ 1 file changed, 9 insertions(+), 22 deletions(-) (limited to 'crates/ra_assists/src/assists') diff --git a/crates/ra_assists/src/assists/apply_demorgan.rs b/crates/ra_assists/src/assists/apply_demorgan.rs index e4a8657ca..caecc50cc 100644 --- a/crates/ra_assists/src/assists/apply_demorgan.rs +++ b/crates/ra_assists/src/assists/apply_demorgan.rs @@ -2,8 +2,8 @@ //! This assist transforms boolean expressions of the form `!a || !b` into //! `!(a && b)`. use hir::db::HirDatabase; -use ra_syntax::SyntaxNode; use ra_syntax::ast::{AstNode, BinExpr, BinOp, Expr, PrefixOp}; +use ra_syntax::SyntaxNode; use crate::{Assist, AssistCtx, AssistId}; @@ -25,16 +25,16 @@ fn undo_negation(node: SyntaxNode) -> Option { let rhs = bin.rhs()?.syntax().text(); Some(format!("{} == {}", lhs, rhs)) } - _ => None - } + _ => None, + }, Expr::PrefixExpr(pe) => match pe.op_kind()? { PrefixOp::Not => { let child = pe.expr()?.syntax().text(); Some(String::from(child)) } - _ => None - } - _ => None + _ => None, + }, + _ => None, } } @@ -60,7 +60,6 @@ pub(crate) fn apply_demorgan(mut ctx: AssistCtx) -> Option !x }", - "fn f() { !(x ||<|> x) }" - ) + check_assist(apply_demorgan, "fn f() { !x &&<|> !x }", "fn f() { !(x ||<|> x) }") } #[test] fn demorgan_turns_or_into_and() { - check_assist( - apply_demorgan, - "fn f() { !x ||<|> !x }", - "fn f() { !(x &&<|> x) }" - ) + check_assist(apply_demorgan, "fn f() { !x ||<|> !x }", "fn f() { !(x &&<|> x) }") } #[test] fn demorgan_removes_inequality() { - check_assist( - apply_demorgan, - "fn f() { x != x ||<|> !x }", - "fn f() { !(x == x &&<|> x) }" - ) + check_assist(apply_demorgan, "fn f() { x != x ||<|> !x }", "fn f() { !(x == x &&<|> x) }") } #[test] -- cgit v1.2.3