Merge pull request #138 from hzeller/feature-20240720-update-format

Update to clang-format 17
hzeller · Jul 21, 2024 · 2805821 · 2805821
2 parents be1af53 + e94dfee
commit 2805821
Show file tree

Hide file tree

Showing 3 changed files with 4 additions and 6 deletions.
diff --git a/.github/workflows/ubuntu.yml b/.github/workflows/ubuntu.yml
@@ -68,7 +68,7 @@ jobs:
           build/src/timg --version
 
   CodeFormatting:
-    runs-on: ubuntu-latest
+    runs-on: ubuntu-24.04
 
     steps:
 
@@ -79,7 +79,7 @@ jobs:
 
     - name: Install Dependencies
       run: |
-        sudo apt-get install clang-format-13
+        sudo apt-get install clang-format-17
 
     - name: Run formatting style check
       run: ./.github/bin/run-clang-format.sh

diff --git a/shell.nix b/shell.nix
@@ -26,6 +26,6 @@ pkgs.mkShell {
 
        openslide
        pandoc
-       clang-tools_13  # clang-format
+       clang-tools_17  # clang-format
     ];
 }
diff --git a/src/timg-time.h b/src/timg-time.h
@@ -64,9 +64,7 @@ class Duration {
         return Duration(1000000000, 0);  // a few years; infinite enough :)
     }
 
-    struct timespec AsTimespec() const {
-        return duration_;
-    }
+    struct timespec AsTimespec() const { return duration_; }
     struct timeval AsTimeval() const {
         return {duration_.tv_sec, (suseconds_t)(duration_.tv_nsec / 1000)};
     }