Skip to content

Commit 2247778

Browse files
committed
Fixup changes that aren't neccessary anymore
1 parent 94d6a9a commit 2247778

File tree

2 files changed

+2
-7
lines changed
  • compiler
    • rustc_borrowck/src/type_check
    • rustc_const_eval/src/transform/check_consts

2 files changed

+2
-7
lines changed

compiler/rustc_borrowck/src/type_check/mod.rs

Lines changed: 0 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -1745,11 +1745,6 @@ impl<'a, 'tcx> TypeChecker<'a, 'tcx> {
17451745
fn ensure_place_sized(&mut self, ty: Ty<'tcx>, span: Span) {
17461746
let tcx = self.tcx();
17471747

1748-
// This may contain opaque types, resolve them to the underlying
1749-
// type if defined in the current function. Otherwise we can't
1750-
// necessarily prove sizedness of the type.
1751-
let ty = self.infcx.resolve_vars_if_possible(ty);
1752-
17531748
// Erase the regions from `ty` to get a global type. The
17541749
// `Sized` bound in no way depends on precise regions, so this
17551750
// shouldn't affect `is_sized`.

compiler/rustc_const_eval/src/transform/check_consts/check.rs

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -48,7 +48,7 @@ impl<'mir, 'tcx> Qualifs<'mir, 'tcx> {
4848
let ty = ccx.body.local_decls[local].ty;
4949
// Peeking into opaque types causes cycles if the current function declares said opaque
5050
// type. Thus we avoid short circuiting on the type and instead run the more expensive
51-
// analysis that looks at the actual usage withhin this function
51+
// analysis that looks at the actual usage within this function
5252
if !ty.has_opaque_types() && !NeedsDrop::in_any_value_of_ty(ccx, ty) {
5353
return false;
5454
}
@@ -105,7 +105,7 @@ impl<'mir, 'tcx> Qualifs<'mir, 'tcx> {
105105
let ty = ccx.body.local_decls[local].ty;
106106
// Peeking into opaque types causes cycles if the current function declares said opaque
107107
// type. Thus we avoid short circuiting on the type and instead run the more expensive
108-
// analysis that looks at the actual usage withhin this function
108+
// analysis that looks at the actual usage within this function
109109
if !ty.has_opaque_types() && !HasMutInterior::in_any_value_of_ty(ccx, ty) {
110110
return false;
111111
}

0 commit comments

Comments
 (0)