From 578467b78ca119d9cc9cc4523c5db3f20ee9d048 Mon Sep 17 00:00:00 2001 From: Abtin Keshavarzian Date: Mon, 1 Dec 2025 10:17:53 -0800 Subject: [PATCH] [uri-path] remove `UriEnumCheck` checking order of `Uri` enum values. (#12179) This commit removes the build-time check for the order of the `Uri` enum values. This check is now redundant as the `static_assert` calls added in #12017 use `AreConstStringsEqual()` to validate the correctness of the `kEntries` array, ensuring that each URI path is correctly associated with its corresponding enum value. --- src/core/thread/uri_paths.cpp | 46 ----------------------------------- 1 file changed, 46 deletions(-) diff --git a/src/core/thread/uri_paths.cpp b/src/core/thread/uri_paths.cpp index 039515af1..85c1f654c 100644 --- a/src/core/thread/uri_paths.cpp +++ b/src/core/thread/uri_paths.cpp @@ -141,52 +141,6 @@ static_assert(AreConstStringsEqual(kEntries[kUriDuaRegistrationNotify].mPath, "n static_assert(AreConstStringsEqual(kEntries[kUriDuaRegistrationRequest].mPath, "n/dr"), "kEntries is invalid"); static_assert(AreConstStringsEqual(kEntries[kUriMlr].mPath, "n/mr"), "kEntries is invalid"); -struct UriEnumCheck -{ - InitEnumValidatorCounter(); - ValidateNextEnum(kUriAddressError); - ValidateNextEnum(kUriAddressNotify); - ValidateNextEnum(kUriAddressQuery); - ValidateNextEnum(kUriAddressRelease); - ValidateNextEnum(kUriAddressSolicit); - ValidateNextEnum(kUriServerData); - ValidateNextEnum(kUriAnycastLocate); - ValidateNextEnum(kUriBackboneAnswer); - ValidateNextEnum(kUriBackboneMlr); - ValidateNextEnum(kUriBackboneQuery); - ValidateNextEnum(kUriAnnounceBegin); - ValidateNextEnum(kUriActiveGet); - ValidateNextEnum(kUriActiveReplace); - ValidateNextEnum(kUriActiveSet); - ValidateNextEnum(kUriCommissionerKeepAlive); - ValidateNextEnum(kUriCommissionerGet); - ValidateNextEnum(kUriCommissionerPetition); - ValidateNextEnum(kUriCommissionerSet); - ValidateNextEnum(kUriDatasetChanged); - ValidateNextEnum(kUriEnergyReport); - ValidateNextEnum(kUriEnergyScan); - ValidateNextEnum(kUriJoinerEntrust); - ValidateNextEnum(kUriJoinerFinalize); - ValidateNextEnum(kUriLeaderKeepAlive); - ValidateNextEnum(kUriLeaderPetition); - ValidateNextEnum(kUriPanIdConflict); - ValidateNextEnum(kUriPendingGet); - ValidateNextEnum(kUriPanIdQuery); - ValidateNextEnum(kUriPendingSet); - ValidateNextEnum(kUriRelayRx); - ValidateNextEnum(kUriTcatEnable); - ValidateNextEnum(kUriRelayTx); - ValidateNextEnum(kUriProxyRx); - ValidateNextEnum(kUriProxyTx); - ValidateNextEnum(kUriDiagnosticGetAnswer); - ValidateNextEnum(kUriDiagnosticGetRequest); - ValidateNextEnum(kUriDiagnosticGetQuery); - ValidateNextEnum(kUriDiagnosticReset); - ValidateNextEnum(kUriDuaRegistrationNotify); - ValidateNextEnum(kUriDuaRegistrationRequest); - ValidateNextEnum(kUriMlr); -}; - } // namespace UriList const char *PathForUri(Uri aUri)