mikros/rust
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Some tracing cleanups

Browse Source
This commit is contained in:
Oli Scherer 2022-12-19 10:45:35 +00:00
parent 8a746f4ac3
commit 8b5a96ec45
2 changed files with 5 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
compiler/rustc_borrowck/src/type_check/mod.rs
View File

@ -1153,6 +1153,7 @@ fn relate_type_and_user_type(
category: ConstraintCategory<'tcx>, category: ConstraintCategory<'tcx>,
) -> Fallible<()> { ) -> Fallible<()> {
let annotated_type = self.user_type_annotations[user_ty.base].inferred_ty; let annotated_type = self.user_type_annotations[user_ty.base].inferred_ty;
trace!(?annotated_type);
let mut curr_projected_ty = PlaceTy::from_ty(annotated_type); let mut curr_projected_ty = PlaceTy::from_ty(annotated_type);
let tcx = self.infcx.tcx; let tcx = self.infcx.tcx;
@ -1170,10 +1171,7 @@ fn relate_type_and_user_type(
); );
curr_projected_ty = projected_ty; curr_projected_ty = projected_ty;
} }
debug!( trace!(?curr_projected_ty);
"user_ty base: {:?} freshened: {:?} projs: {:?} yields: {:?}",
user_ty.base, annotated_type, user_ty.projs, curr_projected_ty
);
let ty = curr_projected_ty.ty; let ty = curr_projected_ty.ty;
self.relate_types(ty, v.xform(ty::Variance::Contravariant), a, locations, category)?; self.relate_types(ty, v.xform(ty::Variance::Contravariant), a, locations, category)?;

7
compiler/rustc_middle/src/mir/tcx.rs
View File

@ -32,8 +32,9 @@ pub fn from_ty(ty: Ty<'tcx>) -> PlaceTy<'tcx> {
/// not carry a `Ty` for `T`.) /// not carry a `Ty` for `T`.)
/// ///
/// Note that the resulting type has not been normalized. /// Note that the resulting type has not been normalized.
#[instrument(level = "debug", skip(tcx), ret)]
pub fn field_ty(self, tcx: TyCtxt<'tcx>, f: Field) -> Ty<'tcx> { pub fn field_ty(self, tcx: TyCtxt<'tcx>, f: Field) -> Ty<'tcx> {
let answer = match self.ty.kind() { match self.ty.kind() {
ty::Adt(adt_def, substs) => { ty::Adt(adt_def, substs) => {
let variant_def = match self.variant_index { let variant_def = match self.variant_index {
None => adt_def.non_enum_variant(), None => adt_def.non_enum_variant(),
@ -47,9 +48,7 @@ pub fn field_ty(self, tcx: TyCtxt<'tcx>, f: Field) -> Ty<'tcx> {
} }
ty::Tuple(tys) => tys[f.index()], ty::Tuple(tys) => tys[f.index()],
_ => bug!("extracting field of non-tuple non-adt: {:?}", self), _ => bug!("extracting field of non-tuple non-adt: {:?}", self),
}; }
debug!("field_ty self: {:?} f: {:?} yields: {:?}", self, f, answer);
answer
} }
/// Convenience wrapper around `projection_ty_core` for /// Convenience wrapper around `projection_ty_core` for