mirror of
https://github.com/rust-lang/rust-clippy
synced 2024-11-23 21:23:56 +00:00
5ef38a3bc7
When a suggestion part is for already present code, do not highlight it. If after that there are no highlights left, do not show the suggestion at all. Fix clippy lint suggestion incorrectly treated as `span_help`.
161 lines
3.5 KiB
Text
161 lines
3.5 KiB
Text
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 | | }
|
|
| |_^
|
|
|
|
|
= note: `-D clippy::unnecessary-wraps` implied by `-D warnings`
|
|
= help: to override `-D warnings` add `#[allow(clippy::unnecessary_wraps)]`
|
|
help: remove `Option` from the return type...
|
|
|
|
|
LL | fn func1(a: bool, b: bool) -> i32 {
|
|
| ~~~
|
|
help: ...and then change returning expressions
|
|
|
|
|
LL ~ return 42;
|
|
LL | }
|
|
LL | if a {
|
|
LL | Some(-1);
|
|
LL ~ 2
|
|
LL | } else {
|
|
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 | | if a && b {
|
|
LL | | return Some(10);
|
|
LL | | }
|
|
LL | | if a { Some(20) } else { Some(30) }
|
|
LL | | }
|
|
| |_^
|
|
|
|
|
help: remove `Option` from the return type...
|
|
|
|
|
LL | fn func2(a: bool, b: bool) -> i32 {
|
|
| ~~~
|
|
help: ...and then change returning expressions
|
|
|
|
|
LL ~ return 10;
|
|
LL | }
|
|
LL ~ if a { 20 } else { 30 }
|
|
|
|
|
|
|
error: this function's return value is unnecessarily wrapped by `Option`
|
|
--> tests/ui/unnecessary_wraps.rs:43:1
|
|
|
|
|
LL | / fn func5() -> Option<i32> {
|
|
LL | |
|
|
LL | | Some(1)
|
|
LL | | }
|
|
| |_^
|
|
|
|
|
help: remove `Option` from the return type...
|
|
|
|
|
LL | fn func5() -> i32 {
|
|
| ~~~
|
|
help: ...and then change returning expressions
|
|
|
|
|
LL | 1
|
|
|
|
|
|
|
error: this function's return value is unnecessarily wrapped by `Result`
|
|
--> tests/ui/unnecessary_wraps.rs:54:1
|
|
|
|
|
LL | / fn func7() -> Result<i32, ()> {
|
|
LL | |
|
|
LL | | Ok(1)
|
|
LL | | }
|
|
| |_^
|
|
|
|
|
help: remove `Result` from the return type...
|
|
|
|
|
LL | fn func7() -> i32 {
|
|
| ~~~
|
|
help: ...and then change returning expressions
|
|
|
|
|
LL | 1
|
|
|
|
|
|
|
error: this function's return value is unnecessarily wrapped by `Option`
|
|
--> tests/ui/unnecessary_wraps.rs:83:5
|
|
|
|
|
LL | / fn func12() -> Option<i32> {
|
|
LL | |
|
|
LL | | Some(1)
|
|
LL | | }
|
|
| |_____^
|
|
|
|
|
help: remove `Option` from the return type...
|
|
|
|
|
LL | fn func12() -> i32 {
|
|
| ~~~
|
|
help: ...and then change returning expressions
|
|
|
|
|
LL | 1
|
|
|
|
|
|
|
error: this function's return value is unnecessary
|
|
--> tests/ui/unnecessary_wraps.rs:111:1
|
|
|
|
|
LL | / fn issue_6640_1(a: bool, b: bool) -> Option<()> {
|
|
LL | |
|
|
LL | | if a && b {
|
|
LL | | return Some(());
|
|
... |
|
|
LL | | }
|
|
LL | | }
|
|
| |_^
|
|
|
|
|
help: remove the return type...
|
|
|
|
|
LL | fn issue_6640_1(a: bool, b: bool) -> () {
|
|
| ~~
|
|
help: ...and then remove returned values
|
|
|
|
|
LL ~ return ;
|
|
LL | }
|
|
LL | if a {
|
|
LL | Some(());
|
|
LL ~
|
|
LL | } else {
|
|
LL ~ return ;
|
|
|
|
|
|
|
error: this function's return value is unnecessary
|
|
--> tests/ui/unnecessary_wraps.rs:125:1
|
|
|
|
|
LL | / fn issue_6640_2(a: bool, b: bool) -> Result<(), i32> {
|
|
LL | |
|
|
LL | | if a && b {
|
|
LL | | return Ok(());
|
|
... |
|
|
LL | | }
|
|
LL | | }
|
|
| |_^
|
|
|
|
|
help: remove the return type...
|
|
|
|
|
LL | fn issue_6640_2(a: bool, b: bool) -> () {
|
|
| ~~
|
|
help: ...and then remove returned values
|
|
|
|
|
LL ~ return ;
|
|
LL | }
|
|
LL | if a {
|
|
LL ~
|
|
LL | } else {
|
|
LL ~ return ;
|
|
|
|
|
|
|
error: aborting due to 7 previous errors
|
|
|