-use crate::{
- map_unit_fn::OPTION_MAP_UNIT_FN,
- matches::MATCH_AS_REF,
- utils::{
- can_partially_move_ty, is_allowed, is_type_diagnostic_item, match_def_path, match_var, paths,
- peel_hir_expr_refs, peel_mid_ty_refs_is_mutable, snippet_with_applicability, snippet_with_context,
- span_lint_and_sugg,
- },
-};
+use crate::{map_unit_fn::OPTION_MAP_UNIT_FN, matches::MATCH_AS_REF};
+use clippy_utils::diagnostics::span_lint_and_sugg;
+use clippy_utils::source::{snippet_with_applicability, snippet_with_context};
+use clippy_utils::ty::{can_partially_move_ty, is_type_diagnostic_item, peel_mid_ty_refs_is_mutable};
+use clippy_utils::{is_allowed, is_else_clause_of_if_let_else, match_def_path, match_var, paths, peel_hir_expr_refs};