remove lint from empty builders; clean up merge tests (#718)

oxidecomputer · Dec 20, 2024 · d849736 · d849736
1 parent d2e1757
commit d849736
Show file tree

Hide file tree

Showing 24 changed files with 192 additions and 64 deletions.
diff --git a/.github/workflows/rust.yml b/.github/workflows/rust.yml
@@ -1,5 +1,5 @@
 #
-# Configuration for GitHub-based CI, based on the stock GitHub Rust config.
+# Configuration for GitHub-based CI
 #
 name: Build
 
@@ -29,6 +29,6 @@ jobs:
     steps:
     - uses: actions/checkout@v2
     - name: Build
-      run: cargo build --tests --verbose
+      run: cargo build --locked --tests --verbose
     - name: Run tests
-      run: cargo test --verbose
+      run: cargo test --locked --verbose
diff --git a/typify-impl/src/type_entry.rs b/typify-impl/src/type_entry.rs
@@ -1148,6 +1148,14 @@ impl TypeEntry {
                 },
             );
 
+            // If there are no properties, all of this is kind of pointless,
+            // but at least this lets us avoid the lint warning.
+            let value_ident = if prop_name.is_empty() {
+                quote! { _value }
+            } else {
+                quote! { value }
+            };
+
             output.add_item(
                 OutputSpaceMod::Builder,
                 name,
@@ -1189,7 +1197,7 @@ impl TypeEntry {
                     {
                         type Error = super::error::ConversionError;
 
-                        fn try_from(value: #type_name)
+                        fn try_from(#value_ident: #type_name)
                             -> ::std::result::Result<Self, super::error::ConversionError>
                         {
                             Ok(Self {
@@ -1202,7 +1210,7 @@ impl TypeEntry {
 
                     // Construct a builder from the item.
                     impl From<super::#type_name> for #type_name {
-                        fn from(value: super::#type_name) -> Self {
+                        fn from(#value_ident: super::#type_name) -> Self {
                             Self {
                                 #(
                                     #prop_name: Ok(value.#prop_name),

diff --git a/typify/tests/schemas.rs b/typify/tests/schemas.rs
@@ -87,6 +87,8 @@ fn validate_schema(
 
     // Make a file with the generated code.
     let code = quote! {
+        #![deny(warnings)]
+
         #type_space
 
         fn main() {}

diff --git a/typify/tests/schemas/arrays-and-tuples.rs b/typify/tests/schemas/arrays-and-tuples.rs
@@ -1,3 +1,4 @@
+#![deny(warnings)]
 #[doc = r" Error types."]
 pub mod error {
     #[doc = r" Error from a TryFrom or FromStr implementation."]

diff --git a/typify/tests/schemas/deny-list.rs b/typify/tests/schemas/deny-list.rs
@@ -1,3 +1,4 @@
+#![deny(warnings)]
 #[doc = r" Error types."]
 pub mod error {
     #[doc = r" Error from a TryFrom or FromStr implementation."]

diff --git a/typify/tests/schemas/extraneous-enum.rs b/typify/tests/schemas/extraneous-enum.rs
@@ -1,3 +1,4 @@
+#![deny(warnings)]
 #[doc = r" Error types."]
 pub mod error {
     #[doc = r" Error from a TryFrom or FromStr implementation."]

diff --git a/typify/tests/schemas/id-or-name.rs b/typify/tests/schemas/id-or-name.rs
@@ -1,3 +1,4 @@
+#![deny(warnings)]
 #[doc = r" Error types."]
 pub mod error {
     #[doc = r" Error from a TryFrom or FromStr implementation."]

diff --git a/typify/tests/schemas/maps.rs b/typify/tests/schemas/maps.rs
@@ -1,3 +1,4 @@
+#![deny(warnings)]
 #[doc = r" Error types."]
 pub mod error {
     #[doc = r" Error from a TryFrom or FromStr implementation."]

diff --git a/typify/tests/schemas/maps_custom.rs b/typify/tests/schemas/maps_custom.rs
@@ -1,3 +1,4 @@
+#![deny(warnings)]
 #[doc = r" Error types."]
 pub mod error {
     #[doc = r" Error from a TryFrom or FromStr implementation."]

diff --git a/typify/tests/schemas/merged-schemas.json b/typify/tests/schemas/merged-schemas.json
@@ -226,6 +226,7 @@
       ]
     },
     "unsatisfiable-2": {
+      "$comment": "can't be satisfied because required properties conflict in their enum values",
       "allOf": [
         {
           "type": "object",
@@ -237,6 +238,9 @@
               ]
             }
           },
+          "required": [
+            "action"
+          ],
           "additionalProperties": false
         },
         {
@@ -254,6 +258,7 @@
       ]
     },
     "unsatisfiable-3": {
+      "$comment": "tests a complex merge that can't be satisfied; it's basically the same as unsatisfiable-2, but is broken into multiple pieces",
       "allOf": [
         {
           "$ref": "#/definitions/unsatisfiable-3-a"
@@ -264,7 +269,10 @@
             "action": {
               "$ref": "#/definitions/unsatisfiable-3-b"
             }
-          }
+          },
+          "required": [
+            "action"
+          ]
         }
       ]
     },
@@ -447,6 +455,41 @@
           }
         }
       ]
+    },
+    "merge-empty": {
+      "$comment": "properties conflict but are not required so we end up with an empty object",
+      "allOf": [
+        {
+          "type": "object",
+          "properties": {
+            "action": {
+              "type": "string",
+              "enum": [
+                "foo"
+              ]
+            },
+            "token": {
+              "type": "string"
+            }
+          },
+          "additionalProperties": false
+        },
+        {
+          "type": "object",
+          "properties": {
+            "action": {
+              "type": "string",
+              "enum": [
+                "bar"
+              ]
+            }
+          },
+          "token": {
+            "type": "integer"
+          },
+          "additionalProperties": false
+        }
+      ]
     }
   }
 }