Use help span option

Author: DanielEScherzer

clippy_lints/src/iter_missing_exact_size.rs

@@ -2,7 +2,6 @@ use clippy_utils::diagnostics::span_lint_and_help;
 use clippy_utils::paths::{PathNS, lookup_path_str};
 use clippy_utils::sym;
 use clippy_utils::ty::{get_field_by_name, implements_trait, ty_from_hir_ty};
-use rustc_errors::MultiSpan;
 use rustc_hir::{Body, ExprKind, Impl, ImplItemKind, Item, ItemKind, OwnerId, OwnerNode, QPath};
 use rustc_lint::{LateContext, LateLintPass};
 use rustc_session::impl_lint_pass;
@@ -184,18 +183,13 @@ impl<'tcx> LateLintPass<'tcx> for IterMissingExactSize {
                     return;
                 }
             }
-            let mut lint_span = MultiSpan::from_span(item.span);
-            lint_span.push_span_label(
-                trailing_expr.span,
-                "This size_hint() implementation delegates to the size_hint() of an ExactSizeIterator",
-            );
             span_lint_and_help(
                 cx,
                 ITER_MISSING_EXACT_SIZE,
-                lint_span,
-                "iterator can implement ExactSizeIterator",
-                None,
-                "since size_hint() delegates to an ExactSizeIterator, the overall iterator is likely to have an exact size",
+                item.span,
+                "iterator can implement `ExactSizeIterator`",
+                Some(trailing_expr.span),
+                "this `size_hint()` implementation delegates to to the `size_hint()` of an `ExactSizeIterator`, so the overall iterator is likely to have an exact size",
             );
         }
     }

tests/ui/iter_missing_exact_size.stderr

@@ -1,36 +1,38 @@
-error: iterator can implement ExactSizeIterator
+error: iterator can implement `ExactSizeIterator`
   --> tests/ui/iter_missing_exact_size.rs:11:1
    |
 LL | / impl Iterator for StringRepeater1 {
 LL | |
 LL | |     type Item = String;
 LL | |     fn next(&mut self) -> Option<Self::Item> {
 ...  |
-LL | |         self.range.size_hint()
-   | |         ---------------------- This size_hint() implementation delegates to the size_hint() of an ExactSizeIterator
-LL | |     }
 LL | | }
    | |_^
    |
-   = help: since size_hint() delegates to an ExactSizeIterator, the overall iterator is likely to have an exact size
+help: this `size_hint()` implementation delegates to to the `size_hint()` of an `ExactSizeIterator`, so the overall iterator is likely to have an exact size
+  --> tests/ui/iter_missing_exact_size.rs:18:9
+   |
+LL |         self.range.size_hint()
+   |         ^^^^^^^^^^^^^^^^^^^^^^
    = note: `-D clippy::iter-missing-exact-size` implied by `-D warnings`
    = help: to override `-D warnings` add `#[allow(clippy::iter_missing_exact_size)]`
 
-error: iterator can implement ExactSizeIterator
+error: iterator can implement `ExactSizeIterator`
   --> tests/ui/iter_missing_exact_size.rs:25:1
    |
 LL | / impl Iterator for StringRepeater2 {
 LL | |
 LL | |     type Item = String;
 LL | |     fn next(&mut self) -> Option<Self::Item> {
 ...  |
-LL | |         self.1.size_hint()
-   | |         ------------------ This size_hint() implementation delegates to the size_hint() of an ExactSizeIterator
-LL | |     }
 LL | | }
    | |_^
    |
-   = help: since size_hint() delegates to an ExactSizeIterator, the overall iterator is likely to have an exact size
+help: this `size_hint()` implementation delegates to to the `size_hint()` of an `ExactSizeIterator`, so the overall iterator is likely to have an exact size
+  --> tests/ui/iter_missing_exact_size.rs:32:9
+   |
+LL |         self.1.size_hint()
+   |         ^^^^^^^^^^^^^^^^^^
 
 error: aborting due to 2 previous errors