Mirrors/rust-clippy
2
0
Fork 0
mirror of https://github.com/rust-lang/rust-clippy synced 2024-11-27 15:11:30 +00:00
Code Issues Projects Releases Packages Wiki Activity

Auto merge of #99334 - NiklasJonsson:84447/error-privacy, r=oli-obk

Browse source 
rustc_error, rustc_private: Switch to stable hash containers

Relates https://github.com/rust-lang/rust/issues/84447
This commit is contained in:
bors 2022-09-12 15:57:37 +00:00
commit 4e313a50b2
1 changed files with 3 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

7
clippy_lints/src/matches/match_same_arms.rs
View file

@ -8,11 +8,10 @@ use rustc_arena::DroplessArena;
use rustc_ast::ast::LitKind; use rustc_ast::ast::LitKind;
use rustc_errors::Applicability; use rustc_errors::Applicability;
use rustc_hir::def_id::DefId; use rustc_hir::def_id::DefId;
use rustc_hir::{Arm, Expr, ExprKind, HirId, HirIdMap, HirIdSet, Pat, PatKind, RangeEnd}; use rustc_hir::{Arm, Expr, ExprKind, HirId, HirIdMap, HirIdMapEntry, HirIdSet, Pat, PatKind, RangeEnd};
use rustc_lint::LateContext; use rustc_lint::LateContext;
use rustc_middle::ty; use rustc_middle::ty;
use rustc_span::Symbol; use rustc_span::Symbol;
use std::collections::hash_map::Entry;
use super::MATCH_SAME_ARMS; use super::MATCH_SAME_ARMS;
@ -71,9 +70,9 @@ pub(super) fn check<'tcx>(cx: &LateContext<'tcx>, arms: &'tcx [Arm<'_>]) {
if let Some(a_id) = path_to_local(a); if let Some(a_id) = path_to_local(a);
if let Some(b_id) = path_to_local(b); if let Some(b_id) = path_to_local(b);
let entry = match local_map.entry(a_id) { let entry = match local_map.entry(a_id) {
Entry::Vacant(entry) => entry, HirIdMapEntry::Vacant(entry) => entry,
// check if using the same bindings as before // check if using the same bindings as before
Entry::Occupied(entry) => return *entry.get() == b_id, HirIdMapEntry::Occupied(entry) => return *entry.get() == b_id,
}; };
// the names technically don't have to match; this makes the lint more conservative // the names technically don't have to match; this makes the lint more conservative
if cx.tcx.hir().name(a_id) == cx.tcx.hir().name(b_id); if cx.tcx.hir().name(a_id) == cx.tcx.hir().name(b_id);