Skip to content

Commit db28058

Browse files
committed
Auto merge of #147574 - dianqk:rollup-njdujqk, r=dianqk
Rollup of 12 pull requests Successful merges: - rust-lang/rust#145651 (Regression test for const promotion with Option<Ordering>) - rust-lang/rust#145722 (implement Extend<{Group, Literal, Punct, Ident}> for TokenStream) - rust-lang/rust#146520 (Promote armv8r-none-eabihf target to Tier 2) - rust-lang/rust#146522 (Promote armv7a-none-eabihf to Tier 2) - rust-lang/rust#147289 (Mitigate `thread_local!` shadowing issues) - rust-lang/rust#147515 (Update rustc-perf submodule) - rust-lang/rust#147522 (compiletest: Use the same directive lines for EarlyProps and ignore/only/needs) - rust-lang/rust#147525 (Replace locals in debuginfo records during ref_prop and dest_prop) - rust-lang/rust#147544 (Remove StatementKind::Deinit.) - rust-lang/rust#147551 (remove `#[rustc_inherit_overflow_checks]` from `is_multiple_of`) - rust-lang/rust#147553 (Move `wasm32-wasip3` to the tier 3 table) - rust-lang/rust#147562 (Stabilize `NonZero<u*>::div_ceil`) r? `@ghost` `@rustbot` modify labels: rollup
2 parents b0abfd6 + 52812aa commit db28058

File tree

4 files changed

+0
-6
lines changed

4 files changed

+0
-6
lines changed

rustc_public/src/mir/body.rs

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -478,7 +478,6 @@ pub enum StatementKind {
478478
Assign(Place, Rvalue),
479479
FakeRead(FakeReadCause, Place),
480480
SetDiscriminant { place: Place, variant_index: VariantIdx },
481-
Deinit(Place),
482481
StorageLive(Local),
483482
StorageDead(Local),
484483
Retag(RetagKind, Place),

rustc_public/src/mir/pretty.rs

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -102,7 +102,6 @@ fn pretty_statement<W: Write>(writer: &mut W, statement: &StatementKind) -> io::
102102
StatementKind::SetDiscriminant { place, variant_index } => {
103103
writeln!(writer, "{INDENT}discriminant({place:?}) = {};", variant_index.to_index())
104104
}
105-
StatementKind::Deinit(place) => writeln!(writer, "Deinit({place:?};"),
106105
StatementKind::StorageLive(local) => {
107106
writeln!(writer, "{INDENT}StorageLive(_{local});")
108107
}

rustc_public/src/mir/visit.rs

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -170,7 +170,6 @@ macro_rules! make_mir_visitor {
170170
self.visit_place(place, PlaceContext::NON_MUTATING, location);
171171
}
172172
StatementKind::SetDiscriminant { place, .. }
173-
| StatementKind::Deinit(place)
174173
| StatementKind::Retag(_, place) => {
175174
self.visit_place(place, PlaceContext::MUTATING, location);
176175
}

rustc_public/src/unstable/convert/stable/mir.rs

Lines changed: 0 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -149,9 +149,6 @@ impl<'tcx> Stable<'tcx> for mir::StatementKind<'tcx> {
149149
variant_index: variant_index.stable(tables, cx),
150150
}
151151
}
152-
mir::StatementKind::Deinit(place) => {
153-
crate::mir::StatementKind::Deinit(place.stable(tables, cx))
154-
}
155152

156153
mir::StatementKind::StorageLive(place) => {
157154
crate::mir::StatementKind::StorageLive(place.stable(tables, cx))

0 commit comments

Comments
 (0)