Rollup merge of #90102 - nbdd0121:box3, r=jonas-schievink

matthiaskrgr · web-flow · commit 69750711d374 · 2022-01-03T14:44:15.000+01:00
Remove `NullOp::Box` Follow up of #89030 and MCP rust-lang/compiler-team#460. ~1 month later nothing seems to be broken, apart from a small regression that #89332 (1aac85bb716c09304b313d69d30d74fe7e8e1a8e) shows could be regained by remvoing the diverging path, so it shall be safe to continue and remove `NullOp::Box` completely. r? `@jonas-schievink` `@rustbot` label T-compiler
diff --git a/clippy_utils/src/qualify_min_const_fn.rs b/clippy_utils/src/qualify_min_const_fn.rs
@@ -193,7 +193,6 @@ fn check_rvalue(tcx: TyCtxt<'tcx>, body: &Body<'tcx>, def_id: DefId, rvalue: &Rv
             }
         },
         Rvalue::NullaryOp(NullOp::SizeOf | NullOp::AlignOf, _) | Rvalue::ShallowInitBox(_, _) => Ok(()),
-        Rvalue::NullaryOp(NullOp::Box, _) => Err((span, "heap allocations are not allowed in const fn".into())),
         Rvalue::UnaryOp(_, operand) => {
             let ty = operand.ty(body, tcx);
             if ty.is_integral() || ty.is_bool() {

Original file line number	Diff line number	Diff line change
`@@ -193,7 +193,6 @@ fn check_rvalue(tcx: TyCtxt<'tcx>, body: &Body<'tcx>, def_id: DefId, rvalue: &Rv`
`193`	`193`	`}`
`194`	`194`	`},`
`195`	`195`	`Rvalue::NullaryOp(NullOp::SizeOf \| NullOp::AlignOf, _) \| Rvalue::ShallowInitBox(_, _) => Ok(()),`
`196`		`- Rvalue::NullaryOp(NullOp::Box, _) => Err((span, "heap allocations are not allowed in const fn".into())),`
`197`	`196`	`Rvalue::UnaryOp(_, operand) => {`
`198`	`197`	`let ty = operand.ty(body, tcx);`
`199`	`198`	`if ty.is_integral() \|\| ty.is_bool() {`