Upgrade CI and fix satisfy matcher

Author: stellar-aria

.github/workflows/test.yml

@@ -16,12 +16,12 @@ jobs:
     strategy:
       fail-fast: false
       matrix:
-        compiler: [native, llvm-18, gcc-14]
-        os: [ubuntu-latest, windows-latest, macos-13, macos-15]
+        compiler: [native, llvm-20, gcc-14]
+        os: [ubuntu-latest, windows-latest, macos-14, macos-15]
         exclude:
           - os: windows-latest
             compiler: gcc-14
-          - os: macos-13
+          - os: macos-14
             compiler: native # AppleClang is too old
 
     steps:
@@ -33,17 +33,17 @@ jobs:
 
       - name: Install Clang
         run: |
-          brew install llvm@18
-          brew link --force --overwrite llvm@18
-          echo "CC=$(brew --prefix llvm@18)/bin/clang" >> $GITHUB_ENV
-          echo "CXX=$(brew --prefix llvm@18)/bin/clang++" >> $GITHUB_ENV
-        if: ${{ matrix.compiler == 'llvm-18' && (matrix.os == 'macos-13' || matrix.os == 'macos-15') }}
+          brew install llvm@20
+          brew link --force --overwrite llvm@20
+          echo "CC=$(brew --prefix llvm@20)/bin/clang" >> $GITHUB_ENV
+          echo "CXX=$(brew --prefix llvm@20)/bin/clang++" >> $GITHUB_ENV
+        if: ${{ matrix.compiler == 'llvm-20' && (matrix.os == 'macos-14' || matrix.os == 'macos-15') }}
 
       - name: Use LLVM and Clang
         run: |
-          echo "CC=clang-18" >> $GITHUB_ENV
-          echo "CXX=clang++-18" >> $GITHUB_ENV
-        if: ${{ matrix.compiler == 'llvm-18' && (matrix.os != 'macos-13' && matrix.os != 'macos-15') }}
+          echo "CC=clang-20" >> $GITHUB_ENV
+          echo "CXX=clang++-20" >> $GITHUB_ENV
+        if: ${{ matrix.compiler == 'llvm-20' && (matrix.os != 'macos-14' && matrix.os != 'macos-15') }}
 
       - name: Use GCC
         run: |
@@ -53,11 +53,11 @@ jobs:
 
       - name: Configure
         run: cmake -B build -DCPPSPEC_BUILD_TESTS=YES
-        if: ${{ matrix.compiler != 'llvm-18' || matrix.os != 'windows-latest' }}
+        if: ${{ matrix.compiler != 'llvm-20' || matrix.os != 'windows-latest' }}
 
       - name: Configure ClangCL
         run: cmake -B build -DCPPSPEC_BUILD_TESTS=YES -G "Visual Studio 17 2022" -T ClangCL
-        if: ${{ matrix.compiler == 'llvm-18' && matrix.os == 'windows-latest' }}
+        if: ${{ matrix.compiler == 'llvm-20' && matrix.os == 'windows-latest' }}
 
       - name: Build
         run: cmake --build build --config Release

include/matchers/satisfy.hpp

@@ -33,12 +33,12 @@ class Satisfy : public MatcherBase<A, bool>  //, BeHelpers<Satisfy<A>>
 
 template <typename A>
 std::string Satisfy<A>::failure_message() {
-  return std::format("expected {} to evaluate to true", MatcherBase<A, bool>::actual());
+  return std::format("expected {} to evaluate to true", Pretty::to_word(MatcherBase<A, bool>::actual()));
 }
 
 template <typename A>
 std::string Satisfy<A>::failure_message_when_negated() {
-  return std::format("expected {} to evaluate to false", MatcherBase<A, bool>::actual());
+  return std::format("expected {} to evaluate to false", Pretty::to_word(MatcherBase<A, bool>::actual()));
 }
 
 template <typename A>