Merge remote-tracking branch 'origin/master' into 8282-single-match

diff --cc clippy_lints/src/matches.rs
index be9eff4237bab047ca840bebbd7b6ad6aa532e40,017e4a33980e41abee285321bc9cd975d24f762a..dc6e4f96969d46d0dc476506de531e4e82915f78
--- 1/clippy_lints/src/matches.rs
--- 2/clippy_lints/src/matches.rs
+++ b/clippy_lints/src/matches.rs
@@@ -30,8 -30,8 +30,8 @@@ use rustc_middle::ty::{self, Ty, TyS, V
  use rustc_semver::RustcVersion;
  use rustc_session::{declare_tool_lint, impl_lint_pass};
  use rustc_span::source_map::{Span, Spanned};
- use rustc_span::sym;
+ use rustc_span::{sym, symbol::kw};
 -use std::cmp::Ordering;
 +use std::cmp::{max, Ordering};
  use std::collections::hash_map::Entry;
  
  declare_clippy_lint! {