Lint checks minor issues

steve-downey · steve-downey · commit 907e0406400a · 2024-08-13T22:50:22.000-04:00
Spelling, formating, caps, etc.
diff --git a/README.md b/README.md
@@ -43,7 +43,7 @@ Documentation and associated papers are licensed with the Creative Commons Attri
 
 The intent is that the source and documentation are available for use by people implementing their own optional types as well as people using the optional presented here as-is.
 
-The README itself is licesed with CC0 1.0 Universal. Copy the contents and incorporate in your own work as you see fit.
+The README itself is licensed with CC0 1.0 Universal. Copy the contents and incorporate in your own work as you see fit.
 
 // SPDX-License-Identifier: CC0-1.0
 
diff --git a/docs/debug-ci.md b/docs/debug-ci.md
@@ -18,7 +18,7 @@ Setup and tutorial on [nektosact.com/](https://nektosact.com/).
 ```shell
 # Check available jobs
 $ sudo act --container-architecture linux/amd64 --list
-Stage  Job ID  Job name                   Workflow name  Workflow file  Events           
+Stage  Job ID  Job name                   Workflow name  Workflow file  Events
 0      build   ${{ matrix.config.name }}  CI Tests       ci.yml         pull_request,push
 
 # Run all CI jobs
diff --git a/etc/ci-clang-toolchain.cmake b/etc/ci-clang-toolchain.cmake
@@ -4,13 +4,23 @@ set(CMAKE_C_COMPILER clang)
 set(CMAKE_CXX_COMPILER clang++)
 
 set(CMAKE_CXX_FLAGS
-  "-std=c++20 \
+    "-std=c++20 \
    -Wall -Wextra \
    -stdlib=libc++ -fexperimental-library"
-CACHE STRING "CXX_FLAGS" FORCE)
+    CACHE STRING "CXX_FLAGS" FORCE)
 
-set(CMAKE_CXX_FLAGS_DEBUG "-O0 -fno-inline -g3" CACHE STRING "C++ DEBUG Flags" FORCE)
-set(CMAKE_CXX_FLAGS_RELEASE "-Ofast -g0 -DNDEBUG" CACHE STRING "C++ Release Flags" FORCE)
-set(CMAKE_CXX_FLAGS_RELWITHDEBINFO "-O3 -g -DNDEBUG" CACHE STRING "C++ RelWithDebInfo Flags" FORCE)
-set(CMAKE_CXX_FLAGS_TSAN "-O3 -g -DNDEBUG -fsanitize=thread" CACHE STRING "C++ TSAN Flags" FORCE)
-set(CMAKE_CXX_FLAGS_ASAN "-O3 -g -DNDEBUG -fsanitize=address -fsanitize=undefined -fsanitize=leak" CACHE STRING "C++ ASAN Flags" FORCE)
+set(CMAKE_CXX_FLAGS_DEBUG
+    "-O0 -fno-inline -g3"
+    CACHE STRING "C++ DEBUG Flags" FORCE)
+set(CMAKE_CXX_FLAGS_RELEASE
+    "-Ofast -g0 -DNDEBUG"
+    CACHE STRING "C++ Release Flags" FORCE)
+set(CMAKE_CXX_FLAGS_RELWITHDEBINFO
+    "-O3 -g -DNDEBUG"
+    CACHE STRING "C++ RelWithDebInfo Flags" FORCE)
+set(CMAKE_CXX_FLAGS_TSAN
+    "-O3 -g -DNDEBUG -fsanitize=thread"
+    CACHE STRING "C++ TSAN Flags" FORCE)
+set(CMAKE_CXX_FLAGS_ASAN
+    "-O3 -g -DNDEBUG -fsanitize=address -fsanitize=undefined -fsanitize=leak"
+    CACHE STRING "C++ ASAN Flags" FORCE)
diff --git a/etc/clang-16-toolchain.cmake b/etc/clang-16-toolchain.cmake
diff --git a/etc/clang-17-toolchain.cmake b/etc/clang-17-toolchain.cmake
diff --git a/etc/clang-18-toolchain.cmake b/etc/clang-18-toolchain.cmake
diff --git a/etc/clang-19-toolchain.cmake b/etc/clang-19-toolchain.cmake
diff --git a/etc/clang-flags.cmake b/etc/clang-flags.cmake
@@ -3,11 +3,21 @@ include_guard(GLOBAL)
 set(CMAKE_CXX_STANDARD 23)
 
 set(CMAKE_CXX_FLAGS
-   "-stdlib=libc++ -Wall -Wextra "
-CACHE STRING "CXX_FLAGS" FORCE)
+    "-stdlib=libc++ -Wall -Wextra "
+    CACHE STRING "CXX_FLAGS" FORCE)
 
-set(CMAKE_CXX_FLAGS_DEBUG "-O0 -fno-inline -g3" CACHE STRING "C++ DEBUG Flags" FORCE)
-set(CMAKE_CXX_FLAGS_RELEASE "-Ofast -g0 -DNDEBUG" CACHE STRING "C++ Release Flags" FORCE)
-set(CMAKE_CXX_FLAGS_RELWITHDEBINFO "-O3 -g -DNDEBUG" CACHE STRING "C++ RelWithDebInfo Flags" FORCE)
-set(CMAKE_CXX_FLAGS_TSAN "-O3 -g -DNDEBUG -fsanitize=thread" CACHE STRING "C++ TSAN Flags" FORCE)
-set(CMAKE_CXX_FLAGS_ASAN "-O3 -g -DNDEBUG -fsanitize=address,undefined,leak" CACHE STRING "C++ ASAN Flags" FORCE)
+set(CMAKE_CXX_FLAGS_DEBUG
+    "-O0 -fno-inline -g3"
+    CACHE STRING "C++ DEBUG Flags" FORCE)
+set(CMAKE_CXX_FLAGS_RELEASE
+    "-Ofast -g0 -DNDEBUG"
+    CACHE STRING "C++ Release Flags" FORCE)
+set(CMAKE_CXX_FLAGS_RELWITHDEBINFO
+    "-O3 -g -DNDEBUG"
+    CACHE STRING "C++ RelWithDebInfo Flags" FORCE)
+set(CMAKE_CXX_FLAGS_TSAN
+    "-O3 -g -DNDEBUG -fsanitize=thread"
+    CACHE STRING "C++ TSAN Flags" FORCE)
+set(CMAKE_CXX_FLAGS_ASAN
+    "-O3 -g -DNDEBUG -fsanitize=address,undefined,leak"
+    CACHE STRING "C++ ASAN Flags" FORCE)
diff --git a/etc/gcc-11-toolchain.cmake b/etc/gcc-11-toolchain.cmake
diff --git a/etc/gcc-12-toolchain.cmake b/etc/gcc-12-toolchain.cmake
diff --git a/etc/gcc-13-toolchain.cmake b/etc/gcc-13-toolchain.cmake
diff --git a/etc/gcc-14-toolchain.cmake b/etc/gcc-14-toolchain.cmake
diff --git a/etc/gcc-flags.cmake b/etc/gcc-flags.cmake
@@ -3,11 +3,21 @@ include_guard(GLOBAL)
 set(CMAKE_CXX_STANDARD 23)
 
 set(CMAKE_CXX_FLAGS
-   "-std=c++23 -Wall -Wextra "
-CACHE STRING "CXX_FLAGS" FORCE)
+    "-std=c++23 -Wall -Wextra "
+    CACHE STRING "CXX_FLAGS" FORCE)
 
-set(CMAKE_CXX_FLAGS_DEBUG "-O0 -fno-inline -g3" CACHE STRING "C++ DEBUG Flags" FORCE)
-set(CMAKE_CXX_FLAGS_RELEASE "-Ofast -g0 -DNDEBUG" CACHE STRING "C++ Release Flags" FORCE)
-set(CMAKE_CXX_FLAGS_RELWITHDEBINFO "-O3 -g -DNDEBUG" CACHE STRING "C++ RelWithDebInfo Flags" FORCE)
-set(CMAKE_CXX_FLAGS_TSAN "-O3 -g -DNDEBUG -fsanitize=thread" CACHE STRING "C++ TSAN Flags" FORCE)
-set(CMAKE_CXX_FLAGS_ASAN "-O3 -g -DNDEBUG -fsanitize=undefined" CACHE STRING "C++ ASAN Flags" FORCE)
+set(CMAKE_CXX_FLAGS_DEBUG
+    "-O0 -fno-inline -g3"
+    CACHE STRING "C++ DEBUG Flags" FORCE)
+set(CMAKE_CXX_FLAGS_RELEASE
+    "-Ofast -g0 -DNDEBUG"
+    CACHE STRING "C++ Release Flags" FORCE)
+set(CMAKE_CXX_FLAGS_RELWITHDEBINFO
+    "-O3 -g -DNDEBUG"
+    CACHE STRING "C++ RelWithDebInfo Flags" FORCE)
+set(CMAKE_CXX_FLAGS_TSAN
+    "-O3 -g -DNDEBUG -fsanitize=thread"
+    CACHE STRING "C++ TSAN Flags" FORCE)
+set(CMAKE_CXX_FLAGS_ASAN
+    "-O3 -g -DNDEBUG -fsanitize=undefined"
+    CACHE STRING "C++ ASAN Flags" FORCE)
diff --git a/etc/gcc-toolchain.cmake b/etc/gcc-toolchain.cmake
@@ -4,12 +4,22 @@ set(CMAKE_C_COMPILER gcc)
 set(CMAKE_CXX_COMPILER g++)
 
 set(CMAKE_CXX_FLAGS
-  "-std=c++20 \
+    "-std=c++20 \
    -Wall -Wextra "
-CACHE STRING "CXX_FLAGS" FORCE)
+    CACHE STRING "CXX_FLAGS" FORCE)
 
-set(CMAKE_CXX_FLAGS_DEBUG "-O0 -fno-inline -g3" CACHE STRING "C++ DEBUG Flags" FORCE)
-set(CMAKE_CXX_FLAGS_RELEASE "-Ofast -g0 -DNDEBUG" CACHE STRING "C++ Release Flags" FORCE)
-set(CMAKE_CXX_FLAGS_RELWITHDEBINFO "-O3 -g -DNDEBUG" CACHE STRING "C++ RelWithDebInfo Flags" FORCE)
-set(CMAKE_CXX_FLAGS_TSAN "-O3 -g -DNDEBUG -fsanitize=thread" CACHE STRING "C++ TSAN Flags" FORCE)
-set(CMAKE_CXX_FLAGS_ASAN "-O3 -g -DNDEBUG -fsanitize=address,undefined,leak" CACHE STRING "C++ ASAN Flags" FORCE)
+set(CMAKE_CXX_FLAGS_DEBUG
+    "-O0 -fno-inline -g3"
+    CACHE STRING "C++ DEBUG Flags" FORCE)
+set(CMAKE_CXX_FLAGS_RELEASE
+    "-Ofast -g0 -DNDEBUG"
+    CACHE STRING "C++ Release Flags" FORCE)
+set(CMAKE_CXX_FLAGS_RELWITHDEBINFO
+    "-O3 -g -DNDEBUG"
+    CACHE STRING "C++ RelWithDebInfo Flags" FORCE)
+set(CMAKE_CXX_FLAGS_TSAN
+    "-O3 -g -DNDEBUG -fsanitize=thread"
+    CACHE STRING "C++ TSAN Flags" FORCE)
+set(CMAKE_CXX_FLAGS_ASAN
+    "-O3 -g -DNDEBUG -fsanitize=address,undefined,leak"
+    CACHE STRING "C++ ASAN Flags" FORCE)
diff --git a/etc/llvm-16-toolchain.cmake b/etc/llvm-16-toolchain.cmake
@@ -4,13 +4,23 @@ set(CMAKE_C_COMPILER clang-16)
 set(CMAKE_CXX_COMPILER clang++-16)
 
 set(CMAKE_CXX_FLAGS
-  "-std=c++20 \
+    "-std=c++20 \
    -Wall -Wextra \
    -stdlib=libc++ -fexperimental-library"
-CACHE STRING "CXX_FLAGS" FORCE)
+    CACHE STRING "CXX_FLAGS" FORCE)
 
-set(CMAKE_CXX_FLAGS_DEBUG "-O0 -fno-inline -g3" CACHE STRING "C++ DEBUG Flags" FORCE)
-set(CMAKE_CXX_FLAGS_RELEASE "-Ofast -g0 -DNDEBUG" CACHE STRING "C++ Release Flags" FORCE)
-set(CMAKE_CXX_FLAGS_RELWITHDEBINFO "-O3 -g -DNDEBUG" CACHE STRING "C++ RelWithDebInfo Flags" FORCE)
-set(CMAKE_CXX_FLAGS_TSAN "-O3 -g -DNDEBUG -fsanitize=thread" CACHE STRING "C++ TSAN Flags" FORCE)
-set(CMAKE_CXX_FLAGS_ASAN "-O3 -g -DNDEBUG -fsanitize=address -fsanitize=undefined -fsanitize=leak" CACHE STRING "C++ ASAN Flags" FORCE)
+set(CMAKE_CXX_FLAGS_DEBUG
+    "-O0 -fno-inline -g3"
+    CACHE STRING "C++ DEBUG Flags" FORCE)
+set(CMAKE_CXX_FLAGS_RELEASE
+    "-Ofast -g0 -DNDEBUG"
+    CACHE STRING "C++ Release Flags" FORCE)
+set(CMAKE_CXX_FLAGS_RELWITHDEBINFO
+    "-O3 -g -DNDEBUG"
+    CACHE STRING "C++ RelWithDebInfo Flags" FORCE)
+set(CMAKE_CXX_FLAGS_TSAN
+    "-O3 -g -DNDEBUG -fsanitize=thread"
+    CACHE STRING "C++ TSAN Flags" FORCE)
+set(CMAKE_CXX_FLAGS_ASAN
+    "-O3 -g -DNDEBUG -fsanitize=address -fsanitize=undefined -fsanitize=leak"
+    CACHE STRING "C++ ASAN Flags" FORCE)
diff --git a/etc/llvm-master-toolchain.cmake b/etc/llvm-master-toolchain.cmake
@@ -1,20 +1,32 @@
-set(LLVM_ROOT "$ENV{LLVM_ROOT}" CACHE PATH "Path to LLVM installation")
+set(LLVM_ROOT
+    "$ENV{LLVM_ROOT}"
+    CACHE PATH "Path to LLVM installation")
 
 set(CMAKE_C_COMPILER ${LLVM_ROOT}/bin/clang)
 set(CMAKE_CXX_COMPILER ${LLVM_ROOT}/bin/clang++)
 
 set(CMAKE_CXX_FLAGS
-  "-std=c++2a \
+    "-std=c++2a \
    -Wall -Wextra \
    -stdlib=libc++ "
-CACHE STRING "CXX_FLAGS" FORCE)
+    CACHE STRING "CXX_FLAGS" FORCE)
 
 set(CMAKE_EXE_LINKER_FLAGS
-  "-Wl,-rpath,${LLVM_ROOT}/lib"
-CACHE STRING "CMAKE_EXE_LINKER_FLAGS" FORCE)
+    "-Wl,-rpath,${LLVM_ROOT}/lib"
+    CACHE STRING "CMAKE_EXE_LINKER_FLAGS" FORCE)
 
-set(CMAKE_CXX_FLAGS_DEBUG "-O0 -fno-inline -g3" CACHE STRING "C++ DEBUG Flags" FORCE)
-set(CMAKE_CXX_FLAGS_RELEASE "-Ofast -g0 -DNDEBUG" CACHE STRING "C++ Release Flags" FORCE)
-set(CMAKE_CXX_FLAGS_RELWITHDEBINFO "-O3 -g -DNDEBUG" CACHE STRING "C++ Release Flags" FORCE)
-set(CMAKE_CXX_FLAGS_TSAN "-O3 -g -DNDEBUG -fsanitize=thread" CACHE STRING "C++ TSAN Flags" FORCE)
-set(CMAKE_CXX_FLAGS_ASAN "-O3 -g -DNDEBUG -fsanitize=address -fsanitize=undefined -fsanitize=leak" CACHE STRING "C++ ASAN Flags" FORCE)
+set(CMAKE_CXX_FLAGS_DEBUG
+    "-O0 -fno-inline -g3"
+    CACHE STRING "C++ DEBUG Flags" FORCE)
+set(CMAKE_CXX_FLAGS_RELEASE
+    "-Ofast -g0 -DNDEBUG"
+    CACHE STRING "C++ Release Flags" FORCE)
+set(CMAKE_CXX_FLAGS_RELWITHDEBINFO
+    "-O3 -g -DNDEBUG"
+    CACHE STRING "C++ Release Flags" FORCE)
+set(CMAKE_CXX_FLAGS_TSAN
+    "-O3 -g -DNDEBUG -fsanitize=thread"
+    CACHE STRING "C++ TSAN Flags" FORCE)
+set(CMAKE_CXX_FLAGS_ASAN
+    "-O3 -g -DNDEBUG -fsanitize=address -fsanitize=undefined -fsanitize=leak"
+    CACHE STRING "C++ ASAN Flags" FORCE)
diff --git a/etc/llvm-toolchain.cmake b/etc/llvm-toolchain.cmake
@@ -4,13 +4,23 @@ set(CMAKE_C_COMPILER clang-14)
 set(CMAKE_CXX_COMPILER clang++-14)
 
 set(CMAKE_CXX_FLAGS
-  "-std=c++20 \
+    "-std=c++20 \
    -Wall -Wextra \
    -stdlib=libstdc++ "
-CACHE STRING "CXX_FLAGS" FORCE)
+    CACHE STRING "CXX_FLAGS" FORCE)
 
-set(CMAKE_CXX_FLAGS_DEBUG "-O0 -fno-inline -g3" CACHE STRING "C++ DEBUG Flags" FORCE)
-set(CMAKE_CXX_FLAGS_RELEASE "-Ofast -g0 -DNDEBUG" CACHE STRING "C++ Release Flags" FORCE)
-set(CMAKE_CXX_FLAGS_RELWITHDEBINFO "-O3 -g -DNDEBUG" CACHE STRING "C++ RelWithDebInfo Flags" FORCE)
-set(CMAKE_CXX_FLAGS_TSAN "-O3 -g -DNDEBUG -fsanitize=thread" CACHE STRING "C++ TSAN Flags" FORCE)
-set(CMAKE_CXX_FLAGS_ASAN "-O3 -g -DNDEBUG -fsanitize=address -fsanitize=undefined -fsanitize=leak" CACHE STRING "C++ ASAN Flags" FORCE)
+set(CMAKE_CXX_FLAGS_DEBUG
+    "-O0 -fno-inline -g3"
+    CACHE STRING "C++ DEBUG Flags" FORCE)
+set(CMAKE_CXX_FLAGS_RELEASE
+    "-Ofast -g0 -DNDEBUG"
+    CACHE STRING "C++ Release Flags" FORCE)
+set(CMAKE_CXX_FLAGS_RELWITHDEBINFO
+    "-O3 -g -DNDEBUG"
+    CACHE STRING "C++ RelWithDebInfo Flags" FORCE)
+set(CMAKE_CXX_FLAGS_TSAN
+    "-O3 -g -DNDEBUG -fsanitize=thread"
+    CACHE STRING "C++ TSAN Flags" FORCE)
+set(CMAKE_CXX_FLAGS_ASAN
+    "-O3 -g -DNDEBUG -fsanitize=address -fsanitize=undefined -fsanitize=leak"
+    CACHE STRING "C++ ASAN Flags" FORCE)
diff --git a/examples/CMakeLists.txt b/examples/CMakeLists.txt
@@ -11,19 +11,19 @@ include(GNUInstallDirs)
 set(EXAMPLES concept_checks optional_ref pythagorean_triples range_loop sample
              std_vs_beman)
 
-foreach(EXAMPLE ${EXAMPLES})
+foreach(example ${EXAMPLES})
   # Add example executable.
-  add_executable(${EXAMPLE} "")
+  add_executable(${example} "")
 
   # Add example source file.
-  target_sources(${EXAMPLE} PRIVATE ${EXAMPLE}.cpp)
+  target_sources(${example} PRIVATE ${example}.cpp)
 
   # Link example with the library.
-  target_link_libraries(${EXAMPLE} "${BEMAN_OPTIONAL26_LIBRARY}")
+  target_link_libraries(${example} "${BEMAN_OPTIONAL26_LIBRARY}")
 
   # Install .
   install(
-    TARGETS ${EXAMPLE}
+    TARGETS ${example}
     EXPORT ${TARGETS_EXPORT_NAME}
     DESTINATION ${CMAKE_INSTALL_BINDIR})
 endforeach()
diff --git a/papers/.clang-format b/papers/.clang-format
@@ -109,11 +109,3 @@ SpacesInSquareBrackets: false
 Standard:        Auto
 TabWidth:        8
 UseTab:          Never
-
----
-Language:        Cpp
-
----
-Language:        ObjC
-
-...
diff --git a/papers/P2988/abstract.bst b/papers/P2988/abstract.bst
@@ -1,4 +1,4 @@
-% BibTeX bibliography style `abstract' 
+% BibTeX bibliography style `abstract'
 % by David Kotz dfk@cs.duke.edu
 % March 1989, May 1993, November 1995, October 2000
 %    modified from
@@ -556,8 +556,8 @@ FUNCTION {format.incoll.inproc.crossref}
 FUNCTION {format.abstract}
 { abstract empty$
     { "" }
-    { "\begin{quotation}\noindent {\bf Abstract:} " 
-	abstract * 
+    { "\begin{quotation}\noindent {\bf Abstract:} "
+	abstract *
 	" \end{quotation}" *}
   if$
 }
@@ -589,7 +589,7 @@ FUNCTION {format.comment}
     }
     {	private empty$
 		{ "\begin{quote} {\bf Comment:} " comment * " \end{quote}" *}
-		{ "\begin{quote} {\bf Comment:} " comment * 
+		{ "\begin{quote} {\bf Comment:} " comment *
 				" {\bf Private:} " * private *
 				" \end{quote}" * }
 	if$
diff --git a/papers/P2988/presentation/optional_ref.md b/papers/P2988/presentation/optional_ref.md
@@ -80,7 +80,7 @@ nullable
 </td>
 <td style="font-size:80%; background-color: #EAFDC7A0">
 to denote missing value<br/>
-best for return values 
+best for return values
 </td>
 </tr>
 <tr class="fragment">
@@ -123,18 +123,18 @@ nullable
 </td>
 <td  style="background-color: #F9DE96A0; vertical-align:middle;">fixed</td>
 <td  style="background-color: #F9DE96A0; font-size: 70%; vertical-align:middle;">
-  
+
 `jss::object_ptr<T> const`{.cpp}<br/>
 `boost::optional<T&> const`{.cpp}
 
 </td>
 <td rowspan="2" style="vertical-align:middle;font-size:70%;background-color: #F9DE96A0">
-  
+
 missing in std<br/>
 `std::optional`{.cpp} can not do this<br/>
 `boost::optional`{.cpp} can<br/>
 `object_ptr<T>`{.cpp} by A. Williams
-  
+
 </td>
 </tr>
 <tr class="fragment">
@@ -157,7 +157,7 @@ missing in std<br/>
 
 > assigning a reference to an `optional<T&>` rebinds.
 
-* no other semantics is actually reasonable. 
+* no other semantics is actually reasonable.
 
 ## Why the mess wrt assignment ?
 
@@ -171,12 +171,11 @@ I say:
 
 > Pointers have a too wide interface (arithmetic!, array semantics, `void*` conversion), optional references remove unsafe operations and provide semantic meaning lacking in a pointer, where it is only given by convention, as in the Core Guidelines
 
-`optional<T&>` 
+`optional<T&>`
 
 * type says what it is
 * monadic API makes usage superior to `T*`
 
 :::
 
 # [P2988](https://wg21.link/P2988)
-
diff --git a/src/Beman/Optional26/CMakeLists.txt b/src/Beman/Optional26/CMakeLists.txt
@@ -12,7 +12,7 @@ target_include_directories(
   beman_optional26
   PUBLIC
     $<BUILD_INTERFACE:${CMAKE_CURRENT_SOURCE_DIR}/../../../include>
-    $<INSTALL_INTERFACE:${CMAKE_INSTALL_INCLUDEDIR}/${CMAKE_LOWER_PROJECT_NAME}> # <prefix>/include/scratch
+    $<INSTALL_INTERFACE:${CMAKE_INSTALL_INCLUDEDIR}/${CMAKE_LOWER_PROJECT_NAME}>
 )
 
 install(
diff --git a/src/Beman/Optional26/tests/optional_range_support.t.cpp b/src/Beman/Optional26/tests/optional_range_support.t.cpp
@@ -183,7 +183,7 @@ TEST(RangeSupportTest, FormatOptionalIsStillDisabled) {
 #if defined(__cpp_lib_format_ranges)
     EXPECT_EQ(std::format_kind<beman::optional26::optional<int>>, std::range_format::disabled);
 
-    // Next line shold not compile: formatter is not defined for optional.
+    // Next line should not compile: formatter is not defined for optional.
     // EXPECT_EQ(std::format("{}", beman::optional26::optional<int> {}), "[]");
 #endif
 }
diff --git a/src/Beman/Optional26/tests/optional_ref.t.cpp b/src/Beman/Optional26/tests/optional_ref.t.cpp
@@ -55,9 +55,9 @@ TEST(OptionalRefTest, Constructors) {
     (void)nd1;
     (void)nd2;
 
-    no_default nd{e};
+    no_default nodef{e};
 
-    beman::optional26::optional<no_default&> nd3 = nd;
+    beman::optional26::optional<no_default&> nd3 = nodef;
     (void)nd3;
 
     beman::optional26::optional<int&> ie;
