feat: simplify Ord implementation for arrays (#7305)

noir-lang · Feb 6, 2025 · 819a53a · 819a53a · github-actions · Feb 6, 2025
1 parent 9ae3c6c
commit 819a53a
Show file tree

Hide file tree

Showing 3 changed files with 2 additions and 19 deletions.
diff --git a/.github/workflows/reports.yml b/.github/workflows/reports.yml
@@ -493,7 +493,6 @@ jobs:
           jq --slurp '. | flatten' ./reports/* | tee time_bench.json
 
       - name: Store benchmark result
-        continue-on-error: true
         uses: benchmark-action/github-action-benchmark@4de1bed97a47495fc4c5404952da0499e31f5c29
         with:
           name: "Compilation Time"
@@ -543,7 +542,6 @@ jobs:
           jq --slurp '. | flatten' ./reports/* | tee memory_bench.json
 
       - name: Store benchmark result
-        continue-on-error: true
         uses: benchmark-action/github-action-benchmark@4de1bed97a47495fc4c5404952da0499e31f5c29
         with:
           name: "Compilation Memory"
@@ -593,7 +591,6 @@ jobs:
           jq --slurp '. | flatten' ./reports/* | tee memory_bench.json
 
       - name: Store benchmark result
-        continue-on-error: true
         uses: benchmark-action/github-action-benchmark@4de1bed97a47495fc4c5404952da0499e31f5c29
         with:
           name: "Execution Memory"
@@ -644,7 +641,6 @@ jobs:
           jq --slurp '. | flatten' ./reports/* | tee time_bench.json
 
       - name: Store benchmark result
-        continue-on-error: true
         uses: benchmark-action/github-action-benchmark@4de1bed97a47495fc4c5404952da0499e31f5c29
         with:
           name: "Execution Time"

diff --git a/.github/workflows/test-js-packages.yml b/.github/workflows/test-js-packages.yml
@@ -622,7 +622,6 @@ jobs:
           jq --slurp '. | flatten' ./reports/* | tee test_bench.json
 
       - name: Store benchmark result
-        continue-on-error: true
         uses: benchmark-action/github-action-benchmark@4de1bed97a47495fc4c5404952da0499e31f5c29
         with:
           name: "Test Suite Duration"

diff --git a/noir_stdlib/src/cmp.nr b/noir_stdlib/src/cmp.nr
@@ -360,13 +360,7 @@ where
         let mut result = Ordering::equal();
         for i in 0..self.len() {
             if result == Ordering::equal() {
-                let result_i = self[i].cmp(other[i]);
-
-                if result_i == Ordering::less() {
-                    result = result_i;
-                } else if result_i == Ordering::greater() {
-                    result = result_i;
-                }
+                result = self[i].cmp(other[i]);
             }
         }
         result
@@ -383,13 +377,7 @@ where
         let mut result = self.len().cmp(other.len());
         for i in 0..self.len() {
             if result == Ordering::equal() {
-                let result_i = self[i].cmp(other[i]);
-
-                if result_i == Ordering::less() {
-                    result = result_i;
-                } else if result_i == Ordering::greater() {
-                    result = result_i;
-                }
+                result = self[i].cmp(other[i]);
             }
         }
         result