Skip to content

Commit

Permalink
Auto merge of #7007 - Y-Nak:result_unit_err, r=giraffate
Browse files Browse the repository at this point in the history
result_unit_err: Fix typo

changelog: result_unit_err: fix typo in a diagnostic message

r? `@giraffate`
fixes #6990 (comment).
  • Loading branch information
bors committed Mar 31, 2021
2 parents 4be72b0 + 45164de commit 0b76719
Show file tree
Hide file tree
Showing 3 changed files with 20 additions and 20 deletions.
4 changes: 2 additions & 2 deletions clippy_lints/src/functions/result_unit_err.rs
Original file line number Diff line number Diff line change
Expand Up @@ -57,9 +57,9 @@ fn check_result_unit_err(cx: &LateContext<'_>, decl: &hir::FnDecl<'_>, item_span
cx,
RESULT_UNIT_ERR,
fn_header_span,
"this returns a `Result<_, ()>",
"this returns a `Result<_, ()>`",
None,
"use a custom Error type instead",
"use a custom `Error` type instead",
);
}
}
Expand Down
16 changes: 8 additions & 8 deletions tests/ui/len_without_is_empty.stderr
Original file line number Diff line number Diff line change
Expand Up @@ -86,38 +86,38 @@ LL | pub fn is_empty(&self) -> Option<bool> {
| ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
= note: expected signature: `(&self) -> bool` or `(&self) -> Result<bool>

error: this returns a `Result<_, ()>
error: this returns a `Result<_, ()>`
--> $DIR/len_without_is_empty.rs:230:5
|
LL | pub fn len(&self) -> Result<usize, ()> {
| ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
|
= note: `-D clippy::result-unit-err` implied by `-D warnings`
= help: use a custom Error type instead
= help: use a custom `Error` type instead

error: this returns a `Result<_, ()>
error: this returns a `Result<_, ()>`
--> $DIR/len_without_is_empty.rs:242:5
|
LL | pub fn len(&self) -> Result<usize, ()> {
| ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
|
= help: use a custom Error type instead
= help: use a custom `Error` type instead

error: this returns a `Result<_, ()>
error: this returns a `Result<_, ()>`
--> $DIR/len_without_is_empty.rs:246:5
|
LL | pub fn is_empty(&self) -> Result<bool, ()> {
| ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
|
= help: use a custom Error type instead
= help: use a custom `Error` type instead

error: this returns a `Result<_, ()>
error: this returns a `Result<_, ()>`
--> $DIR/len_without_is_empty.rs:253:5
|
LL | pub fn len(&self) -> Result<usize, ()> {
| ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
|
= help: use a custom Error type instead
= help: use a custom `Error` type instead

error: aborting due to 12 previous errors

20 changes: 10 additions & 10 deletions tests/ui/result_unit_error.stderr
Original file line number Diff line number Diff line change
@@ -1,43 +1,43 @@
error: this returns a `Result<_, ()>
error: this returns a `Result<_, ()>`
--> $DIR/result_unit_error.rs:3:1
|
LL | pub fn returns_unit_error() -> Result<u32, ()> {
| ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
|
= note: `-D clippy::result-unit-err` implied by `-D warnings`
= help: use a custom Error type instead
= help: use a custom `Error` type instead

error: this returns a `Result<_, ()>
error: this returns a `Result<_, ()>`
--> $DIR/result_unit_error.rs:12:5
|
LL | fn get_that_error(&self) -> Result<bool, ()>;
| ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
|
= help: use a custom Error type instead
= help: use a custom `Error` type instead

error: this returns a `Result<_, ()>
error: this returns a `Result<_, ()>`
--> $DIR/result_unit_error.rs:14:5
|
LL | fn get_this_one_too(&self) -> Result<bool, ()> {
| ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
|
= help: use a custom Error type instead
= help: use a custom `Error` type instead

error: this returns a `Result<_, ()>
error: this returns a `Result<_, ()>`
--> $DIR/result_unit_error.rs:32:5
|
LL | pub fn unit_error(&self) -> Result<usize, ()> {
| ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
|
= help: use a custom Error type instead
= help: use a custom `Error` type instead

error: this returns a `Result<_, ()>
error: this returns a `Result<_, ()>`
--> $DIR/result_unit_error.rs:41:5
|
LL | pub fn should_lint() -> ResInv<(), usize> {
| ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
|
= help: use a custom Error type instead
= help: use a custom `Error` type instead

error: aborting due to 5 previous errors

0 comments on commit 0b76719

Please sign in to comment.