diff --git a/compiler/rustc_hir_analysis/src/check/_match.rs b/compiler/rustc_hir_typeck/src/_match.rs
similarity index 100%
rename from compiler/rustc_hir_analysis/src/check/_match.rs
rename to compiler/rustc_hir_typeck/src/_match.rs
diff --git a/compiler/rustc_hir_analysis/src/check/autoderef.rs b/compiler/rustc_hir_typeck/src/autoderef.rs
similarity index 100%
rename from compiler/rustc_hir_analysis/src/check/autoderef.rs
rename to compiler/rustc_hir_typeck/src/autoderef.rs
diff --git a/compiler/rustc_hir_analysis/src/check/callee.rs b/compiler/rustc_hir_typeck/src/callee.rs
similarity index 100%
rename from compiler/rustc_hir_analysis/src/check/callee.rs
rename to compiler/rustc_hir_typeck/src/callee.rs
diff --git a/compiler/rustc_hir_analysis/src/check/cast.rs b/compiler/rustc_hir_typeck/src/cast.rs
similarity index 100%
rename from compiler/rustc_hir_analysis/src/check/cast.rs
rename to compiler/rustc_hir_typeck/src/cast.rs
diff --git a/compiler/rustc_hir_analysis/src/check/closure.rs b/compiler/rustc_hir_typeck/src/closure.rs
similarity index 100%
rename from compiler/rustc_hir_analysis/src/check/closure.rs
rename to compiler/rustc_hir_typeck/src/closure.rs
diff --git a/compiler/rustc_hir_analysis/src/check/coercion.rs b/compiler/rustc_hir_typeck/src/coercion.rs
similarity index 100%
rename from compiler/rustc_hir_analysis/src/check/coercion.rs
rename to compiler/rustc_hir_typeck/src/coercion.rs
diff --git a/compiler/rustc_hir_analysis/src/check/demand.rs b/compiler/rustc_hir_typeck/src/demand.rs
similarity index 100%
rename from compiler/rustc_hir_analysis/src/check/demand.rs
rename to compiler/rustc_hir_typeck/src/demand.rs
diff --git a/compiler/rustc_hir_analysis/src/check/diverges.rs b/compiler/rustc_hir_typeck/src/diverges.rs
similarity index 100%
rename from compiler/rustc_hir_analysis/src/check/diverges.rs
rename to compiler/rustc_hir_typeck/src/diverges.rs
diff --git a/compiler/rustc_hir_analysis/src/check/expectation.rs b/compiler/rustc_hir_typeck/src/expectation.rs
similarity index 100%
rename from compiler/rustc_hir_analysis/src/check/expectation.rs
rename to compiler/rustc_hir_typeck/src/expectation.rs
diff --git a/compiler/rustc_hir_analysis/src/check/expr.rs b/compiler/rustc_hir_typeck/src/expr.rs
similarity index 100%
rename from compiler/rustc_hir_analysis/src/check/expr.rs
rename to compiler/rustc_hir_typeck/src/expr.rs
diff --git a/compiler/rustc_hir_analysis/src/expr_use_visitor.rs b/compiler/rustc_hir_typeck/src/expr_use_visitor.rs
similarity index 100%
rename from compiler/rustc_hir_analysis/src/expr_use_visitor.rs
rename to compiler/rustc_hir_typeck/src/expr_use_visitor.rs
diff --git a/compiler/rustc_hir_analysis/src/check/fallback.rs b/compiler/rustc_hir_typeck/src/fallback.rs
similarity index 100%
rename from compiler/rustc_hir_analysis/src/check/fallback.rs
rename to compiler/rustc_hir_typeck/src/fallback.rs
diff --git a/compiler/rustc_hir_analysis/src/check/fn_ctxt/_impl.rs b/compiler/rustc_hir_typeck/src/fn_ctxt/_impl.rs
similarity index 100%
rename from compiler/rustc_hir_analysis/src/check/fn_ctxt/_impl.rs
rename to compiler/rustc_hir_typeck/src/fn_ctxt/_impl.rs
diff --git a/compiler/rustc_hir_analysis/src/check/fn_ctxt/arg_matrix.rs b/compiler/rustc_hir_typeck/src/fn_ctxt/arg_matrix.rs
similarity index 100%
rename from compiler/rustc_hir_analysis/src/check/fn_ctxt/arg_matrix.rs
rename to compiler/rustc_hir_typeck/src/fn_ctxt/arg_matrix.rs
diff --git a/compiler/rustc_hir_analysis/src/check/fn_ctxt/checks.rs b/compiler/rustc_hir_typeck/src/fn_ctxt/checks.rs
similarity index 100%
rename from compiler/rustc_hir_analysis/src/check/fn_ctxt/checks.rs
rename to compiler/rustc_hir_typeck/src/fn_ctxt/checks.rs
diff --git a/compiler/rustc_hir_analysis/src/check/fn_ctxt/mod.rs b/compiler/rustc_hir_typeck/src/fn_ctxt/mod.rs
similarity index 100%
rename from compiler/rustc_hir_analysis/src/check/fn_ctxt/mod.rs
rename to compiler/rustc_hir_typeck/src/fn_ctxt/mod.rs
diff --git a/compiler/rustc_hir_analysis/src/check/fn_ctxt/suggestions.rs b/compiler/rustc_hir_typeck/src/fn_ctxt/suggestions.rs
similarity index 100%
rename from compiler/rustc_hir_analysis/src/check/fn_ctxt/suggestions.rs
rename to compiler/rustc_hir_typeck/src/fn_ctxt/suggestions.rs
diff --git a/compiler/rustc_hir_analysis/src/check/gather_locals.rs b/compiler/rustc_hir_typeck/src/gather_locals.rs
similarity index 100%
rename from compiler/rustc_hir_analysis/src/check/gather_locals.rs
rename to compiler/rustc_hir_typeck/src/gather_locals.rs
diff --git a/compiler/rustc_hir_analysis/src/check/generator_interior/drop_ranges/cfg_build.rs b/compiler/rustc_hir_typeck/src/generator_interior/drop_ranges/cfg_build.rs
similarity index 100%
rename from compiler/rustc_hir_analysis/src/check/generator_interior/drop_ranges/cfg_build.rs
rename to compiler/rustc_hir_typeck/src/generator_interior/drop_ranges/cfg_build.rs
diff --git a/compiler/rustc_hir_analysis/src/check/generator_interior/drop_ranges/cfg_propagate.rs b/compiler/rustc_hir_typeck/src/generator_interior/drop_ranges/cfg_propagate.rs
similarity index 100%
rename from compiler/rustc_hir_analysis/src/check/generator_interior/drop_ranges/cfg_propagate.rs
rename to compiler/rustc_hir_typeck/src/generator_interior/drop_ranges/cfg_propagate.rs
diff --git a/compiler/rustc_hir_analysis/src/check/generator_interior/drop_ranges/cfg_visualize.rs b/compiler/rustc_hir_typeck/src/generator_interior/drop_ranges/cfg_visualize.rs
similarity index 100%
rename from compiler/rustc_hir_analysis/src/check/generator_interior/drop_ranges/cfg_visualize.rs
rename to compiler/rustc_hir_typeck/src/generator_interior/drop_ranges/cfg_visualize.rs
diff --git a/compiler/rustc_hir_analysis/src/check/generator_interior/drop_ranges.rs b/compiler/rustc_hir_typeck/src/generator_interior/drop_ranges/mod.rs
similarity index 100%
rename from compiler/rustc_hir_analysis/src/check/generator_interior/drop_ranges.rs
rename to compiler/rustc_hir_typeck/src/generator_interior/drop_ranges/mod.rs
diff --git a/compiler/rustc_hir_analysis/src/check/generator_interior/drop_ranges/record_consumed_borrow.rs b/compiler/rustc_hir_typeck/src/generator_interior/drop_ranges/record_consumed_borrow.rs
similarity index 100%
rename from compiler/rustc_hir_analysis/src/check/generator_interior/drop_ranges/record_consumed_borrow.rs
rename to compiler/rustc_hir_typeck/src/generator_interior/drop_ranges/record_consumed_borrow.rs
diff --git a/compiler/rustc_hir_analysis/src/check/generator_interior.rs b/compiler/rustc_hir_typeck/src/generator_interior/mod.rs
similarity index 100%
rename from compiler/rustc_hir_analysis/src/check/generator_interior.rs
rename to compiler/rustc_hir_typeck/src/generator_interior/mod.rs
diff --git a/compiler/rustc_hir_analysis/src/check/inherited.rs b/compiler/rustc_hir_typeck/src/inherited.rs
similarity index 100%
rename from compiler/rustc_hir_analysis/src/check/inherited.rs
rename to compiler/rustc_hir_typeck/src/inherited.rs
diff --git a/compiler/rustc_hir_analysis/src/mem_categorization.rs b/compiler/rustc_hir_typeck/src/mem_categorization.rs
similarity index 100%
rename from compiler/rustc_hir_analysis/src/mem_categorization.rs
rename to compiler/rustc_hir_typeck/src/mem_categorization.rs
diff --git a/compiler/rustc_hir_analysis/src/check/method/confirm.rs b/compiler/rustc_hir_typeck/src/method/confirm.rs
similarity index 100%
rename from compiler/rustc_hir_analysis/src/check/method/confirm.rs
rename to compiler/rustc_hir_typeck/src/method/confirm.rs
diff --git a/compiler/rustc_hir_analysis/src/check/method/mod.rs b/compiler/rustc_hir_typeck/src/method/mod.rs
similarity index 100%
rename from compiler/rustc_hir_analysis/src/check/method/mod.rs
rename to compiler/rustc_hir_typeck/src/method/mod.rs
diff --git a/compiler/rustc_hir_analysis/src/check/method/prelude2021.rs b/compiler/rustc_hir_typeck/src/method/prelude2021.rs
similarity index 100%
rename from compiler/rustc_hir_analysis/src/check/method/prelude2021.rs
rename to compiler/rustc_hir_typeck/src/method/prelude2021.rs
diff --git a/compiler/rustc_hir_analysis/src/check/method/probe.rs b/compiler/rustc_hir_typeck/src/method/probe.rs
similarity index 100%
rename from compiler/rustc_hir_analysis/src/check/method/probe.rs
rename to compiler/rustc_hir_typeck/src/method/probe.rs
diff --git a/compiler/rustc_hir_analysis/src/check/method/suggest.rs b/compiler/rustc_hir_typeck/src/method/suggest.rs
similarity index 100%
rename from compiler/rustc_hir_analysis/src/check/method/suggest.rs
rename to compiler/rustc_hir_typeck/src/method/suggest.rs
diff --git a/compiler/rustc_hir_analysis/src/check/op.rs b/compiler/rustc_hir_typeck/src/op.rs
similarity index 100%
rename from compiler/rustc_hir_analysis/src/check/op.rs
rename to compiler/rustc_hir_typeck/src/op.rs
diff --git a/compiler/rustc_hir_analysis/src/check/pat.rs b/compiler/rustc_hir_typeck/src/pat.rs
similarity index 100%
rename from compiler/rustc_hir_analysis/src/check/pat.rs
rename to compiler/rustc_hir_typeck/src/pat.rs
diff --git a/compiler/rustc_hir_analysis/src/check/place_op.rs b/compiler/rustc_hir_typeck/src/place_op.rs
similarity index 100%
rename from compiler/rustc_hir_analysis/src/check/place_op.rs
rename to compiler/rustc_hir_typeck/src/place_op.rs
diff --git a/compiler/rustc_hir_analysis/src/check/rvalue_scopes.rs b/compiler/rustc_hir_typeck/src/rvalue_scopes.rs
similarity index 100%
rename from compiler/rustc_hir_analysis/src/check/rvalue_scopes.rs
rename to compiler/rustc_hir_typeck/src/rvalue_scopes.rs
diff --git a/compiler/rustc_hir_analysis/src/check/upvar.rs b/compiler/rustc_hir_typeck/src/upvar.rs
similarity index 100%
rename from compiler/rustc_hir_analysis/src/check/upvar.rs
rename to compiler/rustc_hir_typeck/src/upvar.rs
diff --git a/compiler/rustc_hir_analysis/src/check/writeback.rs b/compiler/rustc_hir_typeck/src/writeback.rs
similarity index 100%
rename from compiler/rustc_hir_analysis/src/check/writeback.rs
rename to compiler/rustc_hir_typeck/src/writeback.rs