Rollup merge of rust-lang#116596 - lcnr:normalize-subdir, r=compiler-…

…errors reorder files in solve r? `@compiler-errors`
rust-lang-ci · Oct 10, 2023 · da42858 · da42858
2 parents de4980c + c70ef36
commit da42858
Show file tree

Hide file tree

Showing 7 changed files with 5 additions and 4 deletions.
diff --git a/...tc_trait_selection/src/solve/eval_ctxt.rs → ...rait_selection/src/solve/eval_ctxt/mod.rs b/...tc_trait_selection/src/solve/eval_ctxt.rs → ...rait_selection/src/solve/eval_ctxt/mod.rs
diff --git a/compiler/rustc_trait_selection/src/solve/mod.rs b/compiler/rustc_trait_selection/src/solve/mod.rs
@@ -32,14 +32,11 @@ mod assembly;
 mod canonicalize;
 mod eval_ctxt;
 mod fulfill;
-mod inherent_projection;
 pub mod inspect;
 mod normalize;
-mod opaques;
 mod project_goals;
 mod search_graph;
 mod trait_goals;
-mod weak_types;
 
 pub use eval_ctxt::{
     EvalCtxt, GenerateProofTree, InferCtxtEvalExt, InferCtxtSelectExt, UseGlobalCache,

diff --git a/...election/src/solve/inherent_projection.rs → ...olve/project_goals/inherent_projection.rs b/...election/src/solve/inherent_projection.rs → ...olve/project_goals/inherent_projection.rs
diff --git a/...rait_selection/src/solve/project_goals.rs → ..._selection/src/solve/project_goals/mod.rs b/...rait_selection/src/solve/project_goals.rs → ..._selection/src/solve/project_goals/mod.rs
@@ -18,6 +18,10 @@ use rustc_middle::ty::{self, Ty, TyCtxt};
 use rustc_middle::ty::{ToPredicate, TypeVisitableExt};
 use rustc_span::{sym, ErrorGuaranteed, DUMMY_SP};
 
+mod inherent_projection;
+mod opaques;
+mod weak_types;
+
 impl<'tcx> EvalCtxt<'_, 'tcx> {
     #[instrument(level = "debug", skip(self), ret)]
     pub(super) fn compute_projection_goal(

diff --git a/...ustc_trait_selection/src/solve/opaques.rs → ...ection/src/solve/project_goals/opaques.rs b/...ustc_trait_selection/src/solve/opaques.rs → ...ection/src/solve/project_goals/opaques.rs
@@ -7,7 +7,7 @@ use rustc_middle::traits::Reveal;
 use rustc_middle::ty;
 use rustc_middle::ty::util::NotUniqueParam;
 
-use super::{EvalCtxt, SolverMode};
+use crate::solve::{EvalCtxt, SolverMode};
 
 impl<'tcx> EvalCtxt<'_, 'tcx> {
     pub(super) fn normalize_opaque_type(

diff --git a/...c_trait_selection/src/solve/weak_types.rs → ...ion/src/solve/project_goals/weak_types.rs b/...c_trait_selection/src/solve/weak_types.rs → ...ion/src/solve/project_goals/weak_types.rs
diff --git a/...t_selection/src/solve/search_graph/mod.rs → ...trait_selection/src/solve/search_graph.rs b/...t_selection/src/solve/search_graph/mod.rs → ...trait_selection/src/solve/search_graph.rs