Skip to content

Commit 5c51bf5

Browse files
committed
renamed query
1 parent a3667d3 commit 5c51bf5

File tree

4 files changed

+4
-4
lines changed

4 files changed

+4
-4
lines changed

src/librustc/traits/trans/mod.rs

+1-1
Original file line numberDiff line numberDiff line change
@@ -129,7 +129,7 @@ impl<'a, 'gcx> TypeFolder<'gcx, 'gcx> for AssociatedTypeNormalizer<'a, 'gcx> {
129129
ty
130130
} else {
131131
debug!("AssociatedTypeNormalizer: ty={:?}", ty);
132-
self.tcx.normalize_ty(ty)
132+
self.tcx.fully_normalize_monormophic_ty(ty)
133133
}
134134
}
135135
}

src/librustc/ty/context.rs

+1-1
Original file line numberDiff line numberDiff line change
@@ -2318,7 +2318,7 @@ pub fn provide(providers: &mut ty::maps::Providers) {
23182318
assert_eq!(cnum, LOCAL_CRATE);
23192319
tcx.sess.features.borrow().clone_closures
23202320
};
2321-
providers.normalize_ty = |tcx, ty| {
2321+
providers.fully_normalize_monormophic_ty = |tcx, ty| {
23222322
tcx.fully_normalize_associated_types_in(&ty)
23232323
};
23242324
}

src/librustc/ty/maps/config.rs

+1-1
Original file line numberDiff line numberDiff line change
@@ -533,7 +533,7 @@ impl<'tcx> QueryDescription for queries::has_copy_closures<'tcx> {
533533
}
534534
}
535535

536-
impl<'tcx> QueryDescription for queries::normalize_ty<'tcx> {
536+
impl<'tcx> QueryDescription for queries::fully_normalize_monormophic_ty<'tcx> {
537537
fn describe(_tcx: TyCtxt, _: Ty) -> String {
538538
format!("normalizing types")
539539
}

src/librustc/ty/maps/mod.rs

+1-1
Original file line numberDiff line numberDiff line change
@@ -349,7 +349,7 @@ define_maps! { <'tcx>
349349
// Normally you would just use `tcx.erase_regions(&value)`,
350350
// however, which uses this query as a kind of cache.
351351
[] fn erase_regions_ty: erase_regions_ty(Ty<'tcx>) -> Ty<'tcx>,
352-
[] fn normalize_ty: normalize_ty_node(Ty<'tcx>) -> Ty<'tcx>,
352+
[] fn fully_normalize_monormophic_ty: normalize_ty_node(Ty<'tcx>) -> Ty<'tcx>,
353353
}
354354

355355
//////////////////////////////////////////////////////////////////////

0 commit comments

Comments
 (0)