ircd: Add function_bool convenience template alias.

include/ircd/m/event/refs.h

@@ -26,9 +26,8 @@ namespace ircd::m::dbs
 /// scan when using this interface, etc).
 struct ircd::m::event::refs
 {
-	using closure = util::closure_bool
+	using closure = util::function_bool
 	<
-		std::function,
 		const event::idx &, const dbs::ref &
 	>;
 

include/ircd/m/events.h

@@ -97,9 +97,8 @@ namespace ircd::m::events::refs
 namespace ircd::m::events::relates
 {
 	// (source, rel_type, target)
-	using closure = util::closure_bool
+	using closure = util::function_bool
 	<
-		std::function,
 		const event::idx &, const m::relates_to &, const event::idx &
 	>;
 
@@ -112,9 +111,9 @@ namespace ircd::m::events::relates
 namespace ircd::m::events::annotates
 {
 	// (source, key, target)
-	using closure = util::closure_bool
+	using closure = util::function_bool
 	<
-		std::function, const event::idx &, const string_view &, const event::idx &
+		const event::idx &, const string_view &, const event::idx &
 	>;
 
 	// Iterate events in range

include/ircd/m/relates.h

@@ -39,9 +39,8 @@ struct ircd::m::relates_to
 ///
 struct ircd::m::relates
 {
-	using closure = util::closure_bool
+	using closure = util::function_bool
 	<
-		std::function,
 		const event::idx &, const json::object &, const m::relates_to &
 	>;
 

include/ircd/m/room/content.h

@@ -16,9 +16,9 @@
 struct ircd::m::room::content
 {
 	using entry = pair<uint64_t, m::event::idx>;
-	using closure = util::closure_bool
+	using closure = util::function_bool
 	<
-		std::function, const json::object &, const uint64_t &, const event::idx &
+		const json::object &, const uint64_t &, const event::idx &
 	>;
 
 	static const size_t prefetch_max;

include/ircd/m/room/events_horizon.h

@@ -18,7 +18,10 @@
 ///
 struct ircd::m::room::events::horizon
 {
-	using closure = std::function<bool (const event::id &, const uint64_t &, const event::idx &)>;
+	using closure = util::function_bool
+	<
+		const event::id &, const uint64_t &, const event::idx &
+	>;
 
 	m::room room;
 

include/ircd/m/room/events_missing.h

@@ -20,7 +20,10 @@
 ///
 struct ircd::m::room::events::missing
 {
-	using closure = std::function<bool (const event::id &, const uint64_t &, const event::idx &)>;
+	using closure = util::function_bool
+	<
+		const event::id &, const uint64_t &, const event::idx &
+	>;
 
 	m::room room;
 

include/ircd/m/room/events_sounding.h

@@ -47,7 +47,10 @@ namespace ircd::m
 struct ircd::m::room::events::sounding
 {
 	using range = std::pair<int64_t, int64_t>;
-	using closure = std::function<bool (const range &, const event::idx &)>;
+	using closure = util::function_bool
+	<
+		const range &, const event::idx &
+	>;
 
 	m::room room;
 

include/ircd/m/room/messages.h

@@ -21,9 +21,9 @@ namespace ircd::m
 ///
 struct ircd::m::room::messages
 {
-	using closure = util::closure_bool
+	using closure = util::function_bool
 	<
-		std::function, const message &, const uint64_t &, const event::idx &
+		const message &, const uint64_t &, const event::idx &
 	>;
 
 	static const event::fetch::opts fopts;

include/ircd/m/trace.h

@@ -13,9 +13,8 @@
 
 namespace ircd::m::trace
 {
-	using closure = util::closure_bool
+	using closure = util::function_bool
 	<
-		std::function,
 		const event::idx &, const uint64_t &, const m::room::message &
 	>;
 

include/ircd/m/user/rooms.h

@@ -16,9 +16,8 @@ struct ircd::m::user::rooms
 {
 	struct origins;
 
-	using closure_bool = util::closure_bool
+	using closure_bool = util::function_bool
 	<
-		std::function,
 		const m::room &, const string_view &
 	>;
 

include/ircd/util/closure.h

@@ -35,6 +35,9 @@ inline namespace util
 	         class F,
 	         class... A>
 	using closure_bool = closure<F, bool, A...>;
+
+	template<class... A>
+	using function_bool = closure_bool<std::function, A...>;
 }}
 
 template<template<class, class...>