Update formatting

.clang-format

@@ -51,7 +51,7 @@ BreakAfterJavaFieldAnnotations: false
 BreakStringLiterals: true
 ColumnLimit:     79
 CommentPragmas:  '^ IWYU pragma:'
-CompactNamespaces: false
+CompactNamespaces: true
 ConstructorInitializerAllOnOneLineOrOnePerLine: true
 ConstructorInitializerIndentWidth: 4
 ContinuationIndentWidth: 4

src/alia/common.hpp

@@ -20,8 +20,7 @@ typedef long long counter_type;
 
 // Inspired by Boost, inheriting from noncopyable disables copying for a type.
 // The namespace prevents unintended ADL if used by applications.
-namespace detail {
-namespace noncopyable_ {
+namespace detail { namespace noncopyable_ {
 struct noncopyable
 {
     noncopyable()
@@ -34,8 +33,7 @@ struct noncopyable
     operator=(noncopyable const& other)
         = delete;
 };
-} // namespace noncopyable_
-} // namespace detail
+}} // namespace detail::noncopyable_
 typedef detail::noncopyable_::noncopyable noncopyable;
 
 // general-purpose exception class for alia

src/alia/context/storage.hpp

@@ -7,9 +7,7 @@
 
 #include <alia/context/structural_typing.hpp>
 
-namespace alia {
-
-namespace detail {
+namespace alia { namespace detail {
 
 // generic_tagged_storage is one possible implementation of the underlying
 // container for storing the actual data associated with a tag.
@@ -168,8 +166,6 @@ struct tagged_data_accessor
     };                                                                        \
     }
 
-} // namespace detail
-
-} // namespace alia
+}} // namespace alia::detail
 
 #endif

src/alia/timing/ticks.cpp

@@ -38,8 +38,7 @@ get_animation_tick_count(dataless_context ctx)
 millisecond_count
 get_raw_animation_ticks_left(dataless_context ctx, millisecond_count end_time)
 {
-    int ticks_remaining
-        = int(end_time - get<timing_tag>(ctx).tick_counter);
+    int ticks_remaining = int(end_time - get<timing_tag>(ctx).tick_counter);
     if (ticks_remaining > 0)
     {
         if (is_refresh_event(ctx))

src/alia/timing/waves.cpp

@@ -4,9 +4,7 @@
 #include <alia/signals/operators.hpp>
 #include <alia/timing/timer.hpp>
 
-namespace alia {
-
-namespace detail {
+namespace alia { namespace detail {
 
 struct square_wave_data
 {
@@ -45,6 +43,4 @@ square_wave(
     return value(data.value);
 }
 
-} // namespace detail
-
-} // namespace alia
+}} // namespace alia::detail

unit_tests/flow/for_each.cpp

@@ -327,8 +327,8 @@ TEST_CASE("item vector", "[flow][for_each]")
 
     std::reverse(container.begin(), container.end());
 
-    // Since my_item defines get_alia_item_id(), the graph data properly follows
-    // the items around, so there are no additional calls.
+    // Since my_item defines get_alia_item_id(), the graph data properly
+    // follows the items around, so there are no additional calls.
     check_traversal(sys, controller, "cherry;banana;apple;");
     REQUIRE(call_count == 3);
 }
@@ -568,8 +568,8 @@ TEST_CASE("item list", "[for_each][list]")
 
     std::reverse(container.begin(), container.end());
 
-    // Since my_item defines get_alia_item_id(), the graph data properly follows
-    // the items around, so there are no additional calls.
+    // Since my_item defines get_alia_item_id(), the graph data properly
+    // follows the items around, so there are no additional calls.
     check_traversal(sys, controller, "cherry;banana;apple;");
     REQUIRE(call_count == 3);
 }
@@ -654,8 +654,8 @@ TEST_CASE("for_each over a list of raw items", "[for_each][list]")
 
     std::reverse(container.begin(), container.end());
 
-    // Since my_item defines get_alia_item_id(), the graph data properly follows
-    // the items around, so there are no additional calls.
+    // Since my_item defines get_alia_item_id(), the graph data properly
+    // follows the items around, so there are no additional calls.
     check_traversal(sys, controller, "cherry;banana;apple;");
     REQUIRE(call_count == 3);
 }