From ca741945f401d05d9fa2b7a535e1be7da03a5887 Mon Sep 17 00:00:00 2001 From: Nicholas Nethercote Date: Wed, 22 Nov 2023 08:53:45 +1100 Subject: [PATCH] Remove `indexes` module. It's not useful, and only obfuscates things. --- compiler/rustc_mir_dataflow/src/drop_flag_effects.rs | 3 +-- compiler/rustc_mir_dataflow/src/lib.rs | 4 ---- 2 files changed, 1 insertion(+), 6 deletions(-) diff --git a/compiler/rustc_mir_dataflow/src/drop_flag_effects.rs b/compiler/rustc_mir_dataflow/src/drop_flag_effects.rs index 163d74cc9cf..81c1a50a5dd 100644 --- a/compiler/rustc_mir_dataflow/src/drop_flag_effects.rs +++ b/compiler/rustc_mir_dataflow/src/drop_flag_effects.rs @@ -3,8 +3,7 @@ use rustc_middle::mir::{self, Body, Location, Terminator, TerminatorKind}; use rustc_middle::ty::TyCtxt; use rustc_target::abi::VariantIdx; -use super::indexes::MovePathIndex; -use super::move_paths::{InitKind, LookupResult, MoveData}; +use super::move_paths::{InitKind, LookupResult, MoveData, MovePathIndex}; use super::MoveDataParamEnv; pub fn move_path_children_matching<'tcx, F>( diff --git a/compiler/rustc_mir_dataflow/src/lib.rs b/compiler/rustc_mir_dataflow/src/lib.rs index b38a3a2b4b2..cb871ca8d5d 100644 --- a/compiler/rustc_mir_dataflow/src/lib.rs +++ b/compiler/rustc_mir_dataflow/src/lib.rs @@ -44,10 +44,6 @@ pub mod value_analysis; fluent_messages! { "../messages.ftl" } -pub(crate) mod indexes { - pub(crate) use super::move_paths::MovePathIndex; -} - pub struct MoveDataParamEnv<'tcx> { pub move_data: MoveData<'tcx>, pub param_env: ty::ParamEnv<'tcx>,