bjoernager/rust
bjoernager/rust
1
Fork 0
Code Activity

Remove box syntax from rustc_middle

Browse source
This commit is contained in:
est31 2021-08-05 05:14:53 +02:00
parent 8830f8e30c
commit dcdadc4d8d
3 changed files with 6 additions and 7 deletions
Download patch file Download diff file Expand all files Collapse all files

1
compiler/rustc_middle/src/lib.rs
View file

@ -29,7 +29,6 @@
#![feature(backtrace)] #![feature(backtrace)]
#![feature(bool_to_option)] #![feature(bool_to_option)]
#![feature(box_patterns)] #![feature(box_patterns)]
#![feature(box_syntax)]
#![feature(core_intrinsics)] #![feature(core_intrinsics)]
#![feature(discriminant_kind)] #![feature(discriminant_kind)]
#![feature(never_type)] #![feature(never_type)]

8
compiler/rustc_middle/src/mir/mod.rs
View file

@ -2061,11 +2061,11 @@ impl<'tcx> Operand<'tcx> {
span: Span, span: Span,
) -> Self { ) -> Self {
let ty = tcx.type_of(def_id).subst(tcx, substs); let ty = tcx.type_of(def_id).subst(tcx, substs);
Operand::Constant(box Constant { Operand::Constant(Box::new(Constant {
span, span,
user_ty: None, user_ty: None,
literal: ConstantKind::Ty(ty::Const::zero_sized(tcx, ty)), literal: ConstantKind::Ty(ty::Const::zero_sized(tcx, ty)),
}) }))
} }
pub fn is_move(&self) -> bool { pub fn is_move(&self) -> bool {
@ -2092,11 +2092,11 @@ impl<'tcx> Operand<'tcx> {
}; };
scalar_size == type_size scalar_size == type_size
}); });
Operand::Constant(box Constant { Operand::Constant(Box::new(Constant {
span, span,
user_ty: None, user_ty: None,
literal: ConstantKind::Val(ConstValue::Scalar(val), ty), literal: ConstantKind::Val(ConstValue::Scalar(val), ty),
}) }))
} }
pub fn to_copy(&self) -> Self { pub fn to_copy(&self) -> Self {

4
compiler/rustc_middle/src/mir/type_foldable.rs
View file

@ -182,10 +182,10 @@ impl<'tcx> TypeFoldable<'tcx> for Rvalue<'tcx> {
Len(place) => Len(place.fold_with(folder)), Len(place) => Len(place.fold_with(folder)),
Cast(kind, op, ty) => Cast(kind, op.fold_with(folder), ty.fold_with(folder)), Cast(kind, op, ty) => Cast(kind, op.fold_with(folder), ty.fold_with(folder)),
BinaryOp(op, box (rhs, lhs)) => { BinaryOp(op, box (rhs, lhs)) => {
BinaryOp(op, box (rhs.fold_with(folder), lhs.fold_with(folder))) BinaryOp(op, Box::new((rhs.fold_with(folder), lhs.fold_with(folder))))
} }
CheckedBinaryOp(op, box (rhs, lhs)) => { CheckedBinaryOp(op, box (rhs, lhs)) => {
CheckedBinaryOp(op, box (rhs.fold_with(folder), lhs.fold_with(folder))) CheckedBinaryOp(op, Box::new((rhs.fold_with(folder), lhs.fold_with(folder))))
} }
UnaryOp(op, val) => UnaryOp(op, val.fold_with(folder)), UnaryOp(op, val) => UnaryOp(op, val.fold_with(folder)),
Discriminant(place) => Discriminant(place.fold_with(folder)), Discriminant(place) => Discriminant(place.fold_with(folder)),