diff --git a/cxx/src/api/convert.cpp b/cxx/src/api/convert.cpp index 2cd36fe9..d53a0c3c 100644 --- a/cxx/src/api/convert.cpp +++ b/cxx/src/api/convert.cpp @@ -95,31 +95,31 @@ loot::PluginMetadata convert(const loot::rust::PluginMetadata& metadata) { std::optional convert(uint8_t edgeType) { switch (edgeType) { - case static_cast(loot::rust::EdgeType::hardcoded): + case static_cast(loot::rust::EdgeType::Hardcoded): return loot::EdgeType::hardcoded; - case static_cast(loot::rust::EdgeType::masterFlag): + case static_cast(loot::rust::EdgeType::MasterFlag): return loot::EdgeType::masterFlag; - case static_cast(loot::rust::EdgeType::master): + case static_cast(loot::rust::EdgeType::Master): return loot::EdgeType::master; - case static_cast(loot::rust::EdgeType::masterlistRequirement): + case static_cast(loot::rust::EdgeType::MasterlistRequirement): return loot::EdgeType::masterlistRequirement; - case static_cast(loot::rust::EdgeType::userRequirement): + case static_cast(loot::rust::EdgeType::UserRequirement): return loot::EdgeType::userRequirement; - case static_cast(loot::rust::EdgeType::masterlistLoadAfter): + case static_cast(loot::rust::EdgeType::MasterlistLoadAfter): return loot::EdgeType::masterlistLoadAfter; - case static_cast(loot::rust::EdgeType::userLoadAfter): + case static_cast(loot::rust::EdgeType::UserLoadAfter): return loot::EdgeType::userLoadAfter; - case static_cast(loot::rust::EdgeType::masterlistGroup): + case static_cast(loot::rust::EdgeType::MasterlistGroup): return loot::EdgeType::masterlistGroup; - case static_cast(loot::rust::EdgeType::userGroup): + case static_cast(loot::rust::EdgeType::UserGroup): return loot::EdgeType::userGroup; - case static_cast(loot::rust::EdgeType::recordOverlap): + case static_cast(loot::rust::EdgeType::RecordOverlap): return loot::EdgeType::recordOverlap; - case static_cast(loot::rust::EdgeType::assetOverlap): + case static_cast(loot::rust::EdgeType::AssetOverlap): return loot::EdgeType::assetOverlap; - case static_cast(loot::rust::EdgeType::tieBreak): + case static_cast(loot::rust::EdgeType::TieBreak): return loot::EdgeType::tieBreak; - case static_cast(loot::rust::EdgeType::blueprintMaster): + case static_cast(loot::rust::EdgeType::BlueprintMaster): return loot::EdgeType::blueprintMaster; default: return std::nullopt; diff --git a/cxx/src/database.rs b/cxx/src/database.rs index 3b17f2b7..3da75bda 100644 --- a/cxx/src/database.rs +++ b/cxx/src/database.rs @@ -260,19 +260,19 @@ impl TryFrom for EdgeType { fn try_from(value: libloot::EdgeType) -> Result { match value { - libloot::EdgeType::Hardcoded => Ok(EdgeType::hardcoded), - libloot::EdgeType::MasterFlag => Ok(EdgeType::masterFlag), - libloot::EdgeType::Master => Ok(EdgeType::master), - libloot::EdgeType::MasterlistRequirement => Ok(EdgeType::masterlistRequirement), - libloot::EdgeType::UserRequirement => Ok(EdgeType::userRequirement), - libloot::EdgeType::MasterlistLoadAfter => Ok(EdgeType::masterlistLoadAfter), - libloot::EdgeType::UserLoadAfter => Ok(EdgeType::userLoadAfter), - libloot::EdgeType::MasterlistGroup => Ok(EdgeType::masterlistGroup), - libloot::EdgeType::UserGroup => Ok(EdgeType::userGroup), - libloot::EdgeType::RecordOverlap => Ok(EdgeType::recordOverlap), - libloot::EdgeType::AssetOverlap => Ok(EdgeType::assetOverlap), - libloot::EdgeType::TieBreak => Ok(EdgeType::tieBreak), - libloot::EdgeType::BlueprintMaster => Ok(EdgeType::blueprintMaster), + libloot::EdgeType::Hardcoded => Ok(EdgeType::Hardcoded), + libloot::EdgeType::MasterFlag => Ok(EdgeType::MasterFlag), + libloot::EdgeType::Master => Ok(EdgeType::Master), + libloot::EdgeType::MasterlistRequirement => Ok(EdgeType::MasterlistRequirement), + libloot::EdgeType::UserRequirement => Ok(EdgeType::UserRequirement), + libloot::EdgeType::MasterlistLoadAfter => Ok(EdgeType::MasterlistLoadAfter), + libloot::EdgeType::UserLoadAfter => Ok(EdgeType::UserLoadAfter), + libloot::EdgeType::MasterlistGroup => Ok(EdgeType::MasterlistGroup), + libloot::EdgeType::UserGroup => Ok(EdgeType::UserGroup), + libloot::EdgeType::RecordOverlap => Ok(EdgeType::RecordOverlap), + libloot::EdgeType::AssetOverlap => Ok(EdgeType::AssetOverlap), + libloot::EdgeType::TieBreak => Ok(EdgeType::TieBreak), + libloot::EdgeType::BlueprintMaster => Ok(EdgeType::BlueprintMaster), _ => Err(UnsupportedEnumValueError), } } @@ -283,19 +283,19 @@ impl TryFrom for libloot::EdgeType { fn try_from(value: EdgeType) -> Result { match value { - EdgeType::hardcoded => Ok(libloot::EdgeType::Hardcoded), - EdgeType::masterFlag => Ok(libloot::EdgeType::MasterFlag), - EdgeType::master => Ok(libloot::EdgeType::Master), - EdgeType::masterlistRequirement => Ok(libloot::EdgeType::MasterlistRequirement), - EdgeType::userRequirement => Ok(libloot::EdgeType::UserRequirement), - EdgeType::masterlistLoadAfter => Ok(libloot::EdgeType::MasterlistLoadAfter), - EdgeType::userLoadAfter => Ok(libloot::EdgeType::UserLoadAfter), - EdgeType::masterlistGroup => Ok(libloot::EdgeType::MasterlistGroup), - EdgeType::userGroup => Ok(libloot::EdgeType::UserGroup), - EdgeType::recordOverlap => Ok(libloot::EdgeType::RecordOverlap), - EdgeType::assetOverlap => Ok(libloot::EdgeType::AssetOverlap), - EdgeType::tieBreak => Ok(libloot::EdgeType::TieBreak), - EdgeType::blueprintMaster => Ok(libloot::EdgeType::BlueprintMaster), + EdgeType::Hardcoded => Ok(libloot::EdgeType::Hardcoded), + EdgeType::MasterFlag => Ok(libloot::EdgeType::MasterFlag), + EdgeType::Master => Ok(libloot::EdgeType::Master), + EdgeType::MasterlistRequirement => Ok(libloot::EdgeType::MasterlistRequirement), + EdgeType::UserRequirement => Ok(libloot::EdgeType::UserRequirement), + EdgeType::MasterlistLoadAfter => Ok(libloot::EdgeType::MasterlistLoadAfter), + EdgeType::UserLoadAfter => Ok(libloot::EdgeType::UserLoadAfter), + EdgeType::MasterlistGroup => Ok(libloot::EdgeType::MasterlistGroup), + EdgeType::UserGroup => Ok(libloot::EdgeType::UserGroup), + EdgeType::RecordOverlap => Ok(libloot::EdgeType::RecordOverlap), + EdgeType::AssetOverlap => Ok(libloot::EdgeType::AssetOverlap), + EdgeType::TieBreak => Ok(libloot::EdgeType::TieBreak), + EdgeType::BlueprintMaster => Ok(libloot::EdgeType::BlueprintMaster), _ => Err(UnsupportedEnumValueError), } } diff --git a/cxx/src/lib.rs b/cxx/src/lib.rs index 27e64ba0..7a72ee4b 100644 --- a/cxx/src/lib.rs +++ b/cxx/src/lib.rs @@ -235,19 +235,19 @@ mod ffi { } pub enum EdgeType { - hardcoded, - masterFlag, - master, - masterlistRequirement, - userRequirement, - masterlistLoadAfter, - userLoadAfter, - masterlistGroup, - userGroup, - recordOverlap, - assetOverlap, - tieBreak, - blueprintMaster, + Hardcoded, + MasterFlag, + Master, + MasterlistRequirement, + UserRequirement, + MasterlistLoadAfter, + UserLoadAfter, + MasterlistGroup, + UserGroup, + RecordOverlap, + AssetOverlap, + TieBreak, + BlueprintMaster, } pub enum LogLevel {