aboutsummaryrefslogtreecommitdiff
path: root/crates/ra_syntax
diff options
context:
space:
mode:
authorbors[bot] <bors[bot]@users.noreply.github.com>2019-02-18 09:13:51 +0000
committerbors[bot] <bors[bot]@users.noreply.github.com>2019-02-18 09:13:51 +0000
commit564ab84b787cca0f5994451eb2ce9e1ba8c9d974 (patch)
treec7800634187e6ad9be17c8b728aec6c5fb94e853 /crates/ra_syntax
parent3dfb16be69ff26519774ea3843f36b622b8bed0f (diff)
parent4e8a3f565b5c48bb82051bdff4349786d8b716f5 (diff)
Merge #852
852: Handle != r=flodiebold a=matklad r? @flodiebold Co-authored-by: Aleksey Kladov <[email protected]>
Diffstat (limited to 'crates/ra_syntax')
-rw-r--r--crates/ra_syntax/src/ast.rs5
1 files changed, 4 insertions, 1 deletions
diff --git a/crates/ra_syntax/src/ast.rs b/crates/ra_syntax/src/ast.rs
index 350f01f33..62641c9fe 100644
--- a/crates/ra_syntax/src/ast.rs
+++ b/crates/ra_syntax/src/ast.rs
@@ -535,6 +535,8 @@ pub enum BinOp {
535 BooleanAnd, 535 BooleanAnd,
536 /// The `==` operator for equality testing 536 /// The `==` operator for equality testing
537 EqualityTest, 537 EqualityTest,
538 /// The `!=` operator for equality testing
539 NegatedEqualityTest,
538 /// The `<=` operator for lesser-equal testing 540 /// The `<=` operator for lesser-equal testing
539 LesserEqualTest, 541 LesserEqualTest,
540 /// The `>=` operator for greater-equal testing 542 /// The `>=` operator for greater-equal testing
@@ -569,7 +571,7 @@ pub enum BinOp {
569 RangeRightClosed, 571 RangeRightClosed,
570 /// The `=` operator for assignment 572 /// The `=` operator for assignment
571 Assignment, 573 Assignment,
572 /// The `+=` operator for assignment after additon 574 /// The `+=` operator for assignment after addition
573 AddAssign, 575 AddAssign,
574 /// The `/=` operator for assignment after division 576 /// The `/=` operator for assignment after division
575 DivAssign, 577 DivAssign,
@@ -599,6 +601,7 @@ impl BinExpr {
599 PIPEPIPE => Some(BinOp::BooleanOr), 601 PIPEPIPE => Some(BinOp::BooleanOr),
600 AMPAMP => Some(BinOp::BooleanAnd), 602 AMPAMP => Some(BinOp::BooleanAnd),
601 EQEQ => Some(BinOp::EqualityTest), 603 EQEQ => Some(BinOp::EqualityTest),
604 NEQ => Some(BinOp::NegatedEqualityTest),
602 LTEQ => Some(BinOp::LesserEqualTest), 605 LTEQ => Some(BinOp::LesserEqualTest),
603 GTEQ => Some(BinOp::GreaterEqualTest), 606 GTEQ => Some(BinOp::GreaterEqualTest),
604 L_ANGLE => Some(BinOp::LesserTest), 607 L_ANGLE => Some(BinOp::LesserTest),