From f6819d35de4bb22a62445b419d49965662fb730e Mon Sep 17 00:00:00 2001
From: Nav <nav@navnav.me>
Date: Sun, 17 Nov 2024 16:15:13 +0000
Subject: [PATCH] Tidying

---
 src/Targets/TargetDescription/AddressSpace.hpp          | 5 +++--
 src/Targets/TargetDescription/TargetDescriptionFile.cpp | 1 -
 2 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/src/Targets/TargetDescription/AddressSpace.hpp b/src/Targets/TargetDescription/AddressSpace.hpp
index 12012922..bed6c311 100644
--- a/src/Targets/TargetDescription/AddressSpace.hpp
+++ b/src/Targets/TargetDescription/AddressSpace.hpp
@@ -4,6 +4,7 @@
 #include <cstdint>
 #include <optional>
 #include <map>
+#include <utility>
 
 #include "MemorySegment.hpp"
 #include "src/Targets/TargetMemory.hpp"
@@ -27,14 +28,14 @@ namespace Targets::TargetDescription
             TargetMemorySize size,
             std::uint8_t unitSize,
             const std::optional<TargetMemoryEndianness>& endianness,
-            const std::map<std::string, MemorySegment, std::less<void>>& memorySegmentsByKey
+            std::map<std::string, MemorySegment, std::less<void>>&& memorySegmentsByKey
         )
             : key(key)
             , startAddress(startAddress)
             , size(size)
             , unitSize(unitSize)
             , endianness(endianness)
-            , memorySegmentsByKey(memorySegmentsByKey)
+            , memorySegmentsByKey(std::move(memorySegmentsByKey))
         {}
 
         std::optional<std::reference_wrapper<const MemorySegment>> tryGetMemorySegment(std::string_view key) const {
diff --git a/src/Targets/TargetDescription/TargetDescriptionFile.cpp b/src/Targets/TargetDescription/TargetDescriptionFile.cpp
index 3b434308..d741e219 100644
--- a/src/Targets/TargetDescription/TargetDescriptionFile.cpp
+++ b/src/Targets/TargetDescription/TargetDescriptionFile.cpp
@@ -615,7 +615,6 @@ namespace Targets::TargetDescription
         static const auto typesByName = BiMap<std::string, TargetMemorySegmentType>{
             {"gp_registers", TargetMemorySegmentType::GENERAL_PURPOSE_REGISTERS},
             {"aliased", TargetMemorySegmentType::ALIASED},
-            {"regs", TargetMemorySegmentType::REGISTERS},
             {"eeprom", TargetMemorySegmentType::EEPROM},
             {"flash", TargetMemorySegmentType::FLASH},
             {"fuses", TargetMemorySegmentType::FUSES},