Run cargo fmt + update check C SDK build parameters workflow

Author: yogh333

.github/workflows/check_csdk_build_parameters.yml

@@ -36,8 +36,6 @@ jobs:
       matrix:
         target: ["nanox", "nanosplus", "stax", "flex"]
     steps:
-      - name: Checkout Rust SDK
-        uses: actions/checkout@v4
       - name: Checkout C BP
         uses: actions/checkout@v4
         with:
@@ -49,21 +47,16 @@ jobs:
           name: c_sdk_build_params_extractor   
       - name: Run C SDK Build Parameters Extractor
         run: |
-          # to be suppressed when C SDK API_LEVEL_24 is available in dev-tools
-          git clone https://github.com/LedgerHQ/ledger-secure-sdk.git --branch API_LEVEL_24 --single-branch c_sdk
-          echo "setting LEDGER_SDK_PATH to $(realpath c_sdk)"
-          export LEDGER_SDK_PATH=$(realpath c_sdk)
-          # ####################################### #
           chmod +x cbpx
           ./cbpx --app-path c_boilerplate \
                                          --device ${{ matrix.target }}
           # Compare output with matching file
-          diff -Z c_sdk_build_${{ matrix.target }}.cflags ledger_secure_sdk_sys/c_sdk_build_${{ matrix.target }}.cflags
+          diff c_sdk_build_${{ matrix.target }}.cflags c_sdk_build_${{ matrix.target }}_ref.cflags
           if [ $? -ne 0 ]; then
             echo "C SDK build parameters CFLAGS do not match for target ${{ matrix.target }}"
             exit 1
           fi
-          diff -Z c_sdk_build_${{ matrix.target }}.defines ledger_secure_sdk_sys/c_sdk_build_${{ matrix.target }}.defines
+          diff c_sdk_build_${{ matrix.target }}.defines c_sdk_build_${{ matrix.target }}_ref.defines
           if [ $? -ne 0 ]; then
             echo "C SDK build parameters DEFINES do not match for target ${{ matrix.target }}"
             exit 1

ledger_secure_sdk_sys/build.rs

@@ -160,7 +160,10 @@ impl SDKBuilder<'_> {
                     let f = File::open(m_path)
                         .expect("Failed to open c_sdk_build_nanosplus.cflags file");
                     let reader = BufReader::new(f);
-                    reader.lines().filter_map(|line| line.ok()).collect::<Vec<String>>()
+                    reader
+                        .lines()
+                        .filter_map(|line| line.ok())
+                        .collect::<Vec<String>>()
                 },
                 glyphs_folders: Vec::new(),
                 arm_libs: Default::default(),
@@ -191,10 +194,13 @@ impl SDKBuilder<'_> {
                 cflags: {
                     let mut m_path = String::from(env!("CARGO_MANIFEST_DIR"));
                     m_path.push_str("/c_sdk_build_nanox.cflags");
-                    let f = File::open(m_path)
-                        .expect("Failed to open c_sdk_build_nanox.cflags file");
+                    let f =
+                        File::open(m_path).expect("Failed to open c_sdk_build_nanox.cflags file");
                     let reader = BufReader::new(f);
-                    reader.lines().filter_map(|line| line.ok()).collect::<Vec<String>>()
+                    reader
+                        .lines()
+                        .filter_map(|line| line.ok())
+                        .collect::<Vec<String>>()
                 },
                 glyphs_folders: Vec::new(),
                 arm_libs: Default::default(),
@@ -211,10 +217,13 @@ impl SDKBuilder<'_> {
                 cflags: {
                     let mut m_path = String::from(env!("CARGO_MANIFEST_DIR"));
                     m_path.push_str("/c_sdk_build_stax.cflags");
-                    let f = File::open(m_path)
-                        .expect("Failed to open c_sdk_build_stax.cflags file");
+                    let f =
+                        File::open(m_path).expect("Failed to open c_sdk_build_stax.cflags file");
                     let reader = BufReader::new(f);
-                    reader.lines().filter_map(|line| line.ok()).collect::<Vec<String>>()
+                    reader
+                        .lines()
+                        .filter_map(|line| line.ok())
+                        .collect::<Vec<String>>()
                 },
                 glyphs_folders: Vec::new(),
                 arm_libs: Default::default(),
@@ -231,10 +240,13 @@ impl SDKBuilder<'_> {
                 cflags: {
                     let mut m_path = String::from(env!("CARGO_MANIFEST_DIR"));
                     m_path.push_str("/c_sdk_build_flex.cflags");
-                    let f = File::open(m_path)
-                        .expect("Failed to open c_sdk_build_flex.cflags file");
+                    let f =
+                        File::open(m_path).expect("Failed to open c_sdk_build_flex.cflags file");
                     let reader = BufReader::new(f);
-                    reader.lines().filter_map(|line| line.ok()).collect::<Vec<String>>()
+                    reader
+                        .lines()
+                        .filter_map(|line| line.ok())
+                        .collect::<Vec<String>>()
                 },
                 glyphs_folders: Vec::new(),
                 arm_libs: Default::default(),
@@ -251,10 +263,13 @@ impl SDKBuilder<'_> {
                 cflags: {
                     let mut m_path = String::from(env!("CARGO_MANIFEST_DIR"));
                     m_path.push_str("/c_sdk_build_apex_p.cflags");
-                    let f = File::open(m_path)
-                        .expect("Failed to open c_sdk_build_apex_p.cflags file");
+                    let f =
+                        File::open(m_path).expect("Failed to open c_sdk_build_apex_p.cflags file");
                     let reader = BufReader::new(f);
-                    reader.lines().filter_map(|line| line.ok()).collect::<Vec<String>>()
+                    reader
+                        .lines()
+                        .filter_map(|line| line.ok())
+                        .collect::<Vec<String>>()
                 },
                 glyphs_folders: Vec::new(),
                 arm_libs: Default::default(),
@@ -388,7 +403,6 @@ impl SDKBuilder<'_> {
             .files(&AUX_C_FILES)
             .files(str2path(&self.device.c_sdk, &SDK_C_FILES));
 
-
         let glyphs_path = PathBuf::from(env::var("OUT_DIR").unwrap()).join("glyphs");
 
         command = command