Skip to content

Re-Enable fmt module tests, update module-test.cc #4702

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
MathewBensonCode wants to merge 1 commit into
base: main
Choose a base branch
from
+126 −70
Open

Re-Enable fmt module tests, update module-test.cc #4702

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
6 changes: 3 additions & 3 deletions .github/workflows/linux.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -37,10 +37,10 @@ jobs:
std: 23
install: sudo apt install g++-13
shared: -DBUILD_SHARED_LIBS=ON
- cxx: g++-14
- cxx: g++-15
build_type: Release
std: 23
install: sudo apt install g++-14
install: sudo apt install g++-15
gen: Ninja
- cxx: clang++-3.6
- cxx: clang++-11
Expand Down Expand Up @@ -147,7 +147,7 @@ jobs:
- name: Add repositories for newer GCC
run: |
sudo apt-add-repository ppa:ubuntu-toolchain-r/test
if: ${{ matrix.cxx == 'g++-13' || matrix.cxx == 'g++-14' }}
if: ${{ matrix.cxx == 'g++-13' || matrix.cxx == 'g++-15' }}

- name: Install LLVM-20
run: |
Expand Down
8 changes: 4 additions & 4 deletions include/fmt/base.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1872,10 +1872,10 @@ template <typename OutputIt, typename T, typename = void>
struct has_insert : std::false_type {};

template <typename OutputIt, typename T>
struct has_insert<OutputIt, T,
void_t<decltype(get_container(std::declval<OutputIt>())
.insert({}, std::declval<T>(),
std::declval<T>()))>>
struct has_insert<
OutputIt, T,
void_t<decltype(get_container(std::declval<OutputIt>())
.insert({}, std::declval<T>(), std::declval<T>()))>>
: std::true_type {};

// An optimized version of std::copy with the output value type (T).
Expand Down
6 changes: 2 additions & 4 deletions test/CMakeLists.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -19,7 +19,7 @@ function (add_fmt_test name)
set(PEDANTIC_COMPILE_FLAGS ${PEDANTIC_COMPILE_FLAGS} -Wno-weak-vtables)
endif ()
elseif (ADD_FMT_TEST_MODULE)
set(libs test-main)
set(libs test-main fmt-module)
else ()
set(libs test-main fmt)
endif ()
Expand Down Expand Up @@ -81,9 +81,7 @@ add_executable(perf-sanity perf-sanity.cc)
target_link_libraries(perf-sanity fmt::fmt)

if (FMT_MODULE)
# Module tests are currently disabled.
# add_fmt_test(module-test MODULE test-main.cc)
# target_link_libraries(module-test fmt-module)
add_fmt_test(module-test MODULE)
endif ()

if (NOT DEFINED MSVC_STATIC_RUNTIME AND MSVC)
Expand Down
Loading
Loading