Merge 841a3c37f0edd2a2b15c146489b665a226a08ae5 into 17500e457b198c37c4374d142fa7a1d36e4651fe

A named argument that arrives const-qualified was not recognized by
is_named_arg, silently dropping its name. This happens both when a
named argument is passed through an intermediate function returning
const T& (https://github.com/fmtlib/fmt/issues/4866) and in fmt's own
compiled format path, which passes arguments as const T&.

Make is_named_arg and is_static_named_arg see through top-level const so
the name is preserved instead of dropped.

.github/workflows/linux.yml

@@ -13,6 +13,10 @@ jobs:
       ${{matrix.shared && 'Shared' || ''}}
       ${{matrix.cxxflags_extra && 'Sanitize' || ''}}
     runs-on: ${{ matrix.os || 'ubuntu-22.04' }}
+    env:
+      # Run tests in a non-UTC timezone. glibc localtime/strftime honor TZ, so
+      # there is no need for timedatectl, which fails without systemd-timedated.
+      TZ: Europe/Kyiv
     strategy:
       matrix:
         cxx: [g++-4.9, g++-11, clang++-3.6, clang++-11]
@@ -75,15 +79,14 @@ jobs:
     steps:
     - uses: actions/checkout@9c091bb21b7c1c1d1991bb908d89e4e9dddfe3e0 # v7.0.0
 
-    - name: Set timezone
-      run: sudo timedatectl set-timezone 'Europe/Kyiv'
-
     - name: Install GCC 4.9
       run: |
         sudo apt update
         sudo apt install libatomic1 libc6-dev libgomp1 libitm1 libmpc3
         # https://launchpad.net/ubuntu/xenial/amd64/g++-4.9/4.9.3-13ubuntu2
-        wget --no-verbose \
+        # launchpad periodically returns 503s, so retry to avoid flaky CI.
+        wget --no-verbose --tries=5 --waitretry=10 \
+          --retry-connrefused --retry-on-http-error=503 \
           http://launchpadlibrarian.net/230069137/libmpfr4_3.1.3-2_amd64.deb \
           http://launchpadlibrarian.net/253728424/libasan1_4.9.3-13ubuntu2_amd64.deb \
           http://launchpadlibrarian.net/445346135/libubsan0_5.4.0-6ubuntu1~16.04.12_amd64.deb \
@@ -114,7 +117,9 @@ jobs:
         sudo apt update
         sudo apt install libtinfo5
         # https://code.launchpad.net/ubuntu/xenial/amd64/clang-3.6/1:3.6.2-3ubuntu2
-        wget --no-verbose \
+        # launchpad periodically returns 503s, so retry to avoid flaky CI.
+        wget --no-verbose --tries=5 --waitretry=10 \
+          --retry-connrefused --retry-on-http-error=503 \
           http://launchpadlibrarian.net/230019046/libffi6_3.2.1-4_amd64.deb \
           http://launchpadlibrarian.net/445346109/libasan2_5.4.0-6ubuntu1~16.04.12_amd64.deb \
           http://launchpadlibrarian.net/445346135/libubsan0_5.4.0-6ubuntu1~16.04.12_amd64.deb \
@@ -174,6 +179,13 @@ jobs:
         sudo apt install locales-all
         cmake -E make_directory ${{runner.workspace}}/build
 
+    - name: Select matching C compiler
+      run: |
+        cc=${{matrix.cxx}}
+        cc=${cc/clang++/clang}
+        cc=${cc/g++/gcc}
+        echo "CC=$cc" >> "$GITHUB_ENV"
+
     - name: Configure
       working-directory: ${{runner.workspace}}/build
       env:
@@ -199,6 +211,18 @@ jobs:
 
     - name: Test
       working-directory: ${{runner.workspace}}/build
-      run: ctest -C ${{matrix.build_type}}
+      # clang++-3.6 predates the fix for LLVM PR16340 (the controlling
+      # expression of _Generic wasn't decayed/qualifier-stripped before
+      # type matching, fixed upstream in clang 3.8). That makes
+      # FMT_MAKE_ARG's _Generic dispatch in fmt-c.h fail to match string
+      # literals (e.g. "foo", of type char[4]) against the char*/const
+      # char* cases, so they fall through to the 0-arg default case and
+      # the call is passed too many arguments. This is a real, long-fixed
+      # upstream compiler bug rather than a bug in fmt's macro, so only
+      # c-test is skipped here for this one job; see the discussion on
+      # https://github.com/fmtlib/fmt/pull/4863 for the full analysis.
+      run: |
+        exclude="${{ matrix.cxx == 'clang++-3.6' && '-E ^c-test$' || '' }}"
+        ctest -C ${{matrix.build_type}} $exclude
       env:
         CTEST_OUTPUT_ON_FAILURE: True

doc/api.md

@@ -92,6 +92,10 @@ Use `format_as` if you want to make your type formattable as some other
 type with the same format specifiers. The `format_as` function should
 take an object of your type and return an object of a formattable type.
 It should be defined in the same namespace as your type.
+`format_as` cannot be used when a type also matches another `formatter`
+specialization, such as the range `formatter`, because the specializations
+would be ambiguous. Disable the conflicting specialization, if possible,
+or provide an explicit `formatter` specialization instead.
 
 Example ([run](https://godbolt.org/z/nvME4arz8)):
 

include/fmt/base.h

@@ -1059,6 +1059,10 @@ template <typename T> struct is_static_named_arg : std::false_type {};
 template <typename T, typename Char>
 struct is_named_arg<named_arg<T, Char>> : std::true_type {};
 
+template <typename T> struct is_named_arg<const T> : is_named_arg<T> {};
+template <typename T>
+struct is_static_named_arg<const T> : is_static_named_arg<T> {};
+
 template <typename T, typename Char = char> struct named_arg : view {
   const Char* name;
   const T& value;

test/compile-test.cc

@@ -163,6 +163,10 @@ TEST(compile_test, named) {
             fmt::format(FMT_COMPILE("{a0} {a1}"), "a0"_a = 41, "a1"_a = 43));
   EXPECT_EQ("41 43",
             fmt::format(FMT_COMPILE("{a1} {a0}"), "a0"_a = 43, "a1"_a = 41));
+
+  // A statically-named argument with a format spec compiles to spec_field,
+  // which passes the argument to make_format_args as const (#4866).
+  EXPECT_EQ("4.2", fmt::format(FMT_COMPILE("{arg:3.1f}"), "arg"_a = 4.2));
 #  endif
 }