Mirrors/rust-clippy
2
0
Fork 0
mirror of https://github.com/rust-lang/rust-clippy synced 2024-09-21 07:01:54 +00:00
Code Issues Projects Releases Packages Wiki Activity

unwrap_used: Fix help, "an None" -> "None"

Browse source
This commit is contained in:
Sosthène Guédon 2022-07-22 19:14:31 +02:00
parent 6ee03e2b01
commit 3e52031471
5 changed files with 13 additions and 13 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

10
clippy_lints/src/methods/expect_used.rs
View file

@ -12,9 +12,9 @@ pub(super) fn check(cx: &LateContext<'_>, expr: &hir::Expr<'_>, recv: &hir::Expr
let obj_ty = cx.typeck_results().expr_ty(recv).peel_refs();
let mess = if is_type_diagnostic_item(cx, obj_ty, sym::Option) {
Some((EXPECT_USED, "an Option", "None"))
Some((EXPECT_USED, "an Option", "None", ""))
} else if is_type_diagnostic_item(cx, obj_ty, sym::Result) {
Some((EXPECT_USED, "a Result", "Err"))
Some((EXPECT_USED, "a Result", "Err", "an "))
} else {
None
};
@ -23,14 +23,14 @@ pub(super) fn check(cx: &LateContext<'_>, expr: &hir::Expr<'_>, recv: &hir::Expr
return;
}
if let Some((lint, kind, none_value)) = mess {
if let Some((lint, kind, none_value, none_prefix)) = mess {
span_lint_and_help(
cx,
lint,
expr.span,
&format!("used `expect()` on `{}` value", kind,),
&format!("used `expect()` on `{kind}` value"),
None,
&format!("if this value is an `{}`, it will panic", none_value,),
&format!("if this value is {none_prefix}`{none_value}`, it will panic"),
);
}
}

8
clippy_lints/src/methods/unwrap_used.rs
View file

@ -12,9 +12,9 @@ pub(super) fn check(cx: &LateContext<'_>, expr: &hir::Expr<'_>, recv: &hir::Expr
let obj_ty = cx.typeck_results().expr_ty(recv).peel_refs();
let mess = if is_type_diagnostic_item(cx, obj_ty, sym::Option) {
Some((UNWRAP_USED, "an Option", "None"))
Some((UNWRAP_USED, "an Option", "None", ""))
} else if is_type_diagnostic_item(cx, obj_ty, sym::Result) {
Some((UNWRAP_USED, "a Result", "Err"))
Some((UNWRAP_USED, "a Result", "Err", "an "))
} else {
None
};
@ -23,14 +23,14 @@ pub(super) fn check(cx: &LateContext<'_>, expr: &hir::Expr<'_>, recv: &hir::Expr
return;
}
if let Some((lint, kind, none_value)) = mess {
if let Some((lint, kind, none_value, none_prefix)) = mess {
let help = if is_lint_allowed(cx, EXPECT_USED, expr.hir_id) {
format!(
"if you don't want to handle the `{none_value}` case gracefully, consider \
using `expect()` to provide a better panic message"
)
} else {
format!("if this value is an `{none_value}`, it will panic")
format!("if this value is {none_prefix}`{none_value}`, it will panic")
};
span_lint_and_help(

2
tests/ui-toml/expect_used/expect_used.stderr
View file

@ -5,7 +5,7 @@ LL | let _ = opt.expect("");
| ^^^^^^^^^^^^^^
|
= note: `-D clippy::expect-used` implied by `-D warnings`
= help: if this value is an `None`, it will panic
= help: if this value is `None`, it will panic
error: used `expect()` on `a Result` value
--> $DIR/expect_used.rs:11:13

2
tests/ui/expect.stderr
View file

@ -5,7 +5,7 @@ LL | let _ = opt.expect("");
| ^^^^^^^^^^^^^^
|
= note: `-D clippy::expect-used` implied by `-D warnings`
= help: if this value is an `None`, it will panic
= help: if this value is `None`, it will panic
error: used `expect()` on `a Result` value
--> $DIR/expect.rs:10:13

4
tests/ui/unwrap_expect_used.stderr
View file

@ -5,7 +5,7 @@ LL | Some(3).unwrap();
| ^^^^^^^^^^^^^^^^
|
= note: `-D clippy::unwrap-used` implied by `-D warnings`
= help: if this value is an `None`, it will panic
= help: if this value is `None`, it will panic
error: used `expect()` on `an Option` value
--> $DIR/unwrap_expect_used.rs:5:5
@ -14,7 +14,7 @@ LL | Some(3).expect("Hello world!");
| ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
|
= note: `-D clippy::expect-used` implied by `-D warnings`
= help: if this value is an `None`, it will panic
= help: if this value is `None`, it will panic
error: used `unwrap()` on `a Result` value
--> $DIR/unwrap_expect_used.rs:8:5