From 26f4f8f90ea95168adb6efcc1013eadb2566a457 Mon Sep 17 00:00:00 2001
From: Nav <nav@navnav.me>
Date: Sat, 16 Nov 2024 20:06:55 +0000
Subject: [PATCH] Tidying

---
 .../Protocols/RiscVDebugSpec/DebugTranslator.hpp            | 2 +-
 .../WCH/Protocols/WchLink/WchLinkInterface.cpp              | 2 +-
 src/DebugToolDrivers/WCH/WchLinkE/WchLinkE.cpp              | 4 ++++
 src/DebugToolDrivers/WCH/WchLinkE/WchLinkE.hpp              | 6 ++----
 src/Targets/RiscV/RiscV.hpp                                 | 2 +-
 src/Targets/TargetMemory.hpp                                | 2 +-
 6 files changed, 10 insertions(+), 8 deletions(-)

diff --git a/src/DebugToolDrivers/Protocols/RiscVDebugSpec/DebugTranslator.hpp b/src/DebugToolDrivers/Protocols/RiscVDebugSpec/DebugTranslator.hpp
index 22eeacdf..5d473130 100644
--- a/src/DebugToolDrivers/Protocols/RiscVDebugSpec/DebugTranslator.hpp
+++ b/src/DebugToolDrivers/Protocols/RiscVDebugSpec/DebugTranslator.hpp
@@ -78,7 +78,7 @@ namespace DebugToolDrivers::Protocols::RiscVDebugSpec
             const Targets::TargetMemorySegmentDescriptor& memorySegmentDescriptor,
             Targets::TargetMemoryAddress startAddress,
             Targets::TargetMemorySize bytes,
-            const std::set<Targets::TargetMemoryAddressRange>& excludedAddressRanges = {}
+            const std::set<Targets::TargetMemoryAddressRange>& excludedAddressRanges
         ) override;
         void writeMemory(
             const Targets::TargetAddressSpaceDescriptor& addressSpaceDescriptor,
diff --git a/src/DebugToolDrivers/WCH/Protocols/WchLink/WchLinkInterface.cpp b/src/DebugToolDrivers/WCH/Protocols/WchLink/WchLinkInterface.cpp
index 497a8003..c8145493 100644
--- a/src/DebugToolDrivers/WCH/Protocols/WchLink/WchLinkInterface.cpp
+++ b/src/DebugToolDrivers/WCH/Protocols/WchLink/WchLinkInterface.cpp
@@ -53,7 +53,7 @@ namespace DebugToolDrivers::Wch::Protocols::WchLink
         return DeviceInfo{
             WchFirmwareVersion{response.payload[0], response.payload[1]},
             response.payload.size() >= 4
-                ? std::optional{variantsById.valueAt(response.payload[2])}
+                ? variantsById.valueAt(response.payload[2])
                 : std::nullopt
         };
     }
diff --git a/src/DebugToolDrivers/WCH/WchLinkE/WchLinkE.cpp b/src/DebugToolDrivers/WCH/WchLinkE/WchLinkE.cpp
index 75e57081..8af678e6 100644
--- a/src/DebugToolDrivers/WCH/WchLinkE/WchLinkE.cpp
+++ b/src/DebugToolDrivers/WCH/WchLinkE/WchLinkE.cpp
@@ -11,4 +11,8 @@ namespace DebugToolDrivers::Wch
             WchLinkE::WCH_LINK_INTERFACE_NUMBER
         )
     {}
+
+    std::string WchLinkE::getName() {
+        return "WCH-LinkE";
+    }
 }
diff --git a/src/DebugToolDrivers/WCH/WchLinkE/WchLinkE.hpp b/src/DebugToolDrivers/WCH/WchLinkE/WchLinkE.hpp
index c3db9875..66267a6b 100644
--- a/src/DebugToolDrivers/WCH/WchLinkE/WchLinkE.hpp
+++ b/src/DebugToolDrivers/WCH/WchLinkE/WchLinkE.hpp
@@ -23,10 +23,8 @@ namespace DebugToolDrivers::Wch
         static const inline std::uint16_t USB_PRODUCT_ID = 0x8010;
         static const inline std::uint8_t WCH_LINK_INTERFACE_NUMBER = 0;
 
-        WchLinkE(const DebugToolConfig& toolConfig);
+        explicit WchLinkE(const DebugToolConfig& toolConfig);
 
-        std::string getName() override {
-            return "WCH-LinkE";
-        }
+        std::string getName() override;
     };
 }
diff --git a/src/Targets/RiscV/RiscV.hpp b/src/Targets/RiscV/RiscV.hpp
index 41aa113b..95030adb 100644
--- a/src/Targets/RiscV/RiscV.hpp
+++ b/src/Targets/RiscV/RiscV.hpp
@@ -56,7 +56,7 @@ namespace Targets::RiscV
             const TargetMemorySegmentDescriptor& memorySegmentDescriptor,
             TargetMemoryAddress startAddress,
             TargetMemorySize bytes,
-            const std::set<TargetMemoryAddressRange>& excludedAddressRanges = {}
+            const std::set<TargetMemoryAddressRange>& excludedAddressRanges
         ) override;
         void writeMemory(
             const TargetAddressSpaceDescriptor& addressSpaceDescriptor,
diff --git a/src/Targets/TargetMemory.hpp b/src/Targets/TargetMemory.hpp
index 63e66e6a..94af4910 100644
--- a/src/Targets/TargetMemory.hpp
+++ b/src/Targets/TargetMemory.hpp
@@ -105,7 +105,7 @@ namespace Targets
          *
          * @return
          */
-        std::set<Targets::TargetMemoryAddress> addresses() const noexcept {
+        [[nodiscard]] std::set<Targets::TargetMemoryAddress> addresses() const noexcept {
             auto addresses = std::set<Targets::TargetMemoryAddress>{};
             auto addressesIt = addresses.end();