Merge commit '0e87918536b9833bbc6c683d1f9d51ee2bf03ef1' into clippyup

2021-03-25 19:29:11 +01:00
parent e06731bb28
commit 9f6b5de7de
412 changed files with 5715 additions and 2849 deletions
--- a/clippy_lints/src/loops/empty_loop.rs
+++ b/clippy_lints/src/loops/empty_loop.rs
@@ -1,5 +1,6 @@
 use super::EMPTY_LOOP;
-use crate::utils::{is_in_panic_handler, is_no_std_crate, span_lint_and_help};
+use clippy_utils::diagnostics::span_lint_and_help;
+use clippy_utils::{is_in_panic_handler, is_no_std_crate};

 use rustc_hir::{Block, Expr};
 use rustc_lint::LateContext;