Remove the clippy::panic-params lint.
Rustc itself now warns for all cases that triggered this lint.
This commit is contained in:
parent
577ebc8cd6
commit
78faaef8de
@ -788,7 +788,6 @@ pub fn register_plugins(store: &mut rustc_lint::LintStore, sess: &Session, conf:
|
||||
&overflow_check_conditional::OVERFLOW_CHECK_CONDITIONAL,
|
||||
&panic_in_result_fn::PANIC_IN_RESULT_FN,
|
||||
&panic_unimplemented::PANIC,
|
||||
&panic_unimplemented::PANIC_PARAMS,
|
||||
&panic_unimplemented::TODO,
|
||||
&panic_unimplemented::UNIMPLEMENTED,
|
||||
&panic_unimplemented::UNREACHABLE,
|
||||
@ -1499,7 +1498,6 @@ pub fn register_plugins(store: &mut rustc_lint::LintStore, sess: &Session, conf:
|
||||
LintId::of(&open_options::NONSENSICAL_OPEN_OPTIONS),
|
||||
LintId::of(&option_env_unwrap::OPTION_ENV_UNWRAP),
|
||||
LintId::of(&overflow_check_conditional::OVERFLOW_CHECK_CONDITIONAL),
|
||||
LintId::of(&panic_unimplemented::PANIC_PARAMS),
|
||||
LintId::of(&partialeq_ne_impl::PARTIALEQ_NE_IMPL),
|
||||
LintId::of(&precedence::PRECEDENCE),
|
||||
LintId::of(&ptr::CMP_NULL),
|
||||
@ -1666,7 +1664,6 @@ pub fn register_plugins(store: &mut rustc_lint::LintStore, sess: &Session, conf:
|
||||
LintId::of(&non_copy_const::DECLARE_INTERIOR_MUTABLE_CONST),
|
||||
LintId::of(&non_expressive_names::JUST_UNDERSCORES_AND_DIGITS),
|
||||
LintId::of(&non_expressive_names::MANY_SINGLE_CHAR_NAMES),
|
||||
LintId::of(&panic_unimplemented::PANIC_PARAMS),
|
||||
LintId::of(&ptr::CMP_NULL),
|
||||
LintId::of(&ptr::PTR_ARG),
|
||||
LintId::of(&ptr_eq::PTR_EQ),
|
||||
|
@ -1,30 +1,10 @@
|
||||
use crate::utils::{is_direct_expn_of, is_expn_of, match_panic_call, span_lint};
|
||||
use crate::utils::{is_expn_of, match_panic_call, span_lint};
|
||||
use if_chain::if_chain;
|
||||
use rustc_ast::ast::LitKind;
|
||||
use rustc_hir::{Expr, ExprKind};
|
||||
use rustc_hir::Expr;
|
||||
use rustc_lint::{LateContext, LateLintPass};
|
||||
use rustc_session::{declare_lint_pass, declare_tool_lint};
|
||||
use rustc_span::Span;
|
||||
|
||||
declare_clippy_lint! {
|
||||
/// **What it does:** Checks for missing parameters in `panic!`.
|
||||
///
|
||||
/// **Why is this bad?** Contrary to the `format!` family of macros, there are
|
||||
/// two forms of `panic!`: if there are no parameters given, the first argument
|
||||
/// is not a format string and used literally. So while `format!("{}")` will
|
||||
/// fail to compile, `panic!("{}")` will not.
|
||||
///
|
||||
/// **Known problems:** None.
|
||||
///
|
||||
/// **Example:**
|
||||
/// ```no_run
|
||||
/// panic!("This `panic!` is probably missing a parameter there: {}");
|
||||
/// ```
|
||||
pub PANIC_PARAMS,
|
||||
style,
|
||||
"missing parameters in `panic!` calls"
|
||||
}
|
||||
|
||||
declare_clippy_lint! {
|
||||
/// **What it does:** Checks for usage of `panic!`.
|
||||
///
|
||||
@ -89,11 +69,11 @@ declare_clippy_lint! {
|
||||
"`unreachable!` should not be present in production code"
|
||||
}
|
||||
|
||||
declare_lint_pass!(PanicUnimplemented => [PANIC_PARAMS, UNIMPLEMENTED, UNREACHABLE, TODO, PANIC]);
|
||||
declare_lint_pass!(PanicUnimplemented => [UNIMPLEMENTED, UNREACHABLE, TODO, PANIC]);
|
||||
|
||||
impl<'tcx> LateLintPass<'tcx> for PanicUnimplemented {
|
||||
fn check_expr(&mut self, cx: &LateContext<'tcx>, expr: &'tcx Expr<'_>) {
|
||||
if let Some(params) = match_panic_call(cx, expr) {
|
||||
if let Some(_) = match_panic_call(cx, expr) {
|
||||
let span = get_outer_span(expr);
|
||||
if is_expn_of(expr.span, "unimplemented").is_some() {
|
||||
span_lint(
|
||||
@ -113,7 +93,6 @@ impl<'tcx> LateLintPass<'tcx> for PanicUnimplemented {
|
||||
);
|
||||
} else if is_expn_of(expr.span, "panic").is_some() {
|
||||
span_lint(cx, PANIC, span, "`panic` should not be present in production code");
|
||||
match_panic(params, expr, cx);
|
||||
}
|
||||
}
|
||||
}
|
||||
@ -132,20 +111,3 @@ fn get_outer_span(expr: &Expr<'_>) -> Span {
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
fn match_panic(params: &[Expr<'_>], expr: &Expr<'_>, cx: &LateContext<'_>) {
|
||||
if_chain! {
|
||||
if let ExprKind::Lit(ref lit) = params[0].kind;
|
||||
if is_direct_expn_of(expr.span, "panic").is_some();
|
||||
if let LitKind::Str(ref string, _) = lit.node;
|
||||
let string = string.as_str().replace("{{", "").replace("}}", "");
|
||||
if let Some(par) = string.find('{');
|
||||
if string[par..].contains('}');
|
||||
if params[0].span.source_callee().is_none();
|
||||
if params[0].span.lo() != params[0].span.hi();
|
||||
then {
|
||||
span_lint(cx, PANIC_PARAMS, params[0].span,
|
||||
"you probably are missing some parameter in your format string");
|
||||
}
|
||||
}
|
||||
}
|
||||
|
@ -1,61 +0,0 @@
|
||||
#![warn(clippy::panic_params)]
|
||||
#![allow(clippy::assertions_on_constants)]
|
||||
fn missing() {
|
||||
if true {
|
||||
panic!("{}");
|
||||
} else if false {
|
||||
panic!("{:?}");
|
||||
} else {
|
||||
assert!(true, "here be missing values: {}");
|
||||
}
|
||||
|
||||
panic!("{{{this}}}");
|
||||
}
|
||||
|
||||
fn ok_single() {
|
||||
panic!("foo bar");
|
||||
}
|
||||
|
||||
fn ok_inner() {
|
||||
// Test for #768
|
||||
assert!("foo bar".contains(&format!("foo {}", "bar")));
|
||||
}
|
||||
|
||||
fn ok_multiple() {
|
||||
panic!("{}", "This is {ok}");
|
||||
}
|
||||
|
||||
fn ok_bracket() {
|
||||
match 42 {
|
||||
1337 => panic!("{so is this"),
|
||||
666 => panic!("so is this}"),
|
||||
_ => panic!("}so is that{"),
|
||||
}
|
||||
}
|
||||
|
||||
const ONE: u32 = 1;
|
||||
|
||||
fn ok_nomsg() {
|
||||
assert!({ 1 == ONE });
|
||||
assert!(if 1 == ONE { ONE == 1 } else { false });
|
||||
}
|
||||
|
||||
fn ok_escaped() {
|
||||
panic!("{{ why should this not be ok? }}");
|
||||
panic!(" or {{ that ?");
|
||||
panic!(" or }} this ?");
|
||||
panic!(" {or {{ that ?");
|
||||
panic!(" }or }} this ?");
|
||||
panic!("{{ test }");
|
||||
panic!("{case }}");
|
||||
}
|
||||
|
||||
fn main() {
|
||||
missing();
|
||||
ok_single();
|
||||
ok_multiple();
|
||||
ok_bracket();
|
||||
ok_inner();
|
||||
ok_nomsg();
|
||||
ok_escaped();
|
||||
}
|
@ -1,28 +0,0 @@
|
||||
error: you probably are missing some parameter in your format string
|
||||
--> $DIR/panic.rs:5:16
|
||||
|
|
||||
LL | panic!("{}");
|
||||
| ^^^^
|
||||
|
|
||||
= note: `-D clippy::panic-params` implied by `-D warnings`
|
||||
|
||||
error: you probably are missing some parameter in your format string
|
||||
--> $DIR/panic.rs:7:16
|
||||
|
|
||||
LL | panic!("{:?}");
|
||||
| ^^^^^^
|
||||
|
||||
error: you probably are missing some parameter in your format string
|
||||
--> $DIR/panic.rs:9:23
|
||||
|
|
||||
LL | assert!(true, "here be missing values: {}");
|
||||
| ^^^^^^^^^^^^^^^^^^^^^^^^^^^^
|
||||
|
||||
error: you probably are missing some parameter in your format string
|
||||
--> $DIR/panic.rs:12:12
|
||||
|
|
||||
LL | panic!("{{{this}}}");
|
||||
| ^^^^^^^^^^^^
|
||||
|
||||
error: aborting due to 4 previous errors
|
||||
|
Loading…
Reference in New Issue
Block a user