From af1baeeef77946e4ed19ab796fc40e3091fcfd10 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Sebastian=20Lundeg=C3=A5rd=20Kylander?= <me+git@gazt.in>
Date: Sat, 11 Jul 2026 22:09:54 +0200
Subject: [PATCH] Update .clang-format

---
 .clang-format                               | 2 +-
 core-library/traits/function-traits.h       | 8 ++++----
 core-library/views/command-line-args-view.h | 2 +-
 core-library/views/trim-elements-view.h     | 8 ++++----
 core-library/views/trim-view.h              | 6 +++---
 core-library/views/view-closure.h           | 2 +-
 6 files changed, 14 insertions(+), 14 deletions(-)

diff --git a/.clang-format b/.clang-format
index bf787e4..755070c 100644
--- a/.clang-format
+++ b/.clang-format
@@ -114,5 +114,5 @@ SpacesInParentheses: false
 SpacesInSquareBrackets: false
 Standard: Latest
 TabWidth: 4
-UseTab: AlignWithSpaces
+UseTab: ForIndentation
 ...
diff --git a/core-library/traits/function-traits.h b/core-library/traits/function-traits.h
index d09bba7..a04492f 100644
--- a/core-library/traits/function-traits.h
+++ b/core-library/traits/function-traits.h
@@ -14,7 +14,7 @@ struct function_traits
 };
 
 template<typename T>
-	requires callable<T>
+    requires callable<T>
 struct function_traits<T>
 {
 	using return_type         = typename function_traits<decltype(&T::operator())>::return_type;
@@ -50,12 +50,12 @@ struct function_traits<Ret (Class::*)(Arg0, Args...) const>
 };
 
 template<typename T>
-using return_type_t = typename function_traits<T>::return_type;
+using return_type_t = typename function_traits<std::remove_cvref_t<T>>::return_type;
 
 template<typename T>
-using first_argument_type_t = typename function_traits<T>::first_argument_type;
+using first_argument_type_t = typename function_traits<std::remove_cvref_t<T>>::first_argument_type;
 
 template<typename T, typename Arg>
-concept callable_with_converted_argument = requires(T&& callable, Arg&& arg) { callable(typename traits::first_argument_type_t<T>{arg}); };
+concept callable_with_argument_converted = requires(T&& callable, Arg&& arg) { callable(core::first_argument_type_t<T>{arg}); };
 
 }
diff --git a/core-library/views/command-line-args-view.h b/core-library/views/command-line-args-view.h
index 56c4526..35c8906 100644
--- a/core-library/views/command-line-args-view.h
+++ b/core-library/views/command-line-args-view.h
@@ -15,7 +15,7 @@ public:
 	}
 
 	template<typename F>
-		requires std::invocable<F>
+	    requires std::invocable<F>
 	void with(std::string_view arg_to_match_view, F&& function) const
 	{
 		if (arg_to_match_view == m_arg_view)
diff --git a/core-library/views/trim-elements-view.h b/core-library/views/trim-elements-view.h
index a796dc8..ff6ff88 100644
--- a/core-library/views/trim-elements-view.h
+++ b/core-library/views/trim-elements-view.h
@@ -4,10 +4,10 @@
 namespace core {
 
 template<std::ranges::forward_range Range>
-	requires requires(Range&& range) {
-		(void)range.empty();
-		(void)trim_view{(*std::begin(range))};
-	}
+    requires requires(Range&& range) {
+	    range.empty();
+	    trim_view{(*std::begin(range))};
+    }
 class trim_elements_view : public std::ranges::view_interface<trim_elements_view<Range>>
 {
 public:
diff --git a/core-library/views/trim-view.h b/core-library/views/trim-view.h
index 2fb5e1b..b077b81 100644
--- a/core-library/views/trim-view.h
+++ b/core-library/views/trim-view.h
@@ -6,9 +6,9 @@
 namespace core {
 
 template<std::ranges::forward_range Range>
-	requires requires(Range&& range) {
-		*std::begin(range) == ' '; // Comparable with char literals.
-	}
+    requires requires(Range&& range) {
+	    *std::begin(range) == ' '; // Comparable with char literals.
+    }
 class trim_view : public std::ranges::view_interface<trim_view<Range>>
 {
 public:
diff --git a/core-library/views/view-closure.h b/core-library/views/view-closure.h
index 126b9f6..d91bb18 100644
--- a/core-library/views/view-closure.h
+++ b/core-library/views/view-closure.h
@@ -9,7 +9,7 @@ class view_closure : public std::ranges::range_adaptor_closure<view_closure<View
 public:
 	template<std::ranges::viewable_range Range>
 	constexpr auto operator()(Range&& range) const
-		requires requires { ViewTemplate<std::views::all_t<Range>>{std::forward<Range>(range)}; }
+	    requires requires { ViewTemplate<std::views::all_t<Range>>{std::forward<Range>(range)}; }
 	{
 		return ViewTemplate<std::views::all_t<Range>>{std::forward<Range>(range)};
 	}