Merge pull request 'correct body parsing for each status code' (#67) from status-code-returns into main

Reviewed-on: https://codeberg.org/Cyborus/forgejo-api/pulls/67

2 files changed, 5 insertions, 4 deletions

diff --git a/generator/src/methods.rs b/generator/src/methods.rs
index 75bb7db..8039f96 100644
--- a/generator/src/methods.rs
+++ b/generator/src/methods.rs
@@ -462,6 +462,7 @@ fn create_method_response(spec: &OpenApiV2, op: &Operation) -> eyre::Result<Stri
     out.push_str("let response = self.execute(request).await?;\n");
     out.push_str("match response.status().as_u16() {\n");
     for (code, res) in &op.responses.http_codes {
+        let branch_ret = response_ref_type_name(spec, res, op)?;
         let res = res.deref(spec)?;
         if !code.starts_with("2") {
             continue;
@@ -491,7 +492,7 @@ fn create_method_response(spec: &OpenApiV2, op: &Operation) -> eyre::Result<Stri
             }
         };
         handlers.extend(header_handler);
-        let body_handler = match fn_ret.kind {
+        let body_handler = match branch_ret.kind {
             Some(ResponseKind::Text) => {
                 if optional {
                     Some("Some(response.text().await?)")
diff --git a/src/generated/methods.rs b/src/generated/methods.rs
index 621b3c9..7eeb1b0 100644
--- a/src/generated/methods.rs
+++ b/src/generated/methods.rs
@@ -2799,7 +2799,7 @@ impl crate::Forgejo {
         let response = self.execute(request).await?;
         match response.status().as_u16() {
             200 => Ok(Some(response.json().await?)),
-            204 => Ok(Some(response.json().await?)),
+            204 => Ok(None),
             _ => Err(ForgejoError::UnexpectedStatusCode(response.status())),
         }
     }
@@ -2845,7 +2845,7 @@ impl crate::Forgejo {
         let response = self.execute(request).await?;
         match response.status().as_u16() {
             200 => Ok(Some(response.json().await?)),
-            204 => Ok(Some(response.json().await?)),
+            204 => Ok(None),
             _ => Err(ForgejoError::UnexpectedStatusCode(response.status())),
         }
     }
@@ -3448,7 +3448,7 @@ impl crate::Forgejo {
         let response = self.execute(request).await?;
         match response.status().as_u16() {
             200 => Ok(Some(response.json().await?)),
-            204 => Ok(Some(response.json().await?)),
+            204 => Ok(None),
             _ => Err(ForgejoError::UnexpectedStatusCode(response.status())),
         }
     }