clippy lints

Author: ChrisDenton

src/tools/clippy/clippy_lints/src/lifetimes.rs

@@ -599,15 +599,15 @@ fn has_where_lifetimes<'tcx>(cx: &LateContext<'tcx>, generics: &'tcx Generics<'_
 struct LifetimeChecker<'cx, 'tcx, F> {
     cx: &'cx LateContext<'tcx>,
     map: FxHashMap<Symbol, Span>,
-    phantom: std::marker::PhantomData<F>,
+    phantom: PhantomData<F>,
 }
 
 impl<'cx, 'tcx, F> LifetimeChecker<'cx, 'tcx, F> {
     fn new(cx: &'cx LateContext<'tcx>, map: FxHashMap<Symbol, Span>) -> LifetimeChecker<'cx, 'tcx, F> {
         Self {
             cx,
             map,
-            phantom: std::marker::PhantomData,
+            phantom: PhantomData,
         }
     }
 }

src/tools/clippy/clippy_lints/src/zero_repeat_side_effects.rs

@@ -68,9 +68,9 @@ fn inner_check(cx: &LateContext<'_>, expr: &'_ rustc_hir::Expr<'_>, inner_expr:
     // check if expr is a call or has a call inside it
     if for_each_expr(inner_expr, |x| {
         if let ExprKind::Call(_, _) | ExprKind::MethodCall(_, _, _, _) = x.kind {
-            std::ops::ControlFlow::Break(())
+            ControlFlow::Break(())
         } else {
-            std::ops::ControlFlow::Continue(())
+            ControlFlow::Continue(())
         }
     })
     .is_some()