diff options
| -rw-r--r-- | clippy_lints/src/methods/or_then_unwrap.rs | 4 | ||||
| -rw-r--r-- | tests/ui/or_then_unwrap.stderr | 6 |
2 files changed, 5 insertions, 5 deletions
diff --git a/clippy_lints/src/methods/or_then_unwrap.rs b/clippy_lints/src/methods/or_then_unwrap.rs index 4e2dcf67231..a0f6d80c19b 100644 --- a/clippy_lints/src/methods/or_then_unwrap.rs +++ b/clippy_lints/src/methods/or_then_unwrap.rs @@ -21,14 +21,14 @@ pub(super) fn check<'tcx>( let or_arg_content: Span; if is_type_diagnostic_item(cx, ty, sym::Option) { - title = ".or(Some(…)).unwrap() found"; + title = "found `.or(Some(…)).unwrap()`"; if let Some(content) = get_content_if_is(or_arg, "Some") { or_arg_content = content; } else { return; } } else if is_type_diagnostic_item(cx, ty, sym::Result) { - title = ".or(Ok(…)).unwrap() found"; + title = "found `.or(Ok(…)).unwrap()`"; if let Some(content) = get_content_if_is(or_arg, "Ok") { or_arg_content = content; } else { diff --git a/tests/ui/or_then_unwrap.stderr b/tests/ui/or_then_unwrap.stderr index 6b32634defd..da88154c59f 100644 --- a/tests/ui/or_then_unwrap.stderr +++ b/tests/ui/or_then_unwrap.stderr @@ -1,4 +1,4 @@ -error: .or(Some(…)).unwrap() found +error: found `.or(Some(…)).unwrap()` --> $DIR/or_then_unwrap.rs:24:20 | LL | let _ = option.or(Some("fallback")).unwrap(); // should trigger lint @@ -6,13 +6,13 @@ LL | let _ = option.or(Some("fallback")).unwrap(); // should trigger lint | = note: `-D clippy::or-then-unwrap` implied by `-D warnings` -error: .or(Ok(…)).unwrap() found +error: found `.or(Ok(…)).unwrap()` --> $DIR/or_then_unwrap.rs:27:20 | LL | let _ = result.or::<&str>(Ok("fallback")).unwrap(); // should trigger lint | ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^ help: try this: `unwrap_or("fallback")` -error: .or(Some(…)).unwrap() found +error: found `.or(Some(…)).unwrap()` --> $DIR/or_then_unwrap.rs:31:31 | LL | let _ = option.map(|v| v).or(Some("fallback")).unwrap().to_string().chars(); // should trigger lint |