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

refactor: use clippy_utils::Sugg instead of direct string ops

Browse source
This commit is contained in:
Jacob Kiesel 2022-09-14 13:28:54 -06:00
parent 9925600870
commit 4ffdce09b6
3 changed files with 21 additions and 26 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

37
clippy_lints/src/bool_to_int_with_if.rs
View file

@ -1,9 +1,9 @@
use rustc_ast::{ExprPrecedence, LitKind}; use rustc_ast::LitKind;
use rustc_hir::{Block, ExprKind}; use rustc_hir::{Block, ExprKind};
use rustc_lint::{LateContext, LateLintPass}; use rustc_lint::{LateContext, LateLintPass};
use rustc_session::{declare_lint_pass, declare_tool_lint}; use rustc_session::{declare_lint_pass, declare_tool_lint};
use clippy_utils::{diagnostics::span_lint_and_then, is_else_clause, source::snippet_block_with_applicability}; use clippy_utils::{diagnostics::span_lint_and_then, is_else_clause, sugg::Sugg};
use rustc_errors::Applicability; use rustc_errors::Applicability;
declare_clippy_lint! { declare_clippy_lint! {
@ -69,28 +69,27 @@ fn check_if_else<'tcx>(ctx: &LateContext<'tcx>, expr: &'tcx rustc_hir::Expr<'tcx
return; return;
}; };
let mut applicability = Applicability::MachineApplicable; let mut applicability = Applicability::MachineApplicable;
let snippet = snippet_block_with_applicability(ctx, check.span, "..", None, &mut applicability); let snippet = {
let mut sugg = Sugg::hir_with_applicability(ctx, check, "..", &mut applicability);
let invert = if inverted { "!" } else { "" }; if inverted {
let need_parens = should_have_parentheses(check); sugg = !sugg;
}
let snippet_with_braces = { sugg
let (left_paren, right_paren) = if need_parens {("(", ")")} else {("", "")};
format!("{invert}{left_paren}{snippet}{right_paren}")
}; };
let ty = ctx.typeck_results().expr_ty(then_lit); // then and else must be of same type let ty = ctx.typeck_results().expr_ty(then_lit); // then and else must be of same type
let suggestion = { let suggestion = {
let wrap_in_curly = is_else_clause(ctx.tcx, expr); let wrap_in_curly = is_else_clause(ctx.tcx, expr);
let (left_curly, right_curly) = if wrap_in_curly {("{", "}")} else {("", "")}; let mut s = Sugg::NonParen(format!("{ty}::from({snippet})").into());
let (left_paren, right_paren) = if inverted && need_parens {("(", ")")} else {("", "")}; if wrap_in_curly {
format!( s = s.blockify();
"{left_curly}{ty}::from({invert}{left_paren}{snippet}{right_paren}){right_curly}" }
) s
}; // when used in else clause if statement should be wrapped in curly braces }; // when used in else clause if statement should be wrapped in curly braces
let (inverted_left_paren, inverted_right_paren) = if inverted {("(", ")")} else {("", "")}; let into_snippet = snippet.clone().maybe_par();
let as_snippet = snippet.as_ty(ty);
span_lint_and_then(ctx, span_lint_and_then(ctx,
BOOL_TO_INT_WITH_IF, BOOL_TO_INT_WITH_IF,
@ -103,7 +102,7 @@ fn check_if_else<'tcx>(ctx: &LateContext<'tcx>, expr: &'tcx rustc_hir::Expr<'tcx
suggestion, suggestion,
applicability, applicability,
); );
diag.note(format!("`{snippet_with_braces} as {ty}` or `{inverted_left_paren}{snippet_with_braces}{inverted_right_paren}.into()` can also be valid options")); diag.note(format!("`{as_snippet}` or `{into_snippet}.into()` can also be valid options"));
}); });
}; };
} }
@ -135,7 +134,3 @@ fn check_int_literal_equals_val<'tcx>(expr: &'tcx rustc_hir::Expr<'tcx>, expecte
false false
} }
} }
fn should_have_parentheses<'tcx>(check: &'tcx rustc_hir::Expr<'tcx>) -> bool {
check.precedence().order() < ExprPrecedence::Cast.order()
}

2
tests/ui/bool_to_int_with_if.stderr
View file

@ -33,7 +33,7 @@ LL | | 0
LL | | }; LL | | };
| |_____^ help: replace with from: `i32::from(!a)` | |_____^ help: replace with from: `i32::from(!a)`
| |
= note: `!a as i32` or `!a.into()` can also be valid options = note: `!a as i32` or `(!a).into()` can also be valid options
error: boolean to int conversion using if error: boolean to int conversion using if
--> $DIR/bool_to_int_with_if.rs:30:5 --> $DIR/bool_to_int_with_if.rs:30:5