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

Auto merge of #97281 - est31:remove_box, r=compiler-errors

Browse Source 
Remove box syntax from rustc_mir_dataflow and rustc_mir_transform

Continuation of #87781, inspired by #97239. The usages that this PR removes have not appeared from nothing, instead the usage in `rustc_mir_dataflow` and `rustc_mir_transform` was from #80522 which split up `rustc_mir`, and which was filed before I filed #87781, so it was using the state from before my PR. But it was merged after my PR was merged, so the `box_syntax` uses were able to survive here. Outside of this introduction due to the code being outside of the master branch at the point of merging of my PR, there was only one other introduction of box syntax, in #95159. That box syntax was removed again though in #95555. Outside of that, `box_syntax` has not made its reoccurrance in compiler crates.
This commit is contained in:
bors 2022-05-22 19:16:17 +00:00
commit b2eed72a6f
4 changed files with 5 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
compiler/rustc_mir_dataflow/src/lib.rs
View File

@ -1,6 +1,5 @@
#![feature(associated_type_defaults)] #![feature(associated_type_defaults)]
#![feature(box_patterns)] #![feature(box_patterns)]
#![feature(box_syntax)]
#![feature(exact_size_is_empty)] #![feature(exact_size_is_empty)]
#![feature(let_else)] #![feature(let_else)]
#![feature(min_specialization)] #![feature(min_specialization)]

4
compiler/rustc_mir_transform/src/instcombine.rs
View File

@ -192,12 +192,12 @@ impl<'tcx> InstCombineContext<'tcx, '_> {
statements.push(Statement { statements.push(Statement {
source_info: terminator.source_info, source_info: terminator.source_info,
kind: StatementKind::Assign(box ( kind: StatementKind::Assign(Box::new((
destination_place, destination_place,
Rvalue::Use(Operand::Copy( Rvalue::Use(Operand::Copy(
arg_place.project_deeper(&[ProjectionElem::Deref], self.tcx), arg_place.project_deeper(&[ProjectionElem::Deref], self.tcx),
)), )),
)), ))),
}); });
terminator.kind = TerminatorKind::Goto { target: destination_block }; terminator.kind = TerminatorKind::Goto { target: destination_block };
} }

1
compiler/rustc_mir_transform/src/lib.rs
View File

@ -1,6 +1,5 @@
#![allow(rustc::potential_query_instability)] #![allow(rustc::potential_query_instability)]
#![feature(box_patterns)] #![feature(box_patterns)]
#![feature(box_syntax)]
#![feature(let_chains)] #![feature(let_chains)]
#![feature(let_else)] #![feature(let_else)]
#![feature(map_try_insert)] #![feature(map_try_insert)]

5
compiler/rustc_mir_transform/src/normalize_array_len.rs
View File

@ -125,7 +125,7 @@ impl<'tcx> Patcher<'_, 'tcx> {
let assign_to = Place::from(local); let assign_to = Place::from(local);
let rvalue = Rvalue::Use(operand); let rvalue = Rvalue::Use(operand);
make_copy_statement.kind = make_copy_statement.kind =
StatementKind::Assign(box (assign_to, rvalue)); StatementKind::Assign(Box::new((assign_to, rvalue)));
statements.push(make_copy_statement); statements.push(make_copy_statement);
// to reorder we have to copy and make NOP // to reorder we have to copy and make NOP
@ -165,7 +165,8 @@ impl<'tcx> Patcher<'_, 'tcx> {
if add_deref { if add_deref {
place = self.tcx.mk_place_deref(place); 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); statements.push(len_statement);
// make temporary dead // make temporary dead