From 99603ef0742176b0ae7980146318469cf8d59cb2 Mon Sep 17 00:00:00 2001 From: est31 Date: Sun, 22 May 2022 16:39:32 +0200 Subject: [PATCH] Remove box syntax from rustc_mir_dataflow and rustc_mir_transform --- compiler/rustc_mir_dataflow/src/lib.rs | 1 - compiler/rustc_mir_transform/src/instcombine.rs | 4 ++-- compiler/rustc_mir_transform/src/lib.rs | 1 - compiler/rustc_mir_transform/src/normalize_array_len.rs | 5 +++-- 4 files changed, 5 insertions(+), 6 deletions(-) diff --git a/compiler/rustc_mir_dataflow/src/lib.rs b/compiler/rustc_mir_dataflow/src/lib.rs index c1124a533bf2b..e4c130f0807dd 100644 --- a/compiler/rustc_mir_dataflow/src/lib.rs +++ b/compiler/rustc_mir_dataflow/src/lib.rs @@ -1,6 +1,5 @@ #![feature(associated_type_defaults)] #![feature(box_patterns)] -#![feature(box_syntax)] #![feature(exact_size_is_empty)] #![feature(let_else)] #![feature(min_specialization)] diff --git a/compiler/rustc_mir_transform/src/instcombine.rs b/compiler/rustc_mir_transform/src/instcombine.rs index d1c4a4b21d0a2..268ce1b2e8cfa 100644 --- a/compiler/rustc_mir_transform/src/instcombine.rs +++ b/compiler/rustc_mir_transform/src/instcombine.rs @@ -192,12 +192,12 @@ impl<'tcx> InstCombineContext<'tcx, '_> { statements.push(Statement { source_info: terminator.source_info, - kind: StatementKind::Assign(box ( + kind: StatementKind::Assign(Box::new(( destination_place, Rvalue::Use(Operand::Copy( arg_place.project_deeper(&[ProjectionElem::Deref], self.tcx), )), - )), + ))), }); terminator.kind = TerminatorKind::Goto { target: destination_block }; } diff --git a/compiler/rustc_mir_transform/src/lib.rs b/compiler/rustc_mir_transform/src/lib.rs index 1e8c373a411fe..571f541072a38 100644 --- a/compiler/rustc_mir_transform/src/lib.rs +++ b/compiler/rustc_mir_transform/src/lib.rs @@ -1,6 +1,5 @@ #![allow(rustc::potential_query_instability)] #![feature(box_patterns)] -#![feature(box_syntax)] #![feature(let_chains)] #![feature(let_else)] #![feature(map_try_insert)] diff --git a/compiler/rustc_mir_transform/src/normalize_array_len.rs b/compiler/rustc_mir_transform/src/normalize_array_len.rs index cdfd49ef478a4..0f45711baa3ac 100644 --- a/compiler/rustc_mir_transform/src/normalize_array_len.rs +++ b/compiler/rustc_mir_transform/src/normalize_array_len.rs @@ -125,7 +125,7 @@ impl<'tcx> Patcher<'_, 'tcx> { let assign_to = Place::from(local); let rvalue = Rvalue::Use(operand); make_copy_statement.kind = - StatementKind::Assign(box (assign_to, rvalue)); + StatementKind::Assign(Box::new((assign_to, rvalue))); statements.push(make_copy_statement); // to reorder we have to copy and make NOP @@ -165,7 +165,8 @@ impl<'tcx> Patcher<'_, 'tcx> { if add_deref { place = self.tcx.mk_place_deref(place); } - len_statement.kind = StatementKind::Assign(box (*into, Rvalue::Len(place))); + len_statement.kind = + StatementKind::Assign(Box::new((*into, Rvalue::Len(place)))); statements.push(len_statement); // make temporary dead