Skip to content

Commit cd5b0b6

Browse files
committed
Auto merge of #147793 - cjgillot:no-null-op, r=scottmcm,oli-obk
Replace NullOp::SizeOf and NullOp::AlignOf by lang items. Part of #146411 Fixes #119729 Keeps #136175 as it involves `offset_of!` which this PR does not touch. r? `@ghost`
2 parents de63d25 + 6026cc9 commit cd5b0b6

File tree

1 file changed

+1
-4
lines changed

1 file changed

+1
-4
lines changed

clippy_utils/src/qualify_min_const_fn.rs

Lines changed: 1 addition & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -194,10 +194,7 @@ fn check_rvalue<'tcx>(
194194
))
195195
}
196196
},
197-
Rvalue::NullaryOp(
198-
NullOp::SizeOf | NullOp::AlignOf | NullOp::OffsetOf(_) | NullOp::UbChecks | NullOp::ContractChecks,
199-
_,
200-
)
197+
Rvalue::NullaryOp(NullOp::OffsetOf(_) | NullOp::UbChecks | NullOp::ContractChecks, _)
201198
| Rvalue::ShallowInitBox(_, _) => Ok(()),
202199
Rvalue::UnaryOp(_, operand) => {
203200
let ty = operand.ty(body, cx.tcx);

0 commit comments

Comments
 (0)