Skip to content

Commit e0ecd66

Browse files
committed
Fix some naming issues
1 parent 5bcf893 commit e0ecd66

11 files changed

Lines changed: 336 additions & 335 deletions

File tree

include/skyr/concepts/url_concepts.hpp

Lines changed: 10 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -11,22 +11,22 @@
1111
#include <type_traits>
1212

1313
namespace skyr {
14-
template <class T, class charT>
15-
concept is_basic_string = std::is_same_v<std::remove_cv_t<T>, std::basic_string<charT>>;
14+
template <class T, class CharT>
15+
concept is_basic_string = std::is_same_v<std::remove_cv_t<T>, std::basic_string<CharT>>;
1616

17-
template <class T, class charT>
18-
concept is_basic_string_view = std::is_same_v<std::remove_cv_t<T>, std::basic_string_view<charT>>;
17+
template <class T, class CharT>
18+
concept is_basic_string_view = std::is_same_v<std::remove_cv_t<T>, std::basic_string_view<CharT>>;
1919

20-
template <class T, class charT>
20+
template <class T, class CharT>
2121
concept is_char_array =
22-
std::conjunction_v<std::is_array<T>, std::is_same<std::remove_cv_t<std::remove_extent_t<T>>, charT>>;
22+
std::conjunction_v<std::is_array<T>, std::is_same<std::remove_cv_t<std::remove_extent_t<T>>, CharT>>;
2323

24-
template <class T, class charT>
25-
concept is_char_pointer = std::conjunction_v<std::is_pointer<T>, std::is_same<std::remove_pointer_t<T>, charT>>;
24+
template <class T, class CharT>
25+
concept is_char_pointer = std::conjunction_v<std::is_pointer<T>, std::is_same<std::remove_pointer_t<T>, CharT>>;
2626

27-
template <class T, class charT>
27+
template <class T, class CharT>
2828
concept is_string_container =
29-
is_basic_string<T, charT> || is_basic_string_view<T, charT> || is_char_array<T, charT> || is_char_pointer<T, charT>;
29+
is_basic_string<T, CharT> || is_basic_string_view<T, CharT> || is_char_array<T, CharT> || is_char_pointer<T, CharT>;
3030

3131
template <typename T>
3232
concept is_u8_convertible =

include/skyr/core/host.hpp

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -67,17 +67,17 @@ class host {
6767
///
6868
/// \return The host as a string
6969
[[nodiscard]] auto serialize() const {
70-
constexpr static auto serialize = [](auto&& host) -> std::string {
71-
using T = std::decay_t<decltype(host)>;
70+
constexpr static auto serialize = []<typename T>(T&& host) -> std::string {
71+
using host_t = std::decay_t<T>;
7272

73-
if constexpr (std::is_same_v<T, ipv4_address>) {
73+
if constexpr (std::is_same_v<host_t, ipv4_address>) {
7474
return host.serialize();
75-
} else if constexpr (std::is_same_v<T, ipv6_address>) {
75+
} else if constexpr (std::is_same_v<host_t, ipv6_address>) {
7676
return std::format("[{}]", host.serialize());
77-
} else if constexpr (std::is_same_v<T, domain_name> || std::is_same_v<T, opaque_host>) {
77+
} else if constexpr (std::is_same_v<host_t, domain_name> || std::is_same_v<host_t, opaque_host>) {
7878
return host.name;
7979
} else {
80-
return std::string();
80+
return {};
8181
}
8282
};
8383

0 commit comments

Comments
 (0)