Skip to content

Commit f8adfcb

Browse files
committed
valtree interning stuff
1 parent 8169bae commit f8adfcb

File tree

1 file changed

+5
-9
lines changed

1 file changed

+5
-9
lines changed

compiler/rustc_middle/src/ty/structural_impls.rs

Lines changed: 5 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -713,22 +713,18 @@ impl<'tcx> TypeFoldable<TyCtxt<'tcx>> for ty::ValTree<'tcx> {
713713
let new_inner = inner.clone().try_fold_with(folder)?;
714714

715715
if inner == &new_inner {
716-
return Ok(self);
716+
Ok(self)
717+
} else {
718+
let valtree = folder.cx().intern_valtree(new_inner);
719+
Ok(valtree)
717720
}
718-
719-
let valtree = folder.cx().intern_valtree(new_inner);
720-
Ok(valtree)
721721
}
722722

723723
fn fold_with<F: TypeFolder<TyCtxt<'tcx>>>(self, folder: &mut F) -> Self {
724724
let inner: &ty::ValTreeKind<TyCtxt<'tcx>> = &*self;
725725
let new_inner = inner.clone().fold_with(folder);
726726

727-
if inner == &new_inner {
728-
return self;
729-
}
730-
731-
folder.cx().intern_valtree(new_inner)
727+
if inner == &new_inner { self } else { folder.cx().intern_valtree(new_inner) }
732728
}
733729
}
734730

0 commit comments

Comments
 (0)