2 files changed, 22 insertions, 24 deletions

diff --git a/nihil.posix/execv.ccm b/nihil.posix/execv.ccm
index cd501f7..3bf5745 100644
--- a/nihil.posix/execv.ccm
+++ b/nihil.posix/execv.ccm
@@ -35,7 +35,8 @@ export struct execv final
 	execv(fd &&executable, argv &&argv) noexcept
 		: m_executable(std::move(executable))
 		, m_args(std::move(argv))
-	{}
+	{
+	}
 
 	~execv() = default;
 
@@ -52,13 +53,14 @@ export struct execv final
 	{
 		auto guard = save_errno();
 
+		// clang-format off
 		return self.m_executable | match {
-			[&] (std::filesystem::path const &path) {
+			[&](std::filesystem::path const &path) {
 				::execv(path.string().c_str(), self.m_args.data());
 				return std::unexpected(error("execve failed", error(sys_error())));
 			},
 
-			[&] (fd const &file) {
+			[&](fd const &file) {
 #if NIHIL_HAVE_FEXECVE == 1
 				::fexecve(file.get(), self.m_args.data(), environ);
 				return std::unexpected(error("execve failed", error(sys_error())));
@@ -68,6 +70,7 @@ export struct execv final
 #endif
 			}
 		};
+		// clang-format on
 	}
 
 private:
diff --git a/nihil.std/nihil.std.ccm b/nihil.std/nihil.std.ccm
index d0a20b1..effbf8a 100644
--- a/nihil.std/nihil.std.ccm
+++ b/nihil.std/nihil.std.ccm
@@ -166,7 +166,7 @@ using std::uint64_t;
 // <cstdlib>
 using std::exit;
 using std::quick_exit;
-using std::abort;
+using std::quick_exit;
 
 // <cstdio>
 using std::FILE;
@@ -198,36 +198,31 @@ using std::filesystem::exists;
 }
 
 // <format>
-using std::basic_format_context;
-using std::format_context;
-using std::wformat_context;
+using std::basic_format_arg;
 using std::basic_format_args;
-using std::format_args;
-using std::wformat_args;
+using std::basic_format_context;
+using std::basic_format_parse_context;
 using std::basic_format_string;
-using std::format_string;
-using std::wformat_string;
-using std::runtime_format;
+using std::format;
+using std::format_args;
+using std::format_context;
+using std::format_error;
+using std::format_kind;
 using std::format;
 using std::format_to;
-using std::vformat;
-using std::vformat_to;
 using std::format_to_n;
 using std::format_to_n_result;
+using std::formattable;
 using std::formatted_size;
 using std::formatter;
-using std::formattable;
-using std::basic_format_parse_context;
-using std::format_parse_context;
-using std::wformat_parse_context;
-using std::format_kind;
+using std::make_format_args;
+using std::make_wformat_args;
 using std::range_format;
 using std::range_formatter;
-using std::basic_format_arg;
 using std::visit_format_arg;
-using std::make_format_args;
-using std::make_wformat_args;
+using std::wformat_parse_context;
 using std::format_error;
+using std::runtime_format;
 
 // <functional>
 using std::function;
@@ -321,12 +316,12 @@ using std::vprint_unicode;
 // <random>
 using std::default_random_engine;
 using std::random_device;
-using std::uniform_int_distribution;
 using std::mt19937;
-using std::ranlux24;;
+using std::ranlux24;
 using std::ranlux24_base;
 using std::ranlux48;
 using std::ranlux48_base;
+using std::uniform_int_distribution;
 
 using std::seed_seq;