minor cleanups

Author: nschimme

src/client/PaletteManager.h

@@ -24,7 +24,7 @@ class NODISCARD PaletteManager final
 private:
     QPalette m_focused;
     QPalette m_unfocused;
-    MAYBE_UNUSED bool m_initialized = false;
+    bool m_initialized = false;
 
 public:
     void init(QWidget &widget, const std::optional<QColor> &activeBg, const QColor &inactiveBg);

src/global/AnsiTextUtils.h

@@ -589,14 +589,14 @@ struct NODISCARD AnsiItuColorCodes final
     NODISCARD int operator[](const size_t pos) const { return at(pos); }
 
 public:
-    class NODISCARD ConstIterator final
+    class ALLOW_DISCARD ConstIterator final
     {
     private:
         const AnsiItuColorCodes *m_self = nullptr;
         uint8_t m_pos = 0;
 
     public:
-        explicit ConstIterator(const AnsiItuColorCodes *const self, const uint8_t pos)
+        NODISCARD explicit ConstIterator(const AnsiItuColorCodes *const self, const uint8_t pos)
             : m_self{self}
             , m_pos{pos}
         {
@@ -607,7 +607,8 @@ struct NODISCARD AnsiItuColorCodes final
         NODISCARD const AnsiItuColorCodes &getSelf() const { return deref(m_self); }
 
     public:
-        NODISCARD ConstIterator operator++()
+        void operator++(int) = delete;
+        ALLOW_DISCARD ConstIterator operator++()
         {
             if (m_pos >= getSelf().size()) {
                 throw std::runtime_error("invalid increment");

src/global/ConversionResult.h

@@ -7,19 +7,17 @@
 
 #include <type_traits>
 
+#ifdef __clang__
+#pragma clang diagnostic push
+#pragma clang diagnostic ignored "-Wpadded"
+#endif
 template<typename T>
 class NODISCARD ConversionResult final
 {
 private:
     T m_value{};
     CastErrorEnum m_result = CastErrorEnum::Success;
 
-    // This is just to avoid a padding warning
-    static inline constexpr auto PAD_BYTES = (alignof(T) > sizeof(CastErrorEnum))
-                                                 ? (alignof(T) - sizeof(CastErrorEnum))
-                                                 : alignof(T);
-    MAYBE_UNUSED char m_unused_pad[PAD_BYTES]{};
-
 public:
     constexpr explicit ConversionResult(const T n) noexcept
         : m_value{n}
@@ -60,3 +58,6 @@ class NODISCARD ConversionResult final
         return is_valid() && m_value == intValue;
     }
 };
+#ifdef __clang__
+#pragma clang diagnostic pop
+#endif

src/global/Flags.h

@@ -273,14 +273,14 @@ class NODISCARD Flags
     }
 
 public:
-    struct NODISCARD Iterator final
+    struct ALLOW_DISCARD Iterator final
     {
     private:
         Flags::underlying_type m_bits = 0;
         size_t m_pos = 0;
 
     public:
-        Iterator(const Flags flags, const size_t pos)
+        NODISCARD Iterator(const Flags flags, const size_t pos)
             : m_bits{flags.m_flags}
             , m_pos{pos}
         {}

src/global/cast_error.h

@@ -16,14 +16,14 @@ enum class NODISCARD CastErrorEnum : uint8_t {
     RoundTripFailure,
 };
 
+#ifdef __clang__
+#pragma clang diagnostic push
+#pragma clang diagnostic ignored "-Wpadded"
+#endif
 struct NODISCARD CastErrorException : public std::runtime_error
 {
     CastErrorEnum err = CastErrorEnum::Success;
 
-    // This is just to avoid a padding warning.
-    static_assert(alignof(std::runtime_error) > sizeof(CastErrorEnum));
-    MAYBE_UNUSED char unused_pad[alignof(std::runtime_error) - sizeof(CastErrorEnum)]{};
-
     explicit CastErrorException(const CastErrorEnum e)
         : std::runtime_error{"CastErrorException"}
         , err{e}
@@ -32,3 +32,6 @@ struct NODISCARD CastErrorException : public std::runtime_error
     }
     ~CastErrorException() override;
 };
+#ifdef __clang__
+#pragma clang diagnostic pop
+#endif

src/map/ChangePrinter.cpp

@@ -61,7 +61,7 @@ struct NODISCARD ChangePrinter::StructHelper final
         m_cp.print(std::forward<V>(value));
     }
 
-    explicit operator bool() const { return true; }
+    NODISCARD explicit operator bool() const { return true; }
 };
 
 #define BEGIN_FLAGS_HELPER(name) if (FlagsHelper helper{*this, name})
