Skip to content
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.

Commit eff958c

Browse files
committedMar 22, 2024
Auto merge of rust-lang#120926 - fmease:astconv-no-mo, r=oli-obk
[MCP 723] Rename `astconv::AstConv` and related items See rust-lang/compiler-team#723. Corresponding rustc-dev-guide PR: rust-lang/rustc-dev-guide#1916. Please consult the following *normative* list of changes here: https://fmease.dev/rustc-dev/astconv-no-mo.html ([2024-03-22 archive link](https://web.archive.org/web/20240322054711/https://fmease.dev/rustc-dev/astconv-no-mo.html)).
2 parents eb80be2 + 5e73a8b commit eff958c

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

57 files changed

+875
-830
lines changed
 

‎compiler/rustc_hir_analysis/src/check/region.rs

+1-1
Original file line numberDiff line numberDiff line change
@@ -760,7 +760,7 @@ impl<'tcx> RegionResolutionVisitor<'tcx> {
760760

761761
fn enter_node_scope_with_dtor(&mut self, id: hir::ItemLocalId) {
762762
// If node was previously marked as a terminating scope during the
763-
// recursive visit of its parent node in the AST, then we need to
763+
// recursive visit of its parent node in the HIR, then we need to
764764
// account for the destruction scope representing the scope of
765765
// the destructors that run immediately after it completes.
766766
if self.terminating_scopes.contains(&id) {

‎compiler/rustc_hir_analysis/src/check/wfcheck.rs

+2-2
Original file line numberDiff line numberDiff line change
@@ -272,7 +272,7 @@ fn check_item<'tcx>(tcx: TyCtxt<'tcx>, item: &'tcx hir::Item<'tcx>) -> Result<()
272272
}
273273
Some(ty::ImplPolarity::Negative) => {
274274
let ast::ImplPolarity::Negative(span) = impl_.polarity else {
275-
bug!("impl_polarity query disagrees with impl's polarity in AST");
275+
bug!("impl_polarity query disagrees with impl's polarity in HIR");
276276
};
277277
// FIXME(#27579): what amount of WF checking do we need for neg impls?
278278
if let hir::Defaultness::Default { .. } = impl_.defaultness {
@@ -1866,7 +1866,7 @@ fn check_variances_for_type_defn<'tcx>(
18661866
.iter()
18671867
.filter_map(|predicate| match predicate {
18681868
hir::WherePredicate::BoundPredicate(predicate) => {
1869-
match icx.to_ty(predicate.bounded_ty).kind() {
1869+
match icx.lower_ty(predicate.bounded_ty).kind() {
18701870
ty::Param(data) => Some(Parameter(data.index)),
18711871
_ => None,
18721872
}
There was a problem loading the remainder of the diff.

0 commit comments

Comments
 (0)
Failed to load comments.