From b73ae12b1e28aff88a4f2a4a1ee466014f8a7cd4 Mon Sep 17 00:00:00 2001
From: Francois Kritzinger <francois@codesynthesis.com>
Date: Tue, 28 May 2024 13:24:30 +0200
Subject: Post-review changes

---
 mod/mod-ci-github-gq.cxx | 12 ++++++------
 1 file changed, 6 insertions(+), 6 deletions(-)

(limited to 'mod/mod-ci-github-gq.cxx')

diff --git a/mod/mod-ci-github-gq.cxx b/mod/mod-ci-github-gq.cxx
index 54822ae..d8a1a0e 100644
--- a/mod/mod-ci-github-gq.cxx
+++ b/mod/mod-ci-github-gq.cxx
@@ -575,7 +575,7 @@ namespace brep
     return os.str ();
   }
 
-  pair<optional<gq_pr_mergeability>, bool>
+  optional<string>
   gq_pull_request_mergeable (const basic_mark& error,
                              const string& iat,
                              const string& nid)
@@ -595,7 +595,7 @@ namespace brep
         // The response value. Absent if the merge commit is still being
         // generated.
         //
-        optional<gq_pr_mergeability> value;
+        optional<string> value;
 
         resp (json::parser& p)
         {
@@ -617,11 +617,11 @@ namespace brep
                 string oid (p.next_expect_member_string ("oid"));
                 p.next_expect (event::end_object);
 
-                value = {true, move (oid)};
+                value = move (oid);
               }
               else if (ma == "CONFLICTING")
               {
-                value = {false, ""};
+                value = "";
               }
               else if (ma == "UNKNOWN")
               {
@@ -648,7 +648,7 @@ namespace brep
         if (!rs.found)
           error << "pull request '" << nid << "' not found";
 
-        return {move (rs.value), rs.found};
+        return move (rs.value);
       }
       else
         error << "failed to fetch pull request: error HTTP response status "
@@ -679,7 +679,7 @@ namespace brep
       error << "unable to fetch pull request: " << e;
     }
 
-    return {nullopt, false};
+    return nullopt;
   }
 
   // bool
-- 
cgit v1.1