diff options
| author | Nicholas Nethercote <n.nethercote@gmail.com> | 2024-03-06 17:24:13 +1100 |
|---|---|---|
| committer | Nicholas Nethercote <n.nethercote@gmail.com> | 2024-04-16 16:29:15 +1000 |
| commit | 0aea3edb3864c25dd80987810653f96118770a3e (patch) | |
| tree | 41da7a021d769ba9134afcbf19f9b3c215a80e7e /clippy_lints/src/index_refutable_slice.rs | |
| parent | c0bc81222785d078cbd29efeb2086ff2638ef819 (diff) | |
| download | rust-0aea3edb3864c25dd80987810653f96118770a3e.tar.gz rust-0aea3edb3864c25dd80987810653f96118770a3e.zip | |
Avoid lots of `hir::HirId{,Map,Set}` qualifiers.
Because they're a bit redundant.
Diffstat (limited to 'clippy_lints/src/index_refutable_slice.rs')
| -rw-r--r-- | clippy_lints/src/index_refutable_slice.rs | 13 |
1 files changed, 7 insertions, 6 deletions
diff --git a/clippy_lints/src/index_refutable_slice.rs b/clippy_lints/src/index_refutable_slice.rs index 4d1f89b1d9d..6ddc8346511 100644 --- a/clippy_lints/src/index_refutable_slice.rs +++ b/clippy_lints/src/index_refutable_slice.rs @@ -7,6 +7,7 @@ use clippy_utils::{is_expn_of, is_lint_allowed, path_to_local}; use rustc_data_structures::fx::{FxHashSet, FxIndexMap}; use rustc_errors::Applicability; use rustc_hir as hir; +use rustc_hir::HirId; use rustc_hir::intravisit::{self, Visitor}; use rustc_lint::{LateContext, LateLintPass}; use rustc_middle::hir::nested_filter; @@ -87,9 +88,9 @@ impl<'tcx> LateLintPass<'tcx> for IndexRefutableSlice { extract_msrv_attr!(LateContext); } -fn find_slice_values(cx: &LateContext<'_>, pat: &hir::Pat<'_>) -> FxIndexMap<hir::HirId, SliceLintInformation> { - let mut removed_pat: FxHashSet<hir::HirId> = FxHashSet::default(); - let mut slices: FxIndexMap<hir::HirId, SliceLintInformation> = FxIndexMap::default(); +fn find_slice_values(cx: &LateContext<'_>, pat: &hir::Pat<'_>) -> FxIndexMap<HirId, SliceLintInformation> { + let mut removed_pat: FxHashSet<HirId> = FxHashSet::default(); + let mut slices: FxIndexMap<HirId, SliceLintInformation> = FxIndexMap::default(); pat.walk_always(|pat| { // We'll just ignore mut and ref mut for simplicity sake right now if let hir::PatKind::Binding( @@ -206,10 +207,10 @@ impl SliceLintInformation { fn filter_lintable_slices<'tcx>( cx: &LateContext<'tcx>, - slice_lint_info: FxIndexMap<hir::HirId, SliceLintInformation>, + slice_lint_info: FxIndexMap<HirId, SliceLintInformation>, max_suggested_slice: u64, scope: &'tcx hir::Expr<'tcx>, -) -> FxIndexMap<hir::HirId, SliceLintInformation> { +) -> FxIndexMap<HirId, SliceLintInformation> { let mut visitor = SliceIndexLintingVisitor { cx, slice_lint_info, @@ -223,7 +224,7 @@ fn filter_lintable_slices<'tcx>( struct SliceIndexLintingVisitor<'a, 'tcx> { cx: &'a LateContext<'tcx>, - slice_lint_info: FxIndexMap<hir::HirId, SliceLintInformation>, + slice_lint_info: FxIndexMap<HirId, SliceLintInformation>, max_suggested_slice: u64, } |
