clang-format-6.0 bump fixes

The bump to use clang-format-6.0 now reports these issues.

Change-Id: Ice27766e161356f08c98923a256a98af787ac8a2
Signed-off-by: Patrick Venture <venture@google.com>
diff --git a/mapbox/variant.hpp b/mapbox/variant.hpp
index 37c736d..46db853 100644
--- a/mapbox/variant.hpp
+++ b/mapbox/variant.hpp
@@ -1058,7 +1058,7 @@
     return V::binary_visit(v0, v1, std::forward<F>(f));
 }
 
-    // getter interface
+// getter interface
 
 #ifdef HAS_EXCEPTIONS
 template <typename ResultType, typename T>
diff --git a/sdbusplus/server/bindings.hpp b/sdbusplus/server/bindings.hpp
index 9d67ae3..af57845 100644
--- a/sdbusplus/server/bindings.hpp
+++ b/sdbusplus/server/bindings.hpp
@@ -21,7 +21,7 @@
 {
     return std::forward<T>(t);
 }
-}
-}
-}
-}
+} // namespace details
+} // namespace binding
+} // namespace server
+} // namespace sdbusplus
diff --git a/test/exception/sdbus_error.cpp b/test/exception/sdbus_error.cpp
index 762e4ef..c1d8baa 100644
--- a/test/exception/sdbus_error.cpp
+++ b/test/exception/sdbus_error.cpp
@@ -14,8 +14,8 @@
 {
 
 using sdbusplus::exception::SdBusError;
-using testing::Return;
 using testing::_;
+using testing::Return;
 
 TEST(SdBusError, BasicErrno)
 {