Skip to content

unnecessary_wraps: do not include the whole body in the lint span #14777

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
wants to merge 1 commit into
base: master
Choose a base branch
from
Open
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 2 additions & 2 deletions clippy_lints/src/unnecessary_wraps.rs
Original file line number Diff line number Diff line change
Expand Up @@ -78,7 +78,7 @@ impl<'tcx> LateLintPass<'tcx> for UnnecessaryWraps {
fn_kind: FnKind<'tcx>,
fn_decl: &FnDecl<'tcx>,
body: &Body<'tcx>,
span: Span,
_span: Span,
def_id: LocalDefId,
) {
// Abort if public function/method or closure.
Expand Down Expand Up @@ -159,7 +159,7 @@ impl<'tcx> LateLintPass<'tcx> for UnnecessaryWraps {
)
};

span_lint_and_then(cx, UNNECESSARY_WRAPS, span, lint_msg, |diag| {
span_lint_and_then(cx, UNNECESSARY_WRAPS, cx.tcx.def_span(def_id), lint_msg, |diag| {
diag.span_suggestion(
fn_decl.output.span(),
return_type_sugg_msg,
Expand Down
61 changes: 14 additions & 47 deletions tests/ui/unnecessary_wraps.stderr
Original file line number Diff line number Diff line change
@@ -1,13 +1,8 @@
error: this function's return value is unnecessarily wrapped by `Option`
--> tests/ui/unnecessary_wraps.rs:9:1
|
LL | / fn func1(a: bool, b: bool) -> Option<i32> {
LL | |
LL | |
LL | | if a && b {
... |
LL | | }
| |_^
LL | fn func1(a: bool, b: bool) -> Option<i32> {
| ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
|
= note: `-D clippy::unnecessary-wraps` implied by `-D warnings`
= help: to override `-D warnings` add `#[allow(clippy::unnecessary_wraps)]`
Expand All @@ -30,14 +25,8 @@ LL ~ return 1337;
error: this function's return value is unnecessarily wrapped by `Option`
--> tests/ui/unnecessary_wraps.rs:24:1
|
LL | / fn func2(a: bool, b: bool) -> Option<i32> {
LL | |
LL | |
LL | | if a && b {
... |
LL | | if a { Some(20) } else { Some(30) }
LL | | }
| |_^
LL | fn func2(a: bool, b: bool) -> Option<i32> {
| ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
|
help: remove `Option` from the return type...
|
Expand All @@ -54,12 +43,8 @@ LL ~ if a { 20 } else { 30 }
error: this function's return value is unnecessarily wrapped by `Option`
--> tests/ui/unnecessary_wraps.rs:44:1
|
LL | / fn func5() -> Option<i32> {
LL | |
LL | |
LL | | Some(1)
LL | | }
| |_^
LL | fn func5() -> Option<i32> {
| ^^^^^^^^^^^^^^^^^^^^^^^^^
|
help: remove `Option` from the return type...
|
Expand All @@ -75,12 +60,8 @@ LL + 1
error: this function's return value is unnecessarily wrapped by `Result`
--> tests/ui/unnecessary_wraps.rs:56:1
|
LL | / fn func7() -> Result<i32, ()> {
LL | |
LL | |
LL | | Ok(1)
LL | | }
| |_^
LL | fn func7() -> Result<i32, ()> {
| ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
|
help: remove `Result` from the return type...
|
Expand All @@ -96,12 +77,8 @@ LL + 1
error: this function's return value is unnecessarily wrapped by `Option`
--> tests/ui/unnecessary_wraps.rs:86:5
|
LL | / fn func12() -> Option<i32> {
LL | |
LL | |
LL | | Some(1)
LL | | }
| |_____^
LL | fn func12() -> Option<i32> {
| ^^^^^^^^^^^^^^^^^^^^^^^^^^
|
help: remove `Option` from the return type...
|
Expand All @@ -117,13 +94,8 @@ LL + 1
error: this function's return value is unnecessary
--> tests/ui/unnecessary_wraps.rs:115:1
|
LL | / fn issue_6640_1(a: bool, b: bool) -> Option<()> {
LL | |
LL | |
LL | | if a && b {
... |
LL | | }
| |_^
LL | fn issue_6640_1(a: bool, b: bool) -> Option<()> {
| ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
|
help: remove the return type...
|
Expand All @@ -144,13 +116,8 @@ LL ~ return ;
error: this function's return value is unnecessary
--> tests/ui/unnecessary_wraps.rs:130:1
|
LL | / fn issue_6640_2(a: bool, b: bool) -> Result<(), i32> {
LL | |
LL | |
LL | | if a && b {
... |
LL | | }
| |_^
LL | fn issue_6640_2(a: bool, b: bool) -> Result<(), i32> {
| ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
|
help: remove the return type...
|
Expand Down