From 35d4d4ca149c8aa8ed2eca221a56612d35b6c7f9 Mon Sep 17 00:00:00 2001 From: Ralf Jung Date: Sat, 24 Jul 2021 13:16:59 +0200 Subject: [PATCH 1/2] rename const checking visitor module to check_consts::check --- .../src/transform/check_consts/{validation.rs => check.rs} | 0 compiler/rustc_mir/src/transform/check_consts/mod.rs | 2 +- .../src/transform/check_consts/post_drop_elaboration.rs | 2 +- compiler/rustc_mir/src/transform/mod.rs | 2 +- 4 files changed, 3 insertions(+), 3 deletions(-) rename compiler/rustc_mir/src/transform/check_consts/{validation.rs => check.rs} (100%) diff --git a/compiler/rustc_mir/src/transform/check_consts/validation.rs b/compiler/rustc_mir/src/transform/check_consts/check.rs similarity index 100% rename from compiler/rustc_mir/src/transform/check_consts/validation.rs rename to compiler/rustc_mir/src/transform/check_consts/check.rs diff --git a/compiler/rustc_mir/src/transform/check_consts/mod.rs b/compiler/rustc_mir/src/transform/check_consts/mod.rs index 19aee033a6923..0ca086d74db7b 100644 --- a/compiler/rustc_mir/src/transform/check_consts/mod.rs +++ b/compiler/rustc_mir/src/transform/check_consts/mod.rs @@ -13,11 +13,11 @@ use rustc_span::Symbol; pub use self::qualifs::Qualif; +pub mod check; mod ops; pub mod post_drop_elaboration; pub mod qualifs; mod resolver; -pub mod validation; /// Information about the item currently being const-checked, as well as a reference to the global /// context. diff --git a/compiler/rustc_mir/src/transform/check_consts/post_drop_elaboration.rs b/compiler/rustc_mir/src/transform/check_consts/post_drop_elaboration.rs index 057092b8ef574..b08ce219034ce 100644 --- a/compiler/rustc_mir/src/transform/check_consts/post_drop_elaboration.rs +++ b/compiler/rustc_mir/src/transform/check_consts/post_drop_elaboration.rs @@ -3,9 +3,9 @@ use rustc_middle::mir::{self, BasicBlock, Location}; use rustc_middle::ty::TyCtxt; use rustc_span::Span; +use super::check::Qualifs; use super::ops::{self, NonConstOp}; use super::qualifs::{NeedsDrop, Qualif}; -use super::validation::Qualifs; use super::ConstCx; /// Returns `true` if we should use the more precise live drop checker that runs after drop diff --git a/compiler/rustc_mir/src/transform/mod.rs b/compiler/rustc_mir/src/transform/mod.rs index 5c201594ddd89..9da2660dbad68 100644 --- a/compiler/rustc_mir/src/transform/mod.rs +++ b/compiler/rustc_mir/src/transform/mod.rs @@ -240,7 +240,7 @@ fn mir_const_qualif(tcx: TyCtxt<'_>, def: ty::WithOptConstParam) -> let ccx = check_consts::ConstCx { body, tcx, const_kind, param_env: tcx.param_env(def.did) }; - let mut validator = check_consts::validation::Validator::new(&ccx); + let mut validator = check_consts::check::Validator::new(&ccx); validator.check_body(); // We return the qualifs in the return place for every MIR body, even though it is only used From 83bc657e254cc3e35ca704864c17abac6d618e18 Mon Sep 17 00:00:00 2001 From: Ralf Jung Date: Sat, 24 Jul 2021 13:27:17 +0200 Subject: [PATCH 2/2] =?UTF-8?q?rename=20Validator=20=E2=86=92=20Checker?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- compiler/rustc_mir/src/transform/check_consts/check.rs | 10 +++++----- compiler/rustc_mir/src/transform/mod.rs | 2 +- 2 files changed, 6 insertions(+), 6 deletions(-) diff --git a/compiler/rustc_mir/src/transform/check_consts/check.rs b/compiler/rustc_mir/src/transform/check_consts/check.rs index cfc538ef500a1..cff386f776beb 100644 --- a/compiler/rustc_mir/src/transform/check_consts/check.rs +++ b/compiler/rustc_mir/src/transform/check_consts/check.rs @@ -180,7 +180,7 @@ impl Qualifs<'mir, 'tcx> { } } -pub struct Validator<'mir, 'tcx> { +pub struct Checker<'mir, 'tcx> { ccx: &'mir ConstCx<'mir, 'tcx>, qualifs: Qualifs<'mir, 'tcx>, @@ -194,7 +194,7 @@ pub struct Validator<'mir, 'tcx> { secondary_errors: Vec, } -impl Deref for Validator<'mir, 'tcx> { +impl Deref for Checker<'mir, 'tcx> { type Target = ConstCx<'mir, 'tcx>; fn deref(&self) -> &Self::Target { @@ -202,9 +202,9 @@ impl Deref for Validator<'mir, 'tcx> { } } -impl Validator<'mir, 'tcx> { +impl Checker<'mir, 'tcx> { pub fn new(ccx: &'mir ConstCx<'mir, 'tcx>) -> Self { - Validator { + Checker { span: ccx.body.span, ccx, qualifs: Default::default(), @@ -477,7 +477,7 @@ impl Validator<'mir, 'tcx> { } } -impl Visitor<'tcx> for Validator<'mir, 'tcx> { +impl Visitor<'tcx> for Checker<'mir, 'tcx> { fn visit_basic_block_data(&mut self, bb: BasicBlock, block: &BasicBlockData<'tcx>) { trace!("visit_basic_block_data: bb={:?} is_cleanup={:?}", bb, block.is_cleanup); diff --git a/compiler/rustc_mir/src/transform/mod.rs b/compiler/rustc_mir/src/transform/mod.rs index 9da2660dbad68..dbf12e6d76f89 100644 --- a/compiler/rustc_mir/src/transform/mod.rs +++ b/compiler/rustc_mir/src/transform/mod.rs @@ -240,7 +240,7 @@ fn mir_const_qualif(tcx: TyCtxt<'_>, def: ty::WithOptConstParam) -> let ccx = check_consts::ConstCx { body, tcx, const_kind, param_env: tcx.param_env(def.did) }; - let mut validator = check_consts::check::Validator::new(&ccx); + let mut validator = check_consts::check::Checker::new(&ccx); validator.check_body(); // We return the qualifs in the return place for every MIR body, even though it is only used