@@ -96,7 +96,7 @@ struct NODISCARD ChangePrinter::FlagsHelper final
         m_cp.print(std::forward<T>(thing));
     }
 
-    explicit operator bool() const { return true; }
+    NODISCARD explicit operator bool() const { return true; }
 };
 
 ChangePrinter::ChangePrinter(Remap remap, AnsiOstream &os)

src/map/Map.h

@@ -19,6 +19,9 @@
 #include <ostream>
 #include <vector>
 
+namespace mm {
+struct AbstractDebugOStream;
+}
 class AnsiOstream;
 class Change;
 class ChangeList;
@@ -141,8 +144,9 @@ class NODISCARD Map final
 
 struct NODISCARD MapApplyResult final
 {
+    static inline constexpr auto ALL_ROOM_UPDATE_FLAGS = ~RoomUpdateFlags{};
     Map map;
-    RoomUpdateFlags roomUpdateFlags = ~RoomUpdateFlags{};
+    RoomUpdateFlags roomUpdateFlags = ALL_ROOM_UPDATE_FLAGS;
 };
 
 struct NODISCARD MapPair final

src/map/TinyRoomIdSet.h

@@ -96,11 +96,8 @@ struct NODISCARD TinySet
     public:
         NODISCARD Type get_single_value() const noexcept
         {
-            // copy is unnecessary but should be optimized away;
-            // it's only here as a defense mechanism.
             assert(holds_single_value());
-            const Variant copy = *this;
-            const auto ui = *std::launder(reinterpret_cast<const uintptr_t *>(copy.m_buf)) >> 1u;
+            const auto ui = get_uintptrt() >> 1u;
             const auto size = static_cast<size_t>(ui);
             return IdHelper_::fromBits(size);
         }
@@ -349,9 +346,7 @@ struct NODISCARD TinySet
     }
     NODISCARD ConstIterator end() const
     {
-        if (isEmpty()) {
-            return ConstIterator{};
-        } else if (hasOne()) {
+        if (isEmpty() || hasOne()) {
             return ConstIterator{};
         } else {
             return ConstIterator{getBig().end()};

src/map/World.cpp

@@ -1394,9 +1394,9 @@ RoomId World::convertToInternal(const ExternalRoomId ext) const
     return m_remapping.convertToInternal(ext);
 }
 
-ExternalRoomId World::convertToExternal(const RoomId ext) const
+ExternalRoomId World::convertToExternal(const RoomId id) const
 {
-    return m_remapping.convertToExternal(ext);
+    return m_remapping.convertToExternal(id);
 }
 
 void World::apply(ProgressCounter &pc, const world_change_types::CompactRoomIds &change)

src/map/World.h

@@ -147,7 +147,7 @@ class NODISCARD World final
     NODISCARD ExternalRawRoom convertToExternal(const RawRoom &room) const;
 
     NODISCARD RoomId convertToInternal(ExternalRoomId ext) const;
-    NODISCARD ExternalRoomId convertToExternal(RoomId ext) const;
+    NODISCARD ExternalRoomId convertToExternal(RoomId id) const;
 
 public:
     void applyOne(ProgressCounter &pc, const Change &change);