chore: small formatting changes.

oxidecomputer · Dec 6, 2024 · f836f36 · f836f36
1 parent 3046658
commit f836f36
Show file tree

Hide file tree

Showing 7 changed files with 13 additions and 20 deletions.
diff --git a/Cargo.lock b/Cargo.lock
diff --git a/typify-impl/Cargo.toml b/typify-impl/Cargo.toml
@@ -21,6 +21,7 @@ syn = { version = "2.0.90", features = ["full"] }
 thiserror = "2.0.3"
 unicode-ident = "1.0.14"
 
+
 [dev-dependencies]
 env_logger = "0.10.2"
 expectorate = "1.1.0"

diff --git a/typify-impl/src/defaults.rs b/typify-impl/src/defaults.rs
@@ -620,7 +620,7 @@ fn all_props<'a>(
 
             // TODO Rather than an option, this should probably be something
             // that lets us say "explicit name" or "type to validate against"
-            TypeEntryDetails::Map(value_id, _) => return vec![(None, value_id, false)],
+            TypeEntryDetails::Map(_, value_id) => return vec![(None, value_id, false)],
             _ => unreachable!(),
         };
 

diff --git a/typify-impl/src/structs.rs b/typify-impl/src/structs.rs
@@ -460,7 +460,7 @@ fn has_default(
         // No default specified.
         (Some(TypeEntryDetails::Option(_)), None) => StructPropertyState::Optional,
         (Some(TypeEntryDetails::Vec(_)), None) => StructPropertyState::Optional,
-        (Some(TypeEntryDetails::Map { .. }), None) => StructPropertyState::Optional,
+        (Some(TypeEntryDetails::Map(..)), None) => StructPropertyState::Optional,
         (Some(TypeEntryDetails::Unit), None) => StructPropertyState::Optional,
         (_, None) => StructPropertyState::Required,
 
@@ -473,9 +473,7 @@ fn has_default(
             StructPropertyState::Optional
         }
         // Default specified is the same as the implicit default: {}
-        (Some(TypeEntryDetails::Map { .. }), Some(serde_json::Value::Object(m)))
-            if m.is_empty() =>
-        {
+        (Some(TypeEntryDetails::Map(..)), Some(serde_json::Value::Object(m))) if m.is_empty() => {
             StructPropertyState::Optional
         }
         // Default specified is the same as the implicit default: false

diff --git a/typify-impl/src/type_entry.rs b/typify-impl/src/type_entry.rs
@@ -595,7 +595,7 @@ impl TypeEntry {
             TypeEntryDetails::Unit
             | TypeEntryDetails::Option(_)
             | TypeEntryDetails::Vec(_)
-            | TypeEntryDetails::Map { .. }
+            | TypeEntryDetails::Map(_, _)
             | TypeEntryDetails::Set(_) => {
                 matches!(impl_name, TypeSpaceImpl::Default)
             }
@@ -1750,7 +1750,7 @@ impl TypeEntry {
             | TypeEntryDetails::Struct(_)
             | TypeEntryDetails::Newtype(_)
             | TypeEntryDetails::Vec(_)
-            | TypeEntryDetails::Map { .. }
+            | TypeEntryDetails::Map(..)
             | TypeEntryDetails::Set(_)
             | TypeEntryDetails::Box(_)
             | TypeEntryDetails::Native(_)

diff --git a/typify-impl/src/value.rs b/typify-impl/src/value.rs
@@ -95,7 +95,7 @@ impl TypeEntry {
                     .collect::<Option<Vec<_>>>()?;
                 quote! { vec![#(#values),*] }
             }
-            TypeEntryDetails::Map(key_id, value_id, ..) => {
+            TypeEntryDetails::Map(key_id, value_id) => {
                 let obj = value.as_object()?;
                 let key_ty = type_space.id_to_entry.get(key_id).unwrap();
                 let value_ty = type_space.id_to_entry.get(value_id).unwrap();
@@ -424,7 +424,7 @@ fn value_for_struct_props(
             match &type_entry.details {
                 TypeEntryDetails::Struct(_)
                 | TypeEntryDetails::Option(_)
-                | TypeEntryDetails::Map { .. } => (),
+                | TypeEntryDetails::Map(..) => (),
                 _ => unreachable!(),
             }
 

diff --git a/typify-test/Cargo.toml b/typify-test/Cargo.toml
@@ -14,4 +14,4 @@ prettyplease = "0.2.25"
 schemars = "0.8.21"
 serde = "1.0.215"
 syn = "2.0.90"
-typify = { path = "../typify"}
+typify = { path = "../typify" }