Update natvis for string

Author: Julian LALU

core.natvis

@@ -11,10 +11,10 @@
       </ArrayItems>
     </Expand>
   </Type>
-  
+
   <!-- hud::optional<T> -->
   <Type Name="hud::optional&lt;*&gt;">
-    <DisplayString Condition="some == true">Value: {some_value}</DisplayString>
+    <DisplayString Condition="some == true">{some_value}</DisplayString>
     <DisplayString Condition="some == false">None</DisplayString>
   </Type>
 
@@ -47,17 +47,49 @@
       <Item Name="second">($T2*)this</Item>
     </Expand>
   </Type>
-  
+
   <!-- hud::vector<T> -->
   <Type Name="hud::vector&lt;*&gt;">
-    <DisplayString Condition ="compressed_allocator_.type_2_.end_ptr_ - compressed_allocator_.type_2_.begin_ptr_ == 0"> Size = {compressed_allocator_.type_2_.end_ptr_ - compressed_allocator_.type_2_.begin_ptr_}</DisplayString>
-    <DisplayString Condition ="compressed_allocator_.type_2_.end_ptr_ - compressed_allocator_.type_2_.begin_ptr_ > 0"> Size = {compressed_allocator_.type_2_.end_ptr_ - compressed_allocator_.type_2_.begin_ptr_}, Ptr = {compressed_allocator_.type_2_.begin_ptr_} </DisplayString>
+    <DisplayString
+      Condition="compressed_allocator_.type_2_.end_ptr_ - compressed_allocator_.type_2_.begin_ptr_ == 0">
+      Size = {compressed_allocator_.type_2_.end_ptr_ - compressed_allocator_.type_2_.begin_ptr_}</DisplayString>
+    <DisplayString
+      Condition="compressed_allocator_.type_2_.end_ptr_ - compressed_allocator_.type_2_.begin_ptr_ > 0">
+      Size = {compressed_allocator_.type_2_.end_ptr_ - compressed_allocator_.type_2_.begin_ptr_},
+      Ptr = {compressed_allocator_.type_2_.begin_ptr_} </DisplayString>
     <Expand>
-      <Item Condition="compressed_allocator_.type_2_.end_ptr_ - compressed_allocator_.type_2_.begin_ptr_ > 0" Name="Size">compressed_allocator_.type_2_.end_ptr_ - compressed_allocator_.type_2_.begin_ptr_</Item>
+      <Item
+        Condition="compressed_allocator_.type_2_.end_ptr_ - compressed_allocator_.type_2_.begin_ptr_ > 0"
+        Name="Size">compressed_allocator_.type_2_.end_ptr_ -
+        compressed_allocator_.type_2_.begin_ptr_</Item>
       <ArrayItems>
         <Size>compressed_allocator_.type_2_.end_ptr_ - compressed_allocator_.type_2_.begin_ptr_</Size>
         <ValuePointer>compressed_allocator_.type_2_.begin_ptr_</ValuePointer>
       </ArrayItems>
     </Expand>
   </Type>
+  
+  <!-- hud::string -->
+  <Type Name="hud::string">
+    <DisplayString
+      Condition="bytes_.compressed_allocator_.type_2_.end_ptr_ - bytes_.compressed_allocator_.type_2_.begin_ptr_ == 0">
+      Empty
+    </DisplayString>
+    <DisplayString
+      Condition="bytes_.compressed_allocator_.type_2_.end_ptr_ - bytes_.compressed_allocator_.type_2_.begin_ptr_ > 0">
+      {bytes_.compressed_allocator_.type_2_.begin_ptr_,s8}
+    </DisplayString>
+    <Expand>
+      <Item
+        Condition="bytes_.compressed_allocator_.type_2_.end_ptr_ - bytes_.compressed_allocator_.type_2_.begin_ptr_ > 0"
+        Name="Size">
+        bytes_.compressed_allocator_.type_2_.end_ptr_ -
+        bytes_.compressed_allocator_.type_2_.begin_ptr_
+      </Item>
+      <ArrayItems>
+        <Size>bytes_.compressed_allocator_.type_2_.end_ptr_ - bytes_.compressed_allocator_.type_2_.begin_ptr_</Size>
+        <ValuePointer>bytes_.compressed_allocator_.type_2_.begin_ptr_</ValuePointer>
+      </ArrayItems>
+    </Expand>
+  </Type>
 </AutoVisualizer>

interface/core/string/string.h

@@ -22,22 +22,22 @@ namespace hud
 
         [[nodiscard]] constexpr usize byte_count() const noexcept
         {
-            return data_.byte_count();
+            return bytes_.byte_count();
         }
         [[nodiscard]] constexpr usize max_byte_count() const noexcept
         {
-            return data_.max_count();
+            return bytes_.max_count();
         }
         [[nodiscard]] constexpr const char8 *bytes() const noexcept
         {
-            return data_.data();
+            return bytes_.data();
         }
 
     private:
         template<typename char_t>
         requires(hud::is_same_v<hud::remove_cv_t<char_t>, char8>)
         constexpr string(const hud::slice<char_t> slice) noexcept
-            : data_ {slice.data(), slice.count()}
+            : bytes_ {slice.data(), slice.count()}
         {
         }
 
@@ -46,7 +46,7 @@ namespace hud
         friend constexpr hud::optional<hud::string> make_string(const hud::slice<char_t> slice) noexcept;
 
     private:
-        hud::vector<char8> data_;
+        hud::vector<char8> bytes_;
     };
 
     template<typename char_t>

test/string/string_constructors.cpp

@@ -36,7 +36,6 @@ GTEST_TEST(string, constructor_from_char8)
     auto test = []() {
         const char8 txt[] = "é&='\0/1234564789";
         hud::optional<hud::string> str_opt = hud::make_string(hud::slice {txt, sizeof(txt)});
-        auto str = *str_opt;
         return std::tuple {
             str_opt.has_value(),
             str_opt->byte_count() == sizeof(txt),