merge and remove debug kludge

oxidecomputer · Dec 24, 2024 · 95e6ed6 · 95e6ed6
1 parent a39844d
commit 95e6ed6
Show file tree

Hide file tree

Showing 6 changed files with 11 additions and 10 deletions.
diff --git a/Cargo.lock b/Cargo.lock
diff --git a/progenitor-client/src/progenitor_client.rs b/progenitor-client/src/progenitor_client.rs
@@ -527,7 +527,7 @@ where
     {
         // Serialize the value through self which will proxy into the inner
         // Serializer as appropriate.
-        Ok(value.serialize(self).unwrap())
+        value.serialize(self)
     }
 
     fn serialize_unit(self) -> Result<Self::Ok, Self::Error> {

diff --git a/progenitor-client/tests/client_test.rs b/progenitor-client/tests/client_test.rs
@@ -189,6 +189,7 @@ fn test_query_enum_untagged() {
     assert_eq!(result, "paramName=1&paramName=2&paramName=3&paramName=4");
 
     #[derive(Serialize)]
+    #[serde(transparent)]
     struct Name(String);
     #[derive(Serialize)]
     #[serde(untagged)]

diff --git a/progenitor-impl/tests/output/src/buildomat_builder.rs b/progenitor-impl/tests/output/src/buildomat_builder.rs
@@ -66,13 +66,13 @@ pub mod types {
         Variant1(::std::vec::Vec<::std::string::String>),
     }
 
-    impl From<&GetThingOrThingsId> for GetThingOrThingsId {
+    impl ::std::convert::From<&GetThingOrThingsId> for GetThingOrThingsId {
         fn from(value: &GetThingOrThingsId) -> Self {
             value.clone()
         }
     }
 
-    impl From<::std::vec::Vec<::std::string::String>> for GetThingOrThingsId {
+    impl ::std::convert::From<::std::vec::Vec<::std::string::String>> for GetThingOrThingsId {
         fn from(value: ::std::vec::Vec<::std::string::String>) -> Self {
             Self::Variant1(value)
         }

diff --git a/progenitor-impl/tests/output/src/buildomat_builder_tagged.rs b/progenitor-impl/tests/output/src/buildomat_builder_tagged.rs
@@ -64,13 +64,13 @@ pub mod types {
         Variant1(::std::vec::Vec<::std::string::String>),
     }
 
-    impl From<&GetThingOrThingsId> for GetThingOrThingsId {
+    impl ::std::convert::From<&GetThingOrThingsId> for GetThingOrThingsId {
         fn from(value: &GetThingOrThingsId) -> Self {
             value.clone()
         }
     }
 
-    impl From<::std::vec::Vec<::std::string::String>> for GetThingOrThingsId {
+    impl ::std::convert::From<::std::vec::Vec<::std::string::String>> for GetThingOrThingsId {
         fn from(value: ::std::vec::Vec<::std::string::String>) -> Self {
             Self::Variant1(value)
         }

diff --git a/progenitor-impl/tests/output/src/buildomat_positional.rs b/progenitor-impl/tests/output/src/buildomat_positional.rs
@@ -65,13 +65,13 @@ pub mod types {
         Variant1(::std::vec::Vec<::std::string::String>),
     }
 
-    impl From<&GetThingOrThingsId> for GetThingOrThingsId {
+    impl ::std::convert::From<&GetThingOrThingsId> for GetThingOrThingsId {
         fn from(value: &GetThingOrThingsId) -> Self {
             value.clone()
         }
     }
 
-    impl From<::std::vec::Vec<::std::string::String>> for GetThingOrThingsId {
+    impl ::std::convert::From<::std::vec::Vec<::std::string::String>> for GetThingOrThingsId {
         fn from(value: ::std::vec::Vec<::std::string::String>) -> Self {
             Self::Variant1(value)
         }