bjoernager/rust
bjoernager/rust
1
Fork 0
Code Activity

Rename BinOpKind::lazy as BinOpKind::is_lazy.

Browse source 
To match `BinOpKind::is_comparison` and `hir::BinOpKind::is_lazy`.
This commit is contained in:
Nicholas Nethercote 2023-11-28 09:42:25 +11:00
parent 0efd2a9d8f
commit 705b484922
3 changed files with 5 additions and 4 deletions
Download patch file Download diff file Expand all files Collapse all files

3
compiler/rustc_ast/src/ast.rs
View file

@ -881,7 +881,8 @@ impl BinOpKind {
Gt => ">", Gt => ">",
} }
} }
pub fn lazy(&self) -> bool {
pub fn is_lazy(&self) -> bool {
matches!(self, BinOpKind::And | BinOpKind::Or) matches!(self, BinOpKind::And | BinOpKind::Or)
} }

4
compiler/rustc_lint/src/unused.rs
View file

@ -656,7 +656,7 @@ trait UnusedDelimLint {
) -> bool { ) -> bool {
if followed_by_else { if followed_by_else {
match inner.kind { match inner.kind {
ast::ExprKind::Binary(op, ..) if op.node.lazy() => return true, ast::ExprKind::Binary(op, ..) if op.node.is_lazy() => return true,
_ if classify::expr_trailing_brace(inner).is_some() => return true, _ if classify::expr_trailing_brace(inner).is_some() => return true,
_ => {} _ => {}
} }
@ -1016,7 +1016,7 @@ impl UnusedDelimLint for UnusedParens {
rustc_span::source_map::Spanned { node, .. }, rustc_span::source_map::Spanned { node, .. },
_, _,
_, _,
) if node.lazy())) ) if node.is_lazy()))
{ {
self.emit_unused_delims_expr(cx, value, ctx, left_pos, right_pos, is_kw) self.emit_unused_delims_expr(cx, value, ctx, left_pos, right_pos, is_kw)
} }

2
compiler/rustc_parse/src/parser/stmt.rs
View file

@ -384,7 +384,7 @@ impl<'a> Parser<'a> {
fn check_let_else_init_bool_expr(&self, init: &ast::Expr) { fn check_let_else_init_bool_expr(&self, init: &ast::Expr) {
if let ast::ExprKind::Binary(op, ..) = init.kind { if let ast::ExprKind::Binary(op, ..) = init.kind {
if op.node.lazy() { if op.node.is_lazy() {
self.sess.emit_err(errors::InvalidExpressionInLetElse { self.sess.emit_err(errors::InvalidExpressionInLetElse {
span: init.span, span: init.span,
operator: op.node.as_str(), operator: op.node.as_str(),