user0/rust
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Show auto-applicable correction warning for short circuiting in constants

Browse source
This commit is contained in:
Oliver Scherer 2018-11-26 09:41:56 +01:00
parent 507ea97a3e
commit 75ce28a974
1 changed files with 23 additions and 0 deletions
Download patch file Download diff file Expand all files Collapse all files

23
src/librustc_mir/hair/cx/expr.rs
View file

@ -23,6 +23,7 @@ use rustc::hir;
use rustc::hir::def_id::LocalDefId;
use rustc::mir::{BorrowKind};
use syntax_pos::Span;
use syntax::errors::Applicability;
impl<'tcx> Mirror<'tcx> for &'tcx hir::Expr {
type Output = Expr<'tcx>;
@ -373,6 +374,17 @@ fn make_mirror_unadjusted<'a, 'gcx, 'tcx>(cx: &mut Cx<'a, 'gcx, 'tcx>,
// they can handle that kind of control-flow.
(hir::BinOpKind::And, hir::Constness::Const) => {
cx.control_flow_destroyed = true;
cx.tcx.sess.struct_span_warn(
op.span,
"boolean short circuiting operators in constants do
not actually short circuit. Thus new const eval features
are not accessible in constants."
).span_suggestion_with_applicability(
op.span,
"use a bit operator instead",
"&".into(),
Applicability::MachineApplicable,
).emit();
ExprKind::Binary {
op: BinOp::BitAnd,
lhs: lhs.to_ref(),
@ -381,6 +393,17 @@ fn make_mirror_unadjusted<'a, 'gcx, 'tcx>(cx: &mut Cx<'a, 'gcx, 'tcx>,
}
(hir::BinOpKind::Or, hir::Constness::Const) => {
cx.control_flow_destroyed = true;
cx.tcx.sess.struct_span_warn(
op.span,
"boolean short circuiting operators in constants do
not actually short circuit. Thus new const eval features
are not accessible in constants."
).span_suggestion_with_applicability(
op.span,
"use a bit operator instead",
"|".into(),
Applicability::MachineApplicable,
).emit();
ExprKind::Binary {
op: BinOp::BitOr,
lhs: lhs.to_ref(),