Merge tag 'debian/1.52.1+dfsg1-1_exp2' into proxmox/buster

[rustc.git] / src / tools / clippy / tests / ui / unnecessary_wraps.stderr

error: this function's return value is unnecessarily wrapped by `Option`
  --> $DIR/unnecessary_wraps.rs:8:1
   |
LL | / fn func1(a: bool, b: bool) -> Option<i32> {
LL | |     if a && b {
LL | |         return Some(42);
LL | |     }
...  |
LL | |     }
LL | | }
   | |_^
   |
   = note: `-D clippy::unnecessary-wraps` implied by `-D warnings`
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 {
 ...

error: this function's return value is unnecessarily wrapped by `Option`
  --> $DIR/unnecessary_wraps.rs:21:1
   |
LL | / fn func2(a: bool, b: bool) -> Option<i32> {
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`
  --> $DIR/unnecessary_wraps.rs:39:1
   |
LL | / fn func5() -> Option<i32> {
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`
  --> $DIR/unnecessary_wraps.rs:49:1
   |
LL | / fn func7() -> Result<i32, ()> {
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`
  --> $DIR/unnecessary_wraps.rs:77:5
   |
LL | /     fn func12() -> Option<i32> {
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
  --> $DIR/unnecessary_wraps.rs:104:1
   |
LL | / fn issue_6640_1(a: bool, b: bool) -> Option<()> {
LL | |     if a && b {
LL | |         return Some(());
LL | |     }
...  |
LL | |     }
LL | | }
   | |_^
   |
help: remove the return type...
   |
LL | fn issue_6640_1(a: bool, b: bool) -> Option<()> {
   |                                      ^^^^^^^^^^
help: ...and then remove returned values
   |
LL |         return ;
LL |     }
LL |     if a {
LL |         Some(());
LL |         
LL |     } else {
 ...

error: this function's return value is unnecessary
  --> $DIR/unnecessary_wraps.rs:117:1
   |
LL | / fn issue_6640_2(a: bool, b: bool) -> Result<(), i32> {
LL | |     if a && b {
LL | |         return Ok(());
LL | |     }
...  |
LL | |     }
LL | | }
   | |_^
   |
help: remove the return type...
   |
LL | fn issue_6640_2(a: bool, b: bool) -> Result<(), i32> {
   |                                      ^^^^^^^^^^^^^^^
help: ...and then remove returned values
   |
LL |         return ;
LL |     }
LL |     if a {
LL |         
LL |     } else {
LL |         return ;
   |

error: aborting due to 7 previous errors