compiler: unnest rustc_const_eval::check_consts

abao168899 · May 24, 2024 · 87048a4 · 87048a4
1 parent db6ec26
commit 87048a4
Show file tree

Hide file tree

Showing 10 changed files with 3 additions and 4 deletions.
diff --git a/..._eval/src/transform/check_consts/check.rs → ...ustc_const_eval/src/check_consts/check.rs b/..._eval/src/transform/check_consts/check.rs → ...ustc_const_eval/src/check_consts/check.rs
diff --git a/...st_eval/src/transform/check_consts/mod.rs → .../rustc_const_eval/src/check_consts/mod.rs b/...st_eval/src/transform/check_consts/mod.rs → .../rustc_const_eval/src/check_consts/mod.rs
diff --git a/...st_eval/src/transform/check_consts/ops.rs → .../rustc_const_eval/src/check_consts/ops.rs b/...st_eval/src/transform/check_consts/ops.rs → .../rustc_const_eval/src/check_consts/ops.rs
diff --git a/...orm/check_consts/post_drop_elaboration.rs → ...src/check_consts/post_drop_elaboration.rs b/...orm/check_consts/post_drop_elaboration.rs → ...src/check_consts/post_drop_elaboration.rs
diff --git a/...val/src/transform/check_consts/qualifs.rs → ...tc_const_eval/src/check_consts/qualifs.rs b/...val/src/transform/check_consts/qualifs.rs → ...tc_const_eval/src/check_consts/qualifs.rs
diff --git a/...al/src/transform/check_consts/resolver.rs → ...c_const_eval/src/check_consts/resolver.rs b/...al/src/transform/check_consts/resolver.rs → ...c_const_eval/src/check_consts/resolver.rs
diff --git a/compiler/rustc_const_eval/src/lib.rs b/compiler/rustc_const_eval/src/lib.rs
@@ -14,10 +14,10 @@
 #![feature(yeet_expr)]
 #![feature(if_let_guard)]
 
+pub mod check_consts;
 pub mod const_eval;
 mod errors;
 pub mod interpret;
-pub mod transform;
 pub mod util;
 
 use std::sync::atomic::AtomicBool;

diff --git a/compiler/rustc_const_eval/src/transform/mod.rs b/compiler/rustc_const_eval/src/transform/mod.rs
diff --git a/compiler/rustc_mir_transform/src/lib.rs b/compiler/rustc_mir_transform/src/lib.rs
@@ -111,7 +111,7 @@ mod unreachable_enum_branching;
 mod unreachable_prop;
 mod validate;
 
-use rustc_const_eval::transform::check_consts::{self, ConstCx};
+use rustc_const_eval::check_consts::{self, ConstCx};
 use rustc_mir_dataflow::rustc_peek;
 
 rustc_fluent_macro::fluent_messages! { "../messages.ftl" }

diff --git a/compiler/rustc_mir_transform/src/promote_consts.rs b/compiler/rustc_mir_transform/src/promote_consts.rs
@@ -30,7 +30,7 @@ use std::assert_matches::assert_matches;
 use std::cell::Cell;
 use std::{cmp, iter, mem};
 
-use rustc_const_eval::transform::check_consts::{qualifs, ConstCx};
+use rustc_const_eval::check_consts::{qualifs, ConstCx};
 
 /// A `MirPass` for promotion.
 ///