refactor: use std::pair instead of std::tuple

Author: anonrig

include/ada/url_search_params-inl.h

@@ -18,41 +18,39 @@ namespace ada {
 
 inline void url_search_params::append(const std::string_view key,
                                       const std::string_view value) {
-  params.emplace_back(std::string(key), std::string(value));
+  params.emplace_back(key, value);
 }
 
 inline size_t url_search_params::size() const noexcept { return params.size(); }
 
 inline std::optional<std::string_view> url_search_params::get(
     const std::string_view key) {
-  auto entry = std::find_if(params.begin(), params.end(), [&key](auto& param) {
-    return std::get<0>(param) == key;
-  });
+  auto entry = std::find_if(params.begin(), params.end(),
+                            [&key](auto& param) { return param.first == key; });
 
   if (entry == params.end()) {
     return std::nullopt;
   }
 
-  return std::get<1>(*entry);
+  return entry->second;
 }
 
 inline std::vector<std::string> url_search_params::get_all(
     const std::string_view key) {
   std::vector<std::string> out{};
 
   for (auto& param : params) {
-    if (std::get<0>(param) == key) {
-      out.emplace_back(std::get<1>(param));
+    if (param.first == key) {
+      out.emplace_back(param.second);
     }
   }
 
   return out;
 }
 
 inline bool url_search_params::has(const std::string_view key) noexcept {
-  auto entry = std::find_if(params.begin(), params.end(), [&key](auto& param) {
-    return std::get<0>(param) == key;
-  });
+  auto entry = std::find_if(params.begin(), params.end(),
+                            [&key](auto& param) { return param.first == key; });
   return entry != params.end();
 }
 

include/ada/url_search_params.h

@@ -68,7 +68,7 @@ struct url_search_params {
   std::string to_string();
 
  private:
-  std::vector<std::tuple<std::string, std::string>> params{};
+  std::vector<std::pair<std::string, std::string>> params{};
 };  // url_search_params
 
 }  // namespace ada

src/url_search_params.cpp

@@ -11,16 +11,16 @@ namespace ada {
 void url_search_params::remove(const std::string_view key) {
   params.erase(
       std::remove_if(params.begin(), params.end(),
-                     [&key](auto &param) { return std::get<0>(param) == key; }),
+                     [&key](auto &param) { return param.first == key; }),
       params.end());
 }
 
 void url_search_params::remove(const std::string_view key,
-                               std::string_view value) {
+                               const std::string_view value) {
   params.erase(std::remove_if(params.begin(), params.end(),
                               [&key, &value](auto &param) {
-                                return std::get<0>(param) == key &&
-                                       std::get<1>(param) == value;
+                                return param.first == key &&
+                                       param.second == value;
                               }),
                params.end());
 }
@@ -33,18 +33,16 @@ void url_search_params::set(const std::string_view key,
                             const std::string_view value) {
   params.erase(
       std::remove_if(params.begin(), params.end(),
-                     [&key](auto &param) { return std::get<0>(param) == key; }),
+                     [&key](auto &param) { return param.first == key; }),
       params.end());
 
-  params.emplace_back(std::string(key), std::string(value));
+  params.emplace_back(key, value);
 }
 
 std::string url_search_params::to_string() {
   std::string out{};
   for (size_t i = 0; i < params.size(); i++) {
-    auto param = params[i];
-    auto key = std::get<0>(param);
-    auto value = std::get<1>(param);
+    auto [key, value] = params[i];
 
     if (i != 0) {
       out += "&";