Remove ord derives and update tests

oxidecomputer · Nov 20, 2024 · 036693b · 036693b
1 parent 45a8833
commit 036693b
Show file tree

Hide file tree

Showing 6 changed files with 6 additions and 6 deletions.
diff --git a/Cargo.lock b/Cargo.lock
diff --git a/v-api-permission-derive/Cargo.toml b/v-api-permission-derive/Cargo.toml
@@ -16,6 +16,7 @@ syn = { workspace = true, features = ["derive", "extra-traits", "parsing"] }
 newtype-uuid = { workspace = true }
 schemars = { workspace = true }
 serde = { workspace = true, features = ["derive"] }
+serde_json = { workspace = true }
 uuid = { workspace = true }
 v-api = { path = "../v-api" }
 v-model = { path = "../v-model" }
diff --git a/v-api-permission-derive/src/lib.rs b/v-api-permission-derive/src/lib.rs
@@ -325,7 +325,7 @@ pub fn v_api(attr: TokenStream, input: TokenStream) -> TokenStream {
 
     // TODO: Inspect existing derive and add only the missing derive attributes
     // #[derive(
-    //     Debug, Clone, PartialEq, Eq, Hash, serde::Serialize, serde::Deserialize, schemars::JsonSchema, PartialOrd, Ord,
+    //     Debug, Clone, PartialEq, Eq, Hash, serde::Serialize, serde::Deserialize, schemars::JsonSchema,
     // )]
 
     quote! {
@@ -441,7 +441,7 @@ fn from_system_permission_tokens(
                         VPermission::ManageMagicLinkClientsAll => Self::ManageMagicLinkClientsAll,
 
                         VPermission::CreateAccessToken => Self::CreateAccessToken,
-                        VPermission::Removed => Self::Removed,
+                        VPermission::Unsupported(inner) => Self::Unsupported(inner),
                     }
                 }
             }

diff --git a/v-api-permission-derive/tests/derive.rs b/v-api-permission-derive/tests/derive.rs
@@ -25,8 +25,6 @@ fn test_derive() {
         serde::Serialize,
         serde::Deserialize,
         schemars::JsonSchema,
-        PartialOrd,
-        Ord,
     )]
     enum AppPermissions {
         #[v_api(contract(kind = append, variant = CreateItems))]

diff --git a/v-api/src/permissions.rs b/v-api/src/permissions.rs
@@ -21,6 +21,6 @@ impl<T> VAppPermissionResponse for T where T: Permission {}
 #[v_api(From(VPermission))]
 #[partial(VPermissionResponse, attributes(#[serde(tag = "kind", content = "value")]))]
 #[derive(
-    Debug, Clone, PartialEq, Eq, Hash, Serialize, Deserialize, JsonSchema, PartialOrd, Ord,
+    Debug, Clone, PartialEq, Eq, Hash, Serialize, Deserialize, JsonSchema
 )]
 pub enum VPermission {}
diff --git a/v-api/tests/import.rs b/v-api/tests/import.rs
@@ -10,7 +10,7 @@ use v_api_permission_derive::v_api;
 
 #[v_api(From(VPermission))]
 #[derive(
-    Debug, Clone, Hash, PartialEq, Eq, PartialOrd, Ord, Deserialize, Serialize, JsonSchema,
+    Debug, Clone, Hash, PartialEq, Eq, Deserialize, Serialize, JsonSchema,
 )]
 enum Permissions {
     None,