From 2ef0cc8083dbc5640d5abfc174964288634de642 Mon Sep 17 00:00:00 2001
From: Oliver Hamlet <git@ortham.net>
Date: Wed, 23 Apr 2025 18:02:39 +0100
Subject: [PATCH] Use PascalCase for MessageType variants in CXX wrapper

---
 cxx/src/api/convert.cpp              | 12 ++++++------
 cxx/src/lib.rs                       |  6 +++---
 cxx/src/metadata.rs                  | 12 ++++++------
 cxx/src/tests/api/internals/main.cpp |  6 +++---
 4 files changed, 18 insertions(+), 18 deletions(-)

diff --git a/cxx/src/api/convert.cpp b/cxx/src/api/convert.cpp
index d53a0c3c..f2eeae7d 100644
--- a/cxx/src/api/convert.cpp
+++ b/cxx/src/api/convert.cpp
@@ -33,11 +33,11 @@ loot::File convert(const loot::rust::File& file) {
 
 loot::MessageType convert(loot::rust::MessageType messageType) {
   switch (messageType) {
-    case loot::rust::MessageType::say:
+    case loot::rust::MessageType::Say:
       return loot::MessageType::say;
-    case loot::rust::MessageType::warn:
+    case loot::rust::MessageType::Warn:
       return loot::MessageType::warn;
-    case loot::rust::MessageType::error:
+    case loot::rust::MessageType::Error:
       return loot::MessageType::error;
     default:
       throw std::logic_error("Unsupported MessageType value");
@@ -182,11 +182,11 @@ loot::Vertex convert(const loot::rust::Vertex& vertex) {
 loot::rust::MessageType convert(loot::MessageType messageType) {
   switch (messageType) {
     case loot::MessageType::say:
-      return loot::rust::MessageType::say;
+      return loot::rust::MessageType::Say;
     case loot::MessageType::warn:
-      return loot::rust::MessageType::warn;
+      return loot::rust::MessageType::Warn;
     case loot::MessageType::error:
-      return loot::rust::MessageType::error;
+      return loot::rust::MessageType::Error;
     default:
       throw std::logic_error("Unsupported MessageType value");
   }
diff --git a/cxx/src/lib.rs b/cxx/src/lib.rs
index 7a72ee4b..955cf93c 100644
--- a/cxx/src/lib.rs
+++ b/cxx/src/lib.rs
@@ -224,9 +224,9 @@ mod ffi {
     }
 
     pub enum MessageType {
-        say,
-        warn,
-        error,
+        Say,
+        Warn,
+        Error,
     }
 
     pub enum TagSuggestion {
diff --git a/cxx/src/metadata.rs b/cxx/src/metadata.rs
index 4501d3ac..6758bb94 100644
--- a/cxx/src/metadata.rs
+++ b/cxx/src/metadata.rs
@@ -44,9 +44,9 @@ unsafe trait TransparentWrapper {
 impl From<libloot::metadata::MessageType> for MessageType {
     fn from(value: libloot::metadata::MessageType) -> Self {
         match value {
-            libloot::metadata::MessageType::Say => MessageType::say,
-            libloot::metadata::MessageType::Warn => MessageType::warn,
-            libloot::metadata::MessageType::Error => MessageType::error,
+            libloot::metadata::MessageType::Say => MessageType::Say,
+            libloot::metadata::MessageType::Warn => MessageType::Warn,
+            libloot::metadata::MessageType::Error => MessageType::Error,
         }
     }
 }
@@ -56,9 +56,9 @@ impl TryFrom<MessageType> for libloot::metadata::MessageType {
 
     fn try_from(value: MessageType) -> Result<Self, UnsupportedEnumValueError> {
         match value {
-            MessageType::say => Ok(libloot::metadata::MessageType::Say),
-            MessageType::warn => Ok(libloot::metadata::MessageType::Warn),
-            MessageType::error => Ok(libloot::metadata::MessageType::Error),
+            MessageType::Say => Ok(libloot::metadata::MessageType::Say),
+            MessageType::Warn => Ok(libloot::metadata::MessageType::Warn),
+            MessageType::Error => Ok(libloot::metadata::MessageType::Error),
             _ => Err(UnsupportedEnumValueError),
         }
     }
diff --git a/cxx/src/tests/api/internals/main.cpp b/cxx/src/tests/api/internals/main.cpp
index b7117d6b..dbcf9c75 100644
--- a/cxx/src/tests/api/internals/main.cpp
+++ b/cxx/src/tests/api/internals/main.cpp
@@ -47,20 +47,20 @@ TEST(Message, creation) {
   content->set_language(
       ::rust::String(std::string(message_content_default_language())));
 
-  auto message = new_message(MessageType::say, "message2");
+  auto message = new_message(MessageType::Say, "message2");
   message->set_condition("invalid condition");
 
   std::vector<::rust::Box<MessageContent>> contents;
   contents.push_back(std::move(content));
   auto multi_message = multilingual_message(
-      MessageType::say,
+      MessageType::Say,
       ::rust::Slice<const ::rust::Box<MessageContent>>(contents));
 
   multi_message->set_condition("invalid condition");
 
   EXPECT_EQ(multi_message->content()[0].text(), "a message");
   EXPECT_EQ(multi_message->content()[0].language(), "en");
-  EXPECT_EQ(MessageType::say, multi_message->message_type());
+  EXPECT_EQ(MessageType::Say, multi_message->message_type());
   EXPECT_EQ(multi_message->condition(), "invalid condition");
 }
 }