fix some lint

Author: igagis

src/ruis/resource_loader.cpp

@@ -21,6 +21,9 @@ along with this program. If not, see <http://www.gnu.org/licenses/>.
 
 #include "resource_loader.hpp"
 
+#include <algorithm>
+#include <ranges>
+
 #include <fsif/root_dir.hpp>
 #include <fsif/util.hpp>
 
@@ -110,10 +113,11 @@ std::shared_ptr<resource> resource_loader::res_pack_entry::find_in_cache(std::st
 
 const tml::forest* resource_loader::res_pack_entry::find_resource_in_script(std::string_view id) const
 {
-	auto j = std::find(
-		this->script.begin(), //
-		this->script.end(),
-		id
+	auto j = std::ranges::find_if(
+		this->script, //
+		[&](const auto& n) {
+			return n.value.string == id;
+		}
 	);
 	if (j != this->script.end()) {
 		utki::assert(j->value.string == id, SL);

src/ruis/style/styled.hpp

@@ -156,9 +156,8 @@ class styled
 		value(std::move(value))
 	{}
 
-	template <
-		std::convertible_to<actual_value_type> convertible_type //
-		>
+	template <std::convertible_to<actual_value_type> convertible_type //
+			  >
 	styled(convertible_type conv) :
 		value(actual_value_type(conv))
 	{}

src/ruis/util/key.cpp

@@ -167,8 +167,8 @@ std::string_view ruis::to_string(ruis::key key)
 
 namespace {
 struct key_name_key_pair {
-	std::string_view first;
-	ruis::key second;
+	std::string_view name;
+	ruis::key key;
 };
 
 constexpr auto key_name_to_key_ordered_mapping = []() constexpr {
@@ -271,9 +271,13 @@ constexpr auto key_name_to_key_ordered_mapping = []() constexpr {
 		{"f15"sv, ruis::key::f15},
 	}}};
 
-	utki::sort(arr.begin(), arr.end(), [](const auto& a, const auto& b) {
-		return a.first < b.first;
-	});
+	utki::sort(
+		arr.begin(), //
+		arr.end(),
+		[](const auto& a, const auto& b) {
+			return a.name < b.name;
+		}
+	);
 	return arr;
 }();
 } // namespace
@@ -285,11 +289,11 @@ ruis::key ruis::to_key(std::string_view name)
 		key_name_to_key_ordered_mapping.end(),
 		name,
 		[](const auto& a, const std::string_view& b) {
-			return a.first < b;
+			return a.name < b;
 		}
 	);
-	if (i != key_name_to_key_ordered_mapping.end() && i->first == name) {
-		return i->second;
+	if (i != key_name_to_key_ordered_mapping.end() && i->name == name) {
+		return i->key;
 	}
 	return ruis::key::unknown;
 }