Rust: Equal -> Equals.

Author: geoffw0

rust/ql/lib/codeql/rust/elements/ComparisonOperation.qll

@@ -22,15 +22,15 @@ final class EqualityOperation = EqualityOperationImpl;
 /**
  * The equal comparison operation, `==`.
  */
-final class EqualOperation extends EqualityOperationImpl {
-  EqualOperation() { this.getOperatorName() = "==" }
+final class EqualsOperation extends EqualityOperationImpl {
+  EqualsOperation() { this.getOperatorName() = "==" }
 }
 
 /**
  * The not equal comparison operation, `!=`.
  */
-final class NotEqualOperation extends EqualityOperationImpl {
-  NotEqualOperation() { this.getOperatorName() = "!=" }
+final class NotEqualsOperation extends EqualityOperationImpl {
+  NotEqualsOperation() { this.getOperatorName() = "!=" }
 }
 
 /**
@@ -81,8 +81,8 @@ final class GreaterThanOperation extends RelationalOperationImpl {
 /**
  * The less than or equal comparison operation, `<=`.
  */
-final class LessOrEqualOperation extends RelationalOperationImpl {
-  LessOrEqualOperation() { this.getOperatorName() = "<=" }
+final class LessOrEqualsOperation extends RelationalOperationImpl {
+  LessOrEqualsOperation() { this.getOperatorName() = "<=" }
 
   override Expr getGreaterOperand() { result = this.getRhs() }
 
@@ -92,8 +92,8 @@ final class LessOrEqualOperation extends RelationalOperationImpl {
 /**
  * The greater than or equal comparison operation, `>=`.
  */
-final class GreaterOrEqualOperation extends RelationalOperationImpl {
-  GreaterOrEqualOperation() { this.getOperatorName() = ">=" }
+final class GreaterOrEqualsOperation extends RelationalOperationImpl {
+  GreaterOrEqualsOperation() { this.getOperatorName() = ">=" }
 
   override Expr getGreaterOperand() { result = this.getLhs() }
 

rust/ql/lib/codeql/rust/security/UncontrolledAllocationSizeExtensions.qll

@@ -55,11 +55,11 @@ module UncontrolledAllocationSize {
       node = cmp.(RelationalOperation).getGreaterOperand().getACfgNode() and
       branch = false
       or
-      cmp instanceof EqualOperation and
+      cmp instanceof EqualsOperation and
       [cmp.getLhs(), cmp.getRhs()].getACfgNode() = node and
       branch = true
       or
-      cmp instanceof NotEqualOperation and
+      cmp instanceof NotEqualsOperation and
       [cmp.getLhs(), cmp.getRhs()].getACfgNode() = node and
       branch = false
     )

rust/ql/test/library-tests/operations/Operations.ql

@@ -18,19 +18,19 @@ string describe(Expr op) {
   or
   op instanceof EqualityOperation and result = "EqualityOperation"
   or
-  op instanceof EqualOperation and result = "EqualOperation"
+  op instanceof EqualsOperation and result = "EqualsOperation"
   or
-  op instanceof NotEqualOperation and result = "NotEqualOperation"
+  op instanceof NotEqualsOperation and result = "NotEqualsOperation"
   or
   op instanceof RelationalOperation and result = "RelationalOperation"
   or
   op instanceof LessThanOperation and result = "LessThanOperation"
   or
   op instanceof GreaterThanOperation and result = "GreaterThanOperation"
   or
-  op instanceof LessOrEqualOperation and result = "LessOrEqualOperation"
+  op instanceof LessOrEqualsOperation and result = "LessOrEqualsOperation"
   or
-  op instanceof GreaterOrEqualOperation and result = "GreaterOrEqualOperation"
+  op instanceof GreaterOrEqualsOperation and result = "GreaterOrEqualsOperation"
 }
 
 module OperationsTest implements TestSig {

rust/ql/test/library-tests/operations/test.rs

@@ -11,12 +11,12 @@ fn test_operations(
 	x = y; // $ Operation Op== Operands=2 AssignmentOperation BinaryExpr
 
 	// comparison operations
-	x == y; // $ Operation Op=== Operands=2 BinaryExpr ComparisonOperation EqualityOperation EqualOperation
-	x != y; // $ Operation Op=!= Operands=2 BinaryExpr ComparisonOperation EqualityOperation NotEqualOperation
+	x == y; // $ Operation Op=== Operands=2 BinaryExpr ComparisonOperation EqualityOperation EqualsOperation
+	x != y; // $ Operation Op=!= Operands=2 BinaryExpr ComparisonOperation EqualityOperation NotEqualsOperation
 	x < y; // $ Operation Op=< Operands=2 BinaryExpr ComparisonOperation RelationalOperation LessThanOperation Greater=y Lesser=x
-	x <= y; // $ Operation Op=<= Operands=2 BinaryExpr ComparisonOperation RelationalOperation LessOrEqualOperation Greater=y Lesser=x
+	x <= y; // $ Operation Op=<= Operands=2 BinaryExpr ComparisonOperation RelationalOperation LessOrEqualsOperation Greater=y Lesser=x
 	x > y; // $ Operation Op=> Operands=2 BinaryExpr ComparisonOperation RelationalOperation GreaterThanOperation Greater=x Lesser=y
-	x >= y; // $ Operation Op=>= Operands=2 BinaryExpr ComparisonOperation RelationalOperation GreaterOrEqualOperation Greater=x Lesser=y
+	x >= y; // $ Operation Op=>= Operands=2 BinaryExpr ComparisonOperation RelationalOperation GreaterOrEqualsOperation Greater=x Lesser=y
 
 	// arithmetic operations
 	x + y; // $ Operation Op=+ Operands=2 BinaryExpr