use_self - use snippet_opt

Author: tnielens

clippy_lints/src/use_self.rs

@@ -12,11 +12,11 @@ use rustc_middle::hir::map::Map;
 use rustc_middle::lint::in_external_macro;
 use rustc_middle::ty;
 use rustc_middle::ty::Ty;
-use rustc_middle::ty::TyCtxt;
 use rustc_session::{declare_lint_pass, declare_tool_lint};
 use rustc_span::{BytePos, Span};
 use rustc_typeck::hir_ty_to_ty;
 
+use crate::utils::snippet_opt;
 use crate::utils::span_lint_and_sugg;
 
 declare_clippy_lint! {
@@ -72,7 +72,7 @@ fn span_lint<'a, 'tcx>(cx: &LateContext<'a, 'tcx>, span: Span) {
 
 fn span_lint_ignore_last_segment<'a, 'tcx>(cx: &LateContext<'a, 'tcx>, path: &'tcx Path<'tcx>) {
     if path.segments.len() > 1 {
-        span_lint(cx, truncate_last_segment(cx.tcx, path.span))
+        span_lint(cx, truncate_last_segment(cx, path.span))
     }
 }
 
@@ -89,13 +89,13 @@ fn span_lint_on_qpath_resolved<'a, 'tcx>(cx: &LateContext<'a, 'tcx>, qpath: &'tc
     };
 }
 
-fn truncate_last_segment<'tcx>(tcx: TyCtxt<'tcx>, sp: Span) -> Span {
-    match tcx.sess.source_map().span_to_snippet(sp) {
-        Ok(snippet) => match snippet.rfind("::") {
+fn truncate_last_segment<'a, 'tcx>(cx: &LateContext<'a, 'tcx>, sp: Span) -> Span {
+    match snippet_opt(cx, sp) {
+        Some(snippet) => match snippet.rfind("::") {
             Some(bidx) => sp.with_hi(sp.lo() + BytePos(bidx as u32)),
             None => sp,
         },
-        _ => sp,
+        None => sp,
     }
 }
 
@@ -174,7 +174,7 @@ impl<'a, 'tcx> Visitor<'tcx> for ImplVisitor<'a, 'tcx> {
                             // @flip1995 found an ast lowering issue in
                             // https://github.com/rust-lang/rust/blob/master/src/librustc_ast_lowering/path.rs#L142-L162
                             {
-                                span_lint(self.cx, truncate_last_segment(self.cx.tcx, hir_ty.span))
+                                span_lint(self.cx, truncate_last_segment(self.cx, hir_ty.span))
                             },
                             _ => span_lint(self.cx, hir_ty.span),
                         }