Run scarb 2.14.0 on ci

commit-id:7c262d66

Author: ksew1

.github/workflows/ci.yml

@@ -12,7 +12,7 @@ jobs:
     runs-on: ubuntu-latest
     strategy:
       matrix:
-        version: [ 2.9.4, 2.10.1, 2.11.4, 2.12.2, 2.13.1 ]
+        version: [ 2.9.4, 2.10.1, 2.11.4, 2.12.2, 2.13.1, 2.14.0 ]
     steps:
       - uses: actions/checkout@v6
       - uses: dtolnay/rust-toolchain@stable
@@ -25,7 +25,7 @@ jobs:
       - run: cargo test --release
         if: matrix.version == '2.9.4' || matrix.version == '2.10.1'
       - run: cargo test --release --features allows-excluding-macros
-        if: matrix.version == '2.11.4' || matrix.version == '2.12.2' || matrix.version == '2.13.1'
+        if: matrix.version != '2.9.4' && matrix.version != '2.10.1'
 
   rustfmt:
     name: Check rust formatting

.tool-versions

@@ -1,2 +1,2 @@
 starknet-foundry 0.43.0
-scarb 2.9.4
+scarb 2.14.0

crates/cairo-coverage/src/commands/run.rs

@@ -20,13 +20,11 @@ pub fn run(
 ) -> Result<()> {
     let metadata = scarb_metadata()?;
 
-    if !include.contains(&IncludedComponent::Macros) {
-        ensure!(
-            metadata.app_version_info.version <= Version::new(2, 8, 5)
-                || metadata.app_version_info.version >= Version::new(2, 11, 0),
-            "excluding macros is only supported for Scarb versions <= 2.8.5 and >= 2.11.0"
-        );
-    }
+    ensure!(
+        include.contains(&IncludedComponent::Macros)
+            || metadata.app_version_info.version >= Version::new(2, 11, 0),
+        "excluding macros is only supported for Scarb versions >= 2.11.0"
+    );
 
     let project_path = project_path.unwrap_or(metadata.workspace.root);
 

crates/cairo-coverage/tests/data/complex_calculator/src/lib.cairo

@@ -28,7 +28,7 @@ pub fn factorial(n: u32) -> u32 {
     while i <= n {
         result *= i;
         i += 1;
-    };
+    }
     result
 }
 
@@ -38,7 +38,7 @@ pub fn power(base: i32, exponent: u32) -> i32 {
     while exp > 0 {
         result *= base;
         exp -= 1;
-    };
+    }
     result
 }
 
@@ -61,6 +61,6 @@ pub fn is_prime(n: u32) -> bool {
             result = false;
         }
         i += 1;
-    };
+    }
     result
 }

crates/cairo-coverage/tests/data/complex_calculator/tests/test_call.cairo

@@ -1,4 +1,4 @@
-use complex_calculator::{add, subtract, multiply, divide, factorial, power, is_prime, fibonacci};
+use complex_calculator::{add, divide, factorial, fibonacci, is_prime, multiply, power, subtract};
 
 #[test]
 fn test_add() {

crates/cairo-coverage/tests/data/coverage_ignore/src/lib.cairo

@@ -1,2 +1,2 @@
-mod simple;
 mod multiply;
+mod simple;

crates/cairo-coverage/tests/data/readme_example/tests/lib.cairo

@@ -1,4 +1,4 @@
-use readme_example::{calculator, Operation};
+use readme_example::{Operation, calculator};
 
 #[test]
 fn calculator_add() {

crates/cairo-coverage/tests/data/scarb_template/src/lib.cairo

@@ -10,7 +10,7 @@ fn fib(mut n: u32) -> u32 {
         let temp = b;
         b = a + b;
         a = temp;
-    };
+    }
     a
 }
 

crates/cairo-coverage/tests/data/snforge_template/tests/test_contract.cairo

@@ -1,12 +1,10 @@
+use snforge_std::{ContractClassTrait, DeclareResultTrait, declare};
+use snforge_template::{
+    IHelloStarknetDispatcher, IHelloStarknetDispatcherTrait, IHelloStarknetSafeDispatcher,
+    IHelloStarknetSafeDispatcherTrait,
+};
 use starknet::ContractAddress;
 
-use snforge_std::{declare, ContractClassTrait, DeclareResultTrait};
-
-use snforge_template::IHelloStarknetSafeDispatcher;
-use snforge_template::IHelloStarknetSafeDispatcherTrait;
-use snforge_template::IHelloStarknetDispatcher;
-use snforge_template::IHelloStarknetDispatcherTrait;
-
 fn deploy_contract(name: ByteArray) -> ContractAddress {
     let contract = declare(name).unwrap().contract_class();
     let (contract_address, _) = contract.deploy(@ArrayTrait::new()).unwrap();