Merge branch 'master' into v3/dev

eliaskosunen · May 20, 2024 · 8bb7624 · 8bb7624
2 parents 08be1c0 + 88892f3
commit 8bb7624
Show file tree

Hide file tree

Showing 6 changed files with 12 additions and 12 deletions.
diff --git a/.github/workflows/windows.yml b/.github/workflows/windows.yml
@@ -27,6 +27,7 @@ on:
       - 'src/**'
       - 'tests/**'
       - '**/CMakeLists.txt'
+  workflow_dispatch:
 
 concurrency:
   group: ${{ github.workflow }}-${{ github.event.pull_request.number || github.ref_name }}-${{ github.ref_type == 'branch' && github.sha }}-${{ github.event_name == 'workflow_dispatch' }}-${{ github.event_name == 'schedule' }}-${{ github.event.schedule }}
@@ -180,10 +181,14 @@ jobs:
           # llvm, ucrt, libc++
           - clang32
           - clang64
+          # gcc, cygwin, libstdc++ (64-bit)
+          - msys
+
         exclude:
-          # FIXME: bugging out with float parsing
+          # Buggy float parsing
           - sys: clang32
           - sys: clang64
+          - sys: msys
 
     steps:
       - uses: msys2/setup-msys2@v2

diff --git a/CMakeLists.txt b/CMakeLists.txt
@@ -2,7 +2,7 @@ cmake_minimum_required(VERSION 3.16)
 
 project(
         scn
-        VERSION 2.0.2
+        VERSION 2.0.3
         DESCRIPTION "scanf for modern C++"
         HOMEPAGE_URL "https://scnlib.dev"
         LANGUAGES CXX

diff --git a/README.md b/README.md
@@ -42,10 +42,6 @@ other direction.
 This library is the reference implementation of the ISO C++ standards proposal
 [P1729 "Text Parsing"](https://wg21.link/p1729).
 
-The previous major release (v1.1.3) is hosted at the `v1`-branch.
-It has a substantially different interface, and support for C++11 and C++14,
-but it's unlikely that it'll get updated.
-
 ## Documentation
 
 The documentation can be found online, from https://scnlib.dev.

diff --git a/docs/pages/mainpage.md b/docs/pages/mainpage.md
@@ -72,7 +72,7 @@ Another option would be usage through CMake's `FetchContent` module.
 FetchContent_Declare(
         scn
         GIT_REPOSITORY  https://github.com/eliaskosunen/scnlib
-        GIT_TAG         v2.0.2
+        GIT_TAG         v2.0.3
         GIT_SHALLOW     TRUE
 )
 FetchContent_MakeAvailable(scn)

diff --git a/tests/unittests/args_test.cpp b/tests/unittests/args_test.cpp
@@ -23,11 +23,10 @@ using ::testing::Test;
 
 TEST(ArgsTest, ArgTypeMapping)
 {
-    static_assert(
-        scn::detail::mapped_type_constant<int, scn::scan_context>::value ==
-        scn::detail::arg_type::int_type);
+    static_assert(scn::detail::mapped_type_constant<int, char>::value ==
+                  scn::detail::arg_type::int_type);
     static_assert(scn::detail::mapped_type_constant<scn::detail::dummy_type,
-                                                    scn::scan_context>::value ==
+                                                    char>::value ==
                   scn::detail::arg_type::custom_type);
 
     // narrow context, narrow char -> valid

diff --git a/tests/unittests/impl_tests/integer_reader_test.h b/tests/unittests/impl_tests/integer_reader_test.h
@@ -111,7 +111,7 @@ class IntValueReaderTest : public testing::Test {
     }
     static auto get_oct_followed_by_dec()
     {
-        return std::make_tuple(int_type{8}, "08"sv);
+        return std::make_pair(int_type{8}, "08"sv);
     }
 
     static auto get_bin